From 3855233dab82946ba50ddd90ce86df035998da8e Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@nokia.com>
Date: Tue, 24 Jan 2012 22:26:31 +0100
Subject: Remove many deprecated methods
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Remove methods that have been marked as deprecated
before Qt 4.6. Keep others, but inline them
where possible and mark them as QT_DEPRECATED_SINCE(5, 0).

Change-Id: If881821ae095f054b31cc13464f19e2007c20ed7
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
---
 src/gui/util/qdesktopservices.h | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'src/gui/util')

diff --git a/src/gui/util/qdesktopservices.h b/src/gui/util/qdesktopservices.h
index 87e850d09c..04a639437e 100644
--- a/src/gui/util/qdesktopservices.h
+++ b/src/gui/util/qdesktopservices.h
@@ -43,9 +43,7 @@
 #define QDESKTOPSERVICES_H
 
 #include <QtCore/qstring.h>
-#if QT_DEPRECATED_SINCE(5, 0)
 #include <QtCore/qstandardpaths.h>
-#endif
 
 QT_BEGIN_HEADER
 
@@ -66,7 +64,7 @@ public:
     static void unsetUrlHandler(const QString &scheme);
 
 #if QT_DEPRECATED_SINCE(5, 0)
-    enum StandardLocation {
+    QT_DEPRECATED enum StandardLocation {
         DesktopLocation,
         DocumentsLocation,
         FontsLocation,
-- 
cgit v1.2.3