diff options
| author | Ulf Hermann <[email protected]> | 2025-07-04 11:42:33 +0200 |
|---|---|---|
| committer | Ulf Hermann <[email protected]> | 2025-07-04 21:18:42 +0200 |
| commit | ceda68c93e2d233186f26afc6b3339f0b2dfc8a9 (patch) | |
| tree | 08d265a4b5c86b46fc4f6b0e68b62673a4248556 | |
| parent | e6243d82d3e4fcd335e2789af4b4d6dac58dadf0 (diff) | |
Don't warn about using deprecated methods in other deprecated methods.
Move the android specific string constants out of the deprecated block.
Amends commit 5aa3a90d2ef7c8e230e62612e0997367e765a8d6
Fixes: QTBUG-138195
Change-Id: Ifd2b07e1e80644044d39112a27a6b1b2bc5433b0
Reviewed-by: Sami Shalayel <[email protected]>
Reviewed-by: Fabian Kosmale <[email protected]>
| -rw-r--r-- | src/qml/qml/qqmlfile.cpp | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/src/qml/qml/qqmlfile.cpp b/src/qml/qml/qqmlfile.cpp index 89b0f43730..5db271ebcc 100644 --- a/src/qml/qml/qqmlfile.cpp +++ b/src/qml/qml/qqmlfile.cpp @@ -25,7 +25,17 @@ QT_BEGIN_NAMESPACE static char qrc_string[] = "qrc"; static char file_string[] = "file"; +#if defined(Q_OS_ANDROID) +static char assets_string[] = "assets"; +static char content_string[] = "content"; +static char authority_externalstorage[] = "com.android.externalstorage.documents"; +static char authority_downloads_documents[] = "com.android.providers.downloads.documents"; +static char authority_media_documents[] = "com.android.providers.media.documents"; +#endif + #if QT_DEPRECATED_SINCE(6, 11) +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED /*! \internal @@ -38,15 +48,6 @@ static char file_string[] = "file"; \value Loading */ - -#if defined(Q_OS_ANDROID) -static char assets_string[] = "assets"; -static char content_string[] = "content"; -static char authority_externalstorage[] = "com.android.externalstorage.documents"; -static char authority_downloads_documents[] = "com.android.providers.downloads.documents"; -static char authority_media_documents[] = "com.android.providers.media.documents"; -#endif - class QQmlFilePrivate; #if QT_CONFIG(qml_network) @@ -486,6 +487,7 @@ bool QQmlFile::connectDownloadProgress(QObject *object, int method) } #endif +QT_WARNING_POP #endif // QT_DEPRECATED_SINCE(6, 11) /*! |