summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergio Ahumada <sergio.ahumada@nokia.com>2011-10-21 10:12:26 +0200
committerQt by Nokia <qt-info@nokia.com>2011-10-21 15:32:14 +0200
commite375637fe545e117ccf185ec49beed56149e2522 (patch)
treeccd12f6f59b888e7f36e8846bec6f72fa8719dd9
parentd40f4105cde2c7ad3602dbfe80b8597bd1193349 (diff)
Fix compiler warnings when using QT_DEPRECATED
Change-Id: If62cff5d1cbd1c8051d709db8747777606797056 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
-rw-r--r--src/gui/kernel/qguiapplication.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/kernel/qguiapplication.h b/src/gui/kernel/qguiapplication.h
index 80c71dfa2a..1afbf17cf7 100644
--- a/src/gui/kernel/qguiapplication.h
+++ b/src/gui/kernel/qguiapplication.h
@@ -85,7 +85,9 @@ public:
static QWindowList topLevelWindows();
static QWindow *topLevelAt(const QPoint &pos);
+#ifdef QT_DEPRECATED
static QT_DEPRECATED QWindow *activeWindow() { return focusWindow(); }
+#endif
static QWindow *focusWindow();
static QScreen *primaryScreen();