From 38bd71e04da87fc1c92dd94e2eddb62b8944ceeb Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 22 Aug 2012 08:31:57 +0200 Subject: [PATCH] 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 --- src/gui/kernel/qevent.h | 2 +- src/gui/util/qdesktopservices.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/kernel/qevent.h b/src/gui/kernel/qevent.h index 7fbd2aeb4b..bb3bd8f325 100644 --- 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 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,