diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2021-07-22 14:34:38 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2021-07-26 14:19:17 +0200 |
| commit | 5604f633c06585246ba473b209c35db67d68740c (patch) | |
| tree | 5ad2fb41afc78e76bb1c2b9f700e58933d8bba19 /src/corelib/kernel/qcoreapplication.cpp | |
| parent | c89a9ccbccdd7d6ceec669e7effec5786eb3f642 (diff) | |
Move Android implementation of permissions API to QtAndroidPrivate
And remove plumbing from public QCoreApplication API, which is going to
be removed in follow up patch after leaf modules have moved to the private
Android API.
The public permissions API will be reintroduced in 6.3 after further work.
Pick-to: 6.2
Change-Id: I46772284b98d0ced8d4a624a850adaa4a1dfe645
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Diffstat (limited to 'src/corelib/kernel/qcoreapplication.cpp')
| -rw-r--r-- | src/corelib/kernel/qcoreapplication.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp index 8f53790cb7..10dbe2f684 100644 --- a/src/corelib/kernel/qcoreapplication.cpp +++ b/src/corelib/kernel/qcoreapplication.cpp @@ -3084,7 +3084,6 @@ void QCoreApplication::setEventDispatcher(QAbstractEventDispatcher *eventDispatc \sa Q_OBJECT, QObject::tr() */ #if QT_CONFIG(future) && !defined(QT_NO_QOBJECT) -#if !defined(Q_OS_ANDROID) QFuture<QApplicationPermission::PermissionResult> defaultPermissionFuture() { @@ -3127,7 +3126,6 @@ void QCoreApplication::setEventDispatcher(QAbstractEventDispatcher *eventDispatc Q_UNUSED(permission) return defaultPermissionFuture(); } -#endif /*! Requests the \a permission and returns a QFuture representing the |