summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@trolltech.com>2009-09-29 16:18:26 (GMT)
committerOlivier Goffart <ogoffart@trolltech.com>2009-09-30 09:21:48 (GMT)
commitbc714d469487856c85a42ecb0ceb540420f3e7cc (patch)
treeb4107a3c8f8b9a5850cc027df52db9fab5f70af4 /src/gui
parentc33c3eab6fc510634f00eb001ce5c5860083ba82 (diff)
downloadQt-bc714d469487856c85a42ecb0ceb540420f3e7cc.zip
Qt-bc714d469487856c85a42ecb0ceb540420f3e7cc.tar.gz
Qt-bc714d469487856c85a42ecb0ceb540420f3e7cc.tar.bz2
Fixed warning in public header:
qcommonstyle.h:87: warning: virtual void QCommonStyle::polish(QPalette&) was hidden qs60style.h:77: warning: by QS60Style::polish Reviewed-by: Jeremy
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/styles/qs60style.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/styles/qs60style.h b/src/gui/styles/qs60style.h
index fd18bc3..6be3197 100644
--- a/src/gui/styles/qs60style.h
+++ b/src/gui/styles/qs60style.h
@@ -76,6 +76,9 @@ public:
void unpolish(QWidget *widget);
void polish(QApplication *application);
void unpolish(QApplication *application);
+#ifndef Q_NO_USING_KEYWORD
+ using QCommonStyle::polish;
+#endif
void setStyleProperty(const char *name, const QVariant &value);
QVariant styleProperty(const char *name) const;