From e375637fe545e117ccf185ec49beed56149e2522 Mon Sep 17 00:00:00 2001
From: Sergio Ahumada <sergio.ahumada@nokia.com>
Date: Fri, 21 Oct 2011 10:12:26 +0200
Subject: Fix compiler warnings when using QT_DEPRECATED
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: If62cff5d1cbd1c8051d709db8747777606797056
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
---
 src/gui/kernel/qguiapplication.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/gui/kernel/qguiapplication.h')

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();
-- 
cgit v1.2.3