diff options
| author | Sergio Ahumada <sergio.ahumada@nokia.com> | 2012-04-17 10:38:24 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-17 10:38:24 +0200 |
| commit | 16b53b2f0e3f8f64a59c465493a6209eb7f9ab47 (patch) | |
| tree | bbb63401eb3c56c32ad9bd9be66bae8d3590de6b /src/gui/kernel/qguiapplication_p.h | |
| parent | 2c13dc7482690756280cfefe8515eb809b069721 (diff) | |
| parent | 9bd032355163d92cda5e7e59ecd21214b131f187 (diff) | |
Merge "Merge remote-tracking branch 'origin/master' into api_changes" into refs/staging/api_changes
Diffstat (limited to 'src/gui/kernel/qguiapplication_p.h')
| -rw-r--r-- | src/gui/kernel/qguiapplication_p.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/gui/kernel/qguiapplication_p.h b/src/gui/kernel/qguiapplication_p.h index 352917f2db..435994cdd3 100644 --- a/src/gui/kernel/qguiapplication_p.h +++ b/src/gui/kernel/qguiapplication_p.h @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#ifndef QGUIAPPLICATION_QPA_P_H -#define QGUIAPPLICATION_QPA_P_H +#ifndef QGUIAPPLICATION_P_H +#define QGUIAPPLICATION_P_H #include <QtGui/qguiapplication.h> @@ -147,7 +147,11 @@ public: static QGuiApplicationPrivate *instance() { return self; } static QString *platform_name; - static bool app_do_modal; + + QWindowList modalWindowList; + static void showModalWindow(QWindow *window); + static void hideModalWindow(QWindow *window); + virtual bool isWindowBlocked(QWindow *window, QWindow **blockingWindow = 0) const; static Qt::MouseButtons buttons; static ulong mousePressTime; @@ -226,4 +230,4 @@ QT_END_NAMESPACE QT_END_HEADER -#endif // QGUIAPPLICATION_QPA_P_H +#endif // QGUIAPPLICATION_P_H |