AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compilation of QDesktopServices without deprecated

Browse Source 
Change-Id: I9e225d32b3f7db403cf3eea6a277580b4b7410a7
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Olivier Goffart 2012-04-20 14:09:55 +02:00 committed by Qt by Nokia
parent 55d1f56c28
commit ecba58500e
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/util/qdesktopservices.cpp
View File

@ -285,9 +285,9 @@ void QDesktopServices::unsetUrlHandler(const QString &scheme)
*/
QString QDesktopServices::storageLocationImpl(StandardLocation type)
QString QDesktopServices::storageLocationImpl(QStandardPaths::StandardLocation type)
{
if (type == DataLocation) {
if (type == QStandardPaths::DataLocation) {
// Preserve Qt 4 compatibility:
// * QCoreApplication::applicationName() must default to empty
// * Unix data location is under the "data/" subdirectory
@ -307,7 +307,7 @@ QString QDesktopServices::storageLocationImpl(StandardLocation type)
+ compatAppName;
#endif
}
return QStandardPaths::writableLocation(static_cast<QStandardPaths::StandardLocation>(type));
return QStandardPaths::writableLocation(type);
}
QT_END_NAMESPACE

5
src/gui/util/qdesktopservices.h
View File

@ -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