diff options
| author | Thiago A. Correa <thiago.correa@gmail.com> | 2012-10-07 02:10:57 -0300 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-08 09:01:23 +0200 |
| commit | a0c3a57aed5cde37017733e7cf5e41cc6a1174aa (patch) | |
| tree | e9fd05eb996941d10e610e202eca11f17d2d7b84 /src/widgets/kernel/qapplication.h | |
| parent | 7e6e1412348fb8d8df844d821ee80d6d3de69517 (diff) | |
QApplication::palette missing Q_NO_USING_KEYWORD implementation
Added inline implementation of QApplication::palette when
Q_NO_USING_KEYWORD is defined.
Task-number: QTBUG-27393
Change-Id: I833efb950a579db28fcb243c931c9e22b28ec431
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Diffstat (limited to 'src/widgets/kernel/qapplication.h')
| -rw-r--r-- | src/widgets/kernel/qapplication.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/widgets/kernel/qapplication.h b/src/widgets/kernel/qapplication.h index 468c468e05..3c61ffe66e 100644 --- a/src/widgets/kernel/qapplication.h +++ b/src/widgets/kernel/qapplication.h @@ -115,7 +115,11 @@ public: QT_DEPRECATED static inline void setGraphicsSystem(const QString &) {} #endif +#ifdef Q_NO_USING_KEYWORD + static QPalette palette() { return QGuiApplication::palette(); } +#else using QGuiApplication::palette; +#endif static QPalette palette(const QWidget *); static QPalette palette(const char *className); static void setPalette(const QPalette &, const char* className = 0); |