diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2021-06-30 13:54:54 +0300 |
|---|---|---|
| committer | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2021-07-15 01:57:41 +0300 |
| commit | 07d4ecd73465fba946047610bc2736daa641b8f6 (patch) | |
| tree | 0b49291dce2fe296a6888af87dbb767d8b38d521 /src/corelib/kernel/qcoreapplication.h | |
| parent | b612014ae79d1b0bda6f4b8d4cc38466f36b1d33 (diff) | |
Rename QPermission namespace to QApplicationPermission
Pick-to: 6.2
Task-number: QTBUG-94407
Change-Id: Ie9c05dbe498cd372c015b5125e6cb8d59ca96b59
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/corelib/kernel/qcoreapplication.h')
| -rw-r--r-- | src/corelib/kernel/qcoreapplication.h | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/corelib/kernel/qcoreapplication.h b/src/corelib/kernel/qcoreapplication.h index 3ff57b9d58..cbb9d12040 100644 --- a/src/corelib/kernel/qcoreapplication.h +++ b/src/corelib/kernel/qcoreapplication.h @@ -47,7 +47,7 @@ #include <QtCore/qeventloop.h> #if QT_CONFIG(future) #include <QtCore/qfuture.h> -#include <QtCore/qpermission.h> +#include <QtCore/qapplicationpermission.h> #endif #include <QtCore/qobject.h> #else @@ -168,13 +168,15 @@ public: #ifndef QT_NO_QOBJECT #if QT_CONFIG(future) - static QFuture<QPermission::PermissionResult> requestPermission( - QPermission::PermissionType permission); - static QFuture<QPermission::PermissionResult> requestPermission(const QString &permission); - - static QFuture<QPermission::PermissionResult> checkPermission( - QPermission::PermissionType permission); - static QFuture<QPermission::PermissionResult> checkPermission(const QString &permission); + static QFuture<QApplicationPermission::PermissionResult> + requestPermission(QApplicationPermission::PermissionType permission); + static QFuture<QApplicationPermission::PermissionResult> + requestPermission(const QString &permission); + + static QFuture<QApplicationPermission::PermissionResult> + checkPermission(QApplicationPermission::PermissionType permission); + static QFuture<QApplicationPermission::PermissionResult> + checkPermission(const QString &permission); #endif void installNativeEventFilter(QAbstractNativeEventFilter *filterObj); void removeNativeEventFilter(QAbstractNativeEventFilter *filterObj); |