diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2019-08-06 12:24:37 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2019-08-07 12:50:28 +0200 |
| commit | 05b90be3c5ce4709156178478abb2e7ba125a0be (patch) | |
| tree | a7c39b76c99f4887dbc6837be3a41afc7fdb29b4 /src/gui/util/qdesktopservices.cpp | |
| parent | 7301e44161d8bb25410219a31405584c9492b83e (diff) | |
| parent | 6f357f50b4b72e3c5a6903a09624ade1d72d12c1 (diff) | |
Merge "Merge remote-tracking branch 'origin/dev' into wip/qt6"
Diffstat (limited to 'src/gui/util/qdesktopservices.cpp')
| -rw-r--r-- | src/gui/util/qdesktopservices.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/util/qdesktopservices.cpp b/src/gui/util/qdesktopservices.cpp index ee0ff4c6ef..99214c4960 100644 --- a/src/gui/util/qdesktopservices.cpp +++ b/src/gui/util/qdesktopservices.cpp @@ -290,6 +290,7 @@ void QDesktopServices::unsetUrlHandler(const QString &scheme) setUrlHandler(scheme, 0, 0); } +#if QT_DEPRECATED_SINCE(5, 0) /*! \enum QDesktopServices::StandardLocation \since 4.4 @@ -344,6 +345,7 @@ void QDesktopServices::unsetUrlHandler(const QString &scheme) \obsolete Use QStandardPaths::displayName() */ +#endif extern Q_CORE_EXPORT QString qt_applicationName_noFallback(); |