diff options
author | Olivier Goffart <ogoffart@woboq.com> | 2012-04-20 14:09:55 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-23 15:39:24 +0200 |
commit | ecba58500e752899cbd4cedcd78cf1e7b35b043e (patch) | |
tree | d5150bc0dfd4ccc664eba4e7deedcbcf9c20b50c /src/gui/util/qdesktopservices.h | |
parent | 55d1f56c28e230f4d5adb5bcd9eab99e131aec93 (diff) |
Fix compilation of QDesktopServices without deprecated
Change-Id: I9e225d32b3f7db403cf3eea6a277580b4b7410a7
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/gui/util/qdesktopservices.h')
-rw-r--r-- | src/gui/util/qdesktopservices.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gui/util/qdesktopservices.h b/src/gui/util/qdesktopservices.h index 280acaf277..e116cf1123 100644 --- a/src/gui/util/qdesktopservices.h +++ b/src/gui/util/qdesktopservices.h @@ -64,6 +64,7 @@ public: static void unsetUrlHandler(const QString &scheme); #if QT_DEPRECATED_SINCE(5, 0) + //Must match QStandardPaths::StandardLocation QT_DEPRECATED enum StandardLocation { DesktopLocation, DocumentsLocation, @@ -79,14 +80,14 @@ public: }; QT_DEPRECATED static QString storageLocation(StandardLocation type) { - return storageLocationImpl(type); + return storageLocationImpl(static_cast<QStandardPaths::StandardLocation>(type)); } QT_DEPRECATED static QString displayName(StandardLocation type) { return QStandardPaths::displayName(static_cast<QStandardPaths::StandardLocation>(type)); } #endif private: - static QString storageLocationImpl(StandardLocation type); + static QString storageLocationImpl(QStandardPaths::StandardLocation type); }; #endif // QT_NO_DESKTOPSERVICES |