diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2022-08-22 12:48:27 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-08-29 15:33:26 +0000 |
| commit | 15226d5aa11a5fd4569c815909e8e893036d2dbd (patch) | |
| tree | 70430404046fe8f484f22d25a407e463652ec66e /src | |
| parent | 4311f37aded78b3d0e650e135ea000d5c1e51b68 (diff) | |
Deprecate Qt.labs.platform.StandardPaths
It's been available in the QtCore module since 6.2.
Task-number: QTBUG-92806
Change-Id: I4da346823bd29f73c039e13aabd31f2274049974
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
(cherry picked from commit 71bb0b4b1af3bb51b85669ca57f7e7e8d63c18d3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/labs/platform/doc/qtlabsplatform.qdocconf | 2 | ||||
| -rw-r--r-- | src/labs/platform/qquicklabsplatformstandardpaths.cpp | 7 | ||||
| -rw-r--r-- | src/labs/platform/qquicklabsplatformstandardpaths_p.h | 4 |
3 files changed, 11 insertions, 2 deletions
diff --git a/src/labs/platform/doc/qtlabsplatform.qdocconf b/src/labs/platform/doc/qtlabsplatform.qdocconf index f159fff9bf..b7f056521c 100644 --- a/src/labs/platform/doc/qtlabsplatform.qdocconf +++ b/src/labs/platform/doc/qtlabsplatform.qdocconf @@ -19,7 +19,7 @@ qhp.QtLabsPlatform.subprojects.qmltypes.indexTitle = Qt Labs Platform QML Types qhp.QtLabsPlatform.subprojects.qmltypes.selectors = qmlclass qhp.QtLabsPlatform.subprojects.qmltypes.sortPages = true -depends = qtcore qtgui qtdoc qtqml qtqmlmodels qtquick qtquickcontrols qtwidgets +depends = qtcore qtgui qtdoc qtqml qtqmlcore qtqmlmodels qtquick qtquickcontrols qtwidgets # This module has no documented C++ types, clear the module header moduleheader = diff --git a/src/labs/platform/qquicklabsplatformstandardpaths.cpp b/src/labs/platform/qquicklabsplatformstandardpaths.cpp index e44c1b87d1..3133cdd306 100644 --- a/src/labs/platform/qquicklabsplatformstandardpaths.cpp +++ b/src/labs/platform/qquicklabsplatformstandardpaths.cpp @@ -3,6 +3,8 @@ #include "qquicklabsplatformstandardpaths_p.h" +#if QT_DEPRECATED_SINCE(6, 4) + #include <QtQml/qqmlengine.h> QT_BEGIN_NAMESPACE @@ -13,6 +15,7 @@ QT_BEGIN_NAMESPACE //! \instantiates QQuickLabsPlatformStandardPaths \inqmlmodule Qt.labs.platform \since 5.8 + \deprecated [6.4] Use QtCore::StandardPaths instead. \brief Provides access to the standard system paths. The StandardPaths singleton type provides methods for querying the standard @@ -27,7 +30,7 @@ QT_BEGIN_NAMESPACE \labs - \sa FileDialog, FolderDialog, QStandardPaths + \sa QtCore::StandardPaths, FileDialog, FolderDialog, QStandardPaths */ static QList<QUrl> toUrlList(const QStringList &paths) @@ -137,3 +140,5 @@ QUrl QQuickLabsPlatformStandardPaths::writableLocation(QStandardPaths::StandardL QT_END_NAMESPACE #include "moc_qquicklabsplatformstandardpaths_p.cpp" + +#endif // QT_DEPRECATED_SINCE(6, 4) diff --git a/src/labs/platform/qquicklabsplatformstandardpaths_p.h b/src/labs/platform/qquicklabsplatformstandardpaths_p.h index 1e0d96b953..9941c3081e 100644 --- a/src/labs/platform/qquicklabsplatformstandardpaths_p.h +++ b/src/labs/platform/qquicklabsplatformstandardpaths_p.h @@ -21,6 +21,8 @@ #include <QtQml/qqml.h> #include <QtCore/private/qglobal_p.h> +#if QT_DEPRECATED_SINCE(6, 4) + QT_BEGIN_NAMESPACE class QQmlEngine; @@ -56,4 +58,6 @@ QML_DECLARE_TYPE(QQuickLabsPlatformStandardPaths) Q_DECLARE_METATYPE(QStandardPaths::StandardLocation) Q_DECLARE_METATYPE(QStandardPaths::LocateOptions) +#endif // QT_DEPRECATED_SINCE(6, 4) + #endif // QQUICKLABSPLATFORMSTANDARDPATHS_P_H |