From 38bd71e04da87fc1c92dd94e2eddb62b8944ceeb Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Wed, 22 Aug 2012 08:31:57 +0200
Subject: Remove deprecation from enumerations in QtGui.

Referencing them in a (deprecated) function declaration causes
a deprecation warning to be emitted each time the header is
included, which causes a massive amount of warnings for qevent.h.

It should be sufficient to deprecate them in the documentation
and to deprecate function using them.

Change-Id: I531b7c893e73428703cfb302615bff382abce54f
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
---
 src/gui/util/qdesktopservices.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/gui/util/qdesktopservices.h')

diff --git a/src/gui/util/qdesktopservices.h b/src/gui/util/qdesktopservices.h
index a412ba50f5..a993d33afc 100644
--- a/src/gui/util/qdesktopservices.h
+++ b/src/gui/util/qdesktopservices.h
@@ -65,7 +65,7 @@ public:
 
 #if QT_DEPRECATED_SINCE(5, 0)
     //Must match QStandardPaths::StandardLocation
-    enum QT_DEPRECATED StandardLocation {
+    enum StandardLocation {
         DesktopLocation,
         DocumentsLocation,
         FontsLocation,
-- 
cgit v1.2.3