diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2012-01-24 22:26:31 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-31 16:17:55 +0100 |
| commit | 3855233dab82946ba50ddd90ce86df035998da8e (patch) | |
| tree | 908cdc84626a17dde6450810f97859502dcddab3 /src/gui/util/qdesktopservices.h | |
| parent | 9a4d30d9995a806ca7c69692992383b28c655054 (diff) | |
Remove many deprecated methods
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>
Diffstat (limited to 'src/gui/util/qdesktopservices.h')
| -rw-r--r-- | src/gui/util/qdesktopservices.h | 4 |
1 files changed, 1 insertions, 3 deletions
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, |