diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-27 10:22:56 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-10-27 10:23:39 +0200 |
| commit | af0d0b9c06c18850626e5454b39b45255c3e36cb (patch) | |
| tree | 31768765e1195781fba5350ad99e93e926dd083c /src/gui/kernel/qguiapplication.cpp | |
| parent | 8daa050ed2bc3502f19ae38e2c3060941a19a5a6 (diff) | |
| parent | 4e196159077a820e99bc8bd306d31d0ccaa17c57 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/plugins/platforms/ios/ios.pro
src/plugins/platforms/ios/kernel.pro
src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosfileengineassetslibrary.h
src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosfileengineassetslibrary.mm
src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosfileenginefactory.h
src/plugins/platforms/ios/qiosintegration.h
src/widgets/widgets/qcombobox.cpp
tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp
tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp
Change-Id: Ibaee7cbbba99e7c4b1d8926e55932ffa6030ce45
Diffstat (limited to 'src/gui/kernel/qguiapplication.cpp')
| -rw-r--r-- | src/gui/kernel/qguiapplication.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index 353b623a3b..142fd66947 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -351,6 +351,16 @@ void QWindowGeometrySpecification::applyTo(QWindow *window) const static QWindowGeometrySpecification windowGeometrySpecification = Q_WINDOW_GEOMETRY_SPECIFICATION_INITIALIZER; /*! + \macro qGuiApp + \relates QGuiApplication + + A global pointer referring to the unique application object. + Only valid for use when that object is a QGuiApplication. + + \sa QCoreApplication::instance(), qApp +*/ + +/*! \class QGuiApplication \brief The QGuiApplication class manages the GUI application's control flow and main settings. |