From ec2760e61d7e9a22578d7957f7e3317e3295ab2c Mon Sep 17 00:00:00 2001
From: Assam Boudjelthia <assam.boudjelthia@qt.io>
Date: Tue, 11 May 2021 13:28:31 +0300
Subject: Remove dependency on qtandroidextras

Remove use of Qt Android Extras APIs.

Change-Id: I020a3966b284f19d7f0c4b313543bb4c4820f039
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
---
 examples/multimedia/video/qmlvideo/CMakeLists.txt  | 10 ---------
 examples/multimedia/video/qmlvideo/main.cpp        | 25 ++++++----------------
 .../multimedia/video/qmlvideofx/CMakeLists.txt     | 10 ---------
 examples/multimedia/video/qmlvideofx/main.cpp      | 25 ++++++----------------
 4 files changed, 12 insertions(+), 58 deletions(-)

(limited to 'examples')

diff --git a/examples/multimedia/video/qmlvideo/CMakeLists.txt b/examples/multimedia/video/qmlvideo/CMakeLists.txt
index b5f78960d..3aeab9731 100644
--- a/examples/multimedia/video/qmlvideo/CMakeLists.txt
+++ b/examples/multimedia/video/qmlvideo/CMakeLists.txt
@@ -150,16 +150,6 @@ qt6_add_resources(qmlvideo "performancemonitordeclarative"
         ${performancemonitordeclarative_resource_files}
 )
 
-if(ANDROID AND TARGET Qt::AndroidExtras)
-    target_compile_definitions(qmlvideo PUBLIC
-        REQUEST_PERMISSIONS_ON_ANDROID
-    )
-
-    target_link_libraries(qmlvideo PUBLIC
-        Qt::AndroidExtras
-    )
-endif()
-
 install(TARGETS qmlvideo
     RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
     BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/examples/multimedia/video/qmlvideo/main.cpp b/examples/multimedia/video/qmlvideo/main.cpp
index 01178acaa..ea5d41033 100644
--- a/examples/multimedia/video/qmlvideo/main.cpp
+++ b/examples/multimedia/video/qmlvideo/main.cpp
@@ -62,23 +62,6 @@
 #include "performancemonitordeclarative.h"
 #endif
 
-#ifdef REQUEST_PERMISSIONS_ON_ANDROID
-#include <QtAndroid>
-
-bool requestStoragePermission() {
-    using namespace QtAndroid;
-
-    QString permission = QStringLiteral("android.permission.WRITE_EXTERNAL_STORAGE");
-    const QHash<QString, PermissionResult> results = requestPermissionsSync(QStringList({permission}));
-    if (!results.contains(permission) || results[permission] == PermissionResult::Denied) {
-        qWarning() << "Couldn't get permission: " << permission;
-        return false;
-    }
-
-    return true;
-}
-#endif
-
 static const QString DefaultFileName1 = "";
 static const QString DefaultFileName2 = "";
 
@@ -89,9 +72,13 @@ int main(int argc, char *argv[])
 #ifdef PERFORMANCEMONITOR_SUPPORT
     PerformanceMonitor::qmlRegisterTypes();
 #endif
-#ifdef REQUEST_PERMISSIONS_ON_ANDROID
-    if (!requestStoragePermission())
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 2, 0)
+    auto permission = QPermission::WriteStorage;
+    if (QCoreApplication::requestPermission(permission).result() != QPermission::Authorized) {
+        qWarning() << "Couldn't get 'WriteStorage' permission!";
         return -1;
+    }
 #endif
 
     QString source1, source2;
diff --git a/examples/multimedia/video/qmlvideofx/CMakeLists.txt b/examples/multimedia/video/qmlvideofx/CMakeLists.txt
index 843a13350..103e259ee 100644
--- a/examples/multimedia/video/qmlvideofx/CMakeLists.txt
+++ b/examples/multimedia/video/qmlvideofx/CMakeLists.txt
@@ -161,16 +161,6 @@ qt6_add_resources(qmlvideofx "performancemonitordeclarative"
         ${performancemonitordeclarative_resource_files}
 )
 
-if(ANDROID AND TARGET Qt::AndroidExtras)
-    target_compile_definitions(qmlvideofx PUBLIC
-        REQUEST_PERMISSIONS_ON_ANDROID
-    )
-
-    target_link_libraries(qmlvideofx PUBLIC
-        Qt::AndroidExtras
-    )
-endif()
-
 install(TARGETS qmlvideofx
     RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
     BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/examples/multimedia/video/qmlvideofx/main.cpp b/examples/multimedia/video/qmlvideofx/main.cpp
index ec547795f..6be3623ef 100644
--- a/examples/multimedia/video/qmlvideofx/main.cpp
+++ b/examples/multimedia/video/qmlvideofx/main.cpp
@@ -61,23 +61,6 @@
 #include "performancemonitordeclarative.h"
 #endif
 
-#ifdef REQUEST_PERMISSIONS_ON_ANDROID
-#include <QtAndroid>
-
-bool requestStoragePermission() {
-    using namespace QtAndroid;
-
-    QString permission = QStringLiteral("android.permission.WRITE_EXTERNAL_STORAGE");
-    const QHash<QString, PermissionResult> results = requestPermissionsSync(QStringList({permission}));
-    if (!results.contains(permission) || results[permission] == PermissionResult::Denied) {
-        qWarning() << "Couldn't get permission: " << permission;
-        return false;
-    }
-
-    return true;
-}
-#endif
-
 int main(int argc, char *argv[])
 {
     QGuiApplication app(argc, argv);
@@ -85,9 +68,13 @@ int main(int argc, char *argv[])
 #ifdef PERFORMANCEMONITOR_SUPPORT
     PerformanceMonitor::qmlRegisterTypes();
 #endif
-#ifdef REQUEST_PERMISSIONS_ON_ANDROID
-    if (!requestStoragePermission())
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 2, 0)
+    auto permission = QPermission::WriteStorage;
+    if (QCoreApplication::requestPermission(permission).result() != QPermission::Authorized) {
+        qWarning() << "Couldn't get 'WriteStorage' permission!";
         return -1;
+    }
 #endif
 
     QUrl fileName;
-- 
cgit v1.2.3