diff options
Diffstat (limited to 'src/gui/util/qdesktopservices.cpp')
| -rw-r--r-- | src/gui/util/qdesktopservices.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/util/qdesktopservices.cpp b/src/gui/util/qdesktopservices.cpp index 26aecadcf4..a941c06031 100644 --- a/src/gui/util/qdesktopservices.cpp +++ b/src/gui/util/qdesktopservices.cpp @@ -284,14 +284,14 @@ void QDesktopServices::unsetUrlHandler(const QString &scheme) Use QStandardPaths::displayName() */ +extern Q_CORE_EXPORT QString qt_applicationName_noFallback(); -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 - extern Q_CORE_EXPORT QString qt_applicationName_noFallback(); const QString compatAppName = qt_applicationName_noFallback(); const QString baseDir = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation); #if defined(Q_OS_WIN) || defined(Q_OS_MAC) @@ -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 |