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.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.h')
| -rw-r--r-- | src/gui/kernel/qguiapplication.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/gui/kernel/qguiapplication.h b/src/gui/kernel/qguiapplication.h index 858083b10b..75a0f6cd4b 100644 --- a/src/gui/kernel/qguiapplication.h +++ b/src/gui/kernel/qguiapplication.h @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#ifndef QGUIAPPLICATION_QPA_H -#define QGUIAPPLICATION_QPA_H +#ifndef QGUIAPPLICATION_H +#define QGUIAPPLICATION_H #include <QtCore/qcoreapplication.h> #include <QtGui/qwindowdefs.h> @@ -88,6 +88,8 @@ public: static QString platformName(); + static QWindow *modalWindow(); + #ifdef QT_DEPRECATED static QT_DEPRECATED QWindow *activeWindow() { return focusWindow(); } #endif @@ -168,4 +170,4 @@ QT_END_NAMESPACE QT_END_HEADER -#endif // QGUIAPPLICATION_QPA_H +#endif // QGUIAPPLICATION_H |