summaryrefslogtreecommitdiffstats
path: root/src/widgets/kernel/qapplication.cpp
diff options
context:
space:
mode:
authorLaszlo Agocs <laszlo.p.agocs@nokia.com>2011-05-30 14:16:43 +0200
committerLaszlo Agocs <laszlo.p.agocs@nokia.com>2011-05-30 14:41:14 +0200
commite277d144259ce4e440cf789c83ba095b4c4d06a6 (patch)
treec51d4bf7d45f602c108c33eab60daee28fe7477f /src/widgets/kernel/qapplication.cpp
parentef8e5af1d219dd749ea306230cfd097cc2595cb4 (diff)
Add focus and modal dialog support.
Reviewed-by: Samuel Rødal
Diffstat (limited to 'src/widgets/kernel/qapplication.cpp')
-rw-r--r--src/widgets/kernel/qapplication.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp
index 15cad61594..13a4eca745 100644
--- a/src/widgets/kernel/qapplication.cpp
+++ b/src/widgets/kernel/qapplication.cpp
@@ -536,7 +536,8 @@ QDesktopWidget *qt_desktopWidget = 0; // root window widgets
#if !defined(Q_WS_QPA) && !defined(QT_NO_CLIPBOARD)
QClipboard *qt_clipboard = 0; // global clipboard object
#endif
-QWidgetList * qt_modal_stack=0; // stack of modal widgets
+QWidgetList * qt_modal_stack = 0; // stack of modal widgets
+bool app_do_modal = false;
/*!
\internal
@@ -2422,7 +2423,6 @@ void QApplicationPrivate::notifyLayoutDirectionChange()
}
}
-
/*!
\fn Qt::WindowsVersion QApplication::winVersion()
@@ -2790,7 +2790,6 @@ bool QApplicationPrivate::isBlockedByModal(QWidget *widget)
if (QApplication::activePopupWidget() == widget)
return false;
-#if 0
for (int i = 0; i < qt_modal_stack->size(); ++i) {
QWidget *modalWidget = qt_modal_stack->at(i);
@@ -2869,7 +2868,6 @@ bool QApplicationPrivate::isBlockedByModal(QWidget *widget)
break;
}
}
-#endif
return false;
}