AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Check for existence of QWindow in QApplication::isBlockedByModal.

Browse Source 
Warn if window == 0 is passed in
QApplicationPrivate::isWindowBlocked().

Task-number: QTBUG-28637
Change-Id: I1213ea371813eeb90f962cc39235ddfccc663d45
Reviewed-by: Jing Bai <jing.bai@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
Friedemann Kleint 2013-01-14 12:11:45 +01:00 committed by The Qt Project
parent 856f209fb6
commit 5eab554227
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/widgets/kernel/qapplication.cpp
View File

@ -2217,12 +2217,17 @@ Q_WIDGETS_EXPORT bool qt_tryModalHelper(QWidget *widget, QWidget **rettop)
bool QApplicationPrivate::isBlockedByModal(QWidget *widget)
{
widget = widget->window();
return self->isWindowBlocked(widget->windowHandle());
QWindow *window = widget->windowHandle();
return window && self->isWindowBlocked(window);
}
bool QApplicationPrivate::isWindowBlocked(QWindow *window, QWindow **blockingWindow) const
{
QWindow *unused = 0;
if (!window) {
qWarning().nospace() << "window == 0 passed.";
return false;
}
if (!blockingWindow)
blockingWindow = &unused;