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>

diff --git a/src/gui/kernel/qevent.h b/src/gui/kernel/qevent.h
index 7fbd2ae..bb3bd8f 100644 (file)
--- a/src/gui/kernel/qevent.h
+++ b/src/gui/kernel/qevent.h
@@ -779,7 +779,7 @@ public:
     };
 
 #if QT_DEPRECATED_SINCE(5, 0)
-    enum QT_DEPRECATED DeviceType {
+    enum DeviceType {
         TouchScreen,
         TouchPad
     };

diff --git a/src/gui/util/qdesktopservices.h b/src/gui/util/qdesktopservices.h
index a412ba5..a993d33 100644 (file)
--- 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,