From: Thiago A. Correa <thiago.correa@gmail.com>
Date: Sun, 7 Oct 2012 05:10:57 +0000 (-0300)
Subject: QApplication::palette missing Q_NO_USING_KEYWORD implementation
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a0c3a57aed5cde37017733e7cf5e41cc6a1174aa;p=profile%2Fivi%2Fqtbase.git

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>
---

diff --git a/src/widgets/kernel/qapplication.h b/src/widgets/kernel/qapplication.h
index 468c468..3c61ffe 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);