2 files changed, 5 insertions, 23 deletions
diff --git a/examples/location/geojson_viewer/geojson_viewer.pro b/examples/location/geojson_viewer/geojson_viewer.pro
index 08b28144..4af6719f 100644
--- a/examples/location/geojson_viewer/geojson_viewer.pro
+++ b/examples/location/geojson_viewer/geojson_viewer.pro
@@ -2,7 +2,6 @@ TARGET = qml_location_geojsonviewer
 TEMPLATE = app
 
 QT += core qml network quick positioning location-private widgets
-android: QT += androidextras
 
 SOURCES += main.cpp
 CONFIG += c++11
diff --git a/examples/location/geojson_viewer/main.cpp b/examples/location/geojson_viewer/main.cpp
index 61f7d233..436a8e16 100644
--- a/examples/location/geojson_viewer/main.cpp
+++ b/examples/location/geojson_viewer/main.cpp
@@ -70,9 +70,6 @@
 #include <QJsonArray>
 #include <QFileInfo>
 #include <QtCore/qobjectdefs.h>
-#ifdef Q_OS_ANDROID
-#include <QtAndroid>
-#endif
 
 class extractor
 {
@@ -250,30 +247,16 @@ public:
 
 #include "main.moc"
 
-#ifdef Q_OS_ANDROID
-// Request permissions because we're using QStandardPaths::writableLocation()
-bool requestStoragePermissions() {
-    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[])
 {
     QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
     QApplication app(argc, argv);
-#ifdef Q_OS_ANDROID
-    if (!requestStoragePermissions())
+
+    auto permission = QPermission::WriteStorage;
+    if (QCoreApplication::requestPermission(permission).result() != QPermission::Authorized) {
+        qWarning() << "Couldn't get 'WriteStorage' permission!";
         return -1;
-#endif
+    }
 
     QQmlApplicationEngine engine;
     QUrl absoluteFilePath = argc > 1 ?