WebSVN – tpanel – Diff – /trunk/ttpinit.cpp

 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 #include <QtAndroidExtras/QtAndroid>
 #else
 #include <QtCore>
 #include <QFuture>
+#if QT_VERSION < QT_VERSION_CHECK(6, 4, 0)
 #include <QtCore/private/qandroidextras_p.h>
 #endif
 #endif
+#endif
 #include <QMap>
 #include <QHash>
 #include "ttpinit.h"
 #include "terror.h"
     for (auto iter = perms.begin(); iter != perms.end(); ++iter)
+    {
         if (iter.value() == QtAndroid::PermissionResult::Denied)
             return false;
+    }
-#else
+//#else
-    for (auto iter = permissions.begin(); iter != permissions.end(); ++iter)
+//    for (auto iter = permissions.begin(); iter != permissions.end(); ++iter)
-    {
+//    {
-        QFuture<QtAndroidPrivate::PermissionResult> result = QtAndroidPrivate::requestPermission(*iter);
+//        QFuture<QtAndroidPrivate::PermissionResult> result = QtAndroidPrivate::requestPermission(*iter);
-        if (result.result() == QtAndroidPrivate::Denied)
+//        if (result.result() == QtAndroidPrivate::Denied)
-            return false;
+//            return false;
-    }
+//    }
 #endif
     return true;
+}
 #endif

Subversion Repositories tpanel