diff --git a/src/corelib/compat/removed_api.cpp b/src/corelib/compat/removed_api.cpp index 033be09c368..b80af92a549 100644 --- a/src/corelib/compat/removed_api.cpp +++ b/src/corelib/compat/removed_api.cpp @@ -1380,6 +1380,16 @@ QUuid::Version QUuid::version() const noexcept #if QT_CORE_REMOVED_SINCE(6, 10) +#include "qcoreapplication.h" + +#if QT_CONFIG(permissions) +void QCoreApplication::requestPermission(const QPermission &requestedPermission, + QtPrivate::QSlotObjectBase *slotObjRaw, const QObject *context) +{ + return requestPermissionImpl(requestedPermission, slotObjRaw, context); +} +#endif + #include "qdir.h" bool QDir::mkdir(const QString &dirName) const diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp index f32d4f1d22f..230f96e0ac8 100644 --- a/src/corelib/kernel/qcoreapplication.cpp +++ b/src/corelib/kernel/qcoreapplication.cpp @@ -2862,7 +2862,7 @@ Qt::PermissionStatus QCoreApplication::checkPermission(const QPermission &permis Calls the functor encapsulated in the \a slotObjRaw in the given \a context (which may be \c nullptr). */ -void QCoreApplication::requestPermission(const QPermission &requestedPermission, +void QCoreApplication::requestPermissionImpl(const QPermission &requestedPermission, QtPrivate::QSlotObjectBase *slotObjRaw, const QObject *context) { QtPrivate::SlotObjUniquePtr slotObj{slotObjRaw}; // adopts diff --git a/src/corelib/kernel/qcoreapplication.h b/src/corelib/kernel/qcoreapplication.h index ac9de4db5e7..105bd7a291a 100644 --- a/src/corelib/kernel/qcoreapplication.h +++ b/src/corelib/kernel/qcoreapplication.h @@ -24,23 +24,19 @@ typedef struct tagMSG MSG; QT_BEGIN_NAMESPACE - -class QCoreApplicationPrivate; +class QAbstractEventDispatcher; +class QAbstractNativeEventFilter; class QDebug; -class QTranslator; +class QEventLoopLocker; +class QPermission; #if QT_VERSION < QT_VERSION_CHECK(7, 0, 0) class QPostEventList; #endif -class QAbstractEventDispatcher; -class QAbstractNativeEventFilter; -class QEventLoopLocker; - -#if QT_CONFIG(permissions) || defined(Q_QDOC) -class QPermission; -#endif +class QTranslator; #define qApp QCoreApplication::instance() +class QCoreApplicationPrivate; class Q_CORE_EXPORT QCoreApplication #ifndef QT_NO_QOBJECT : public QObject @@ -142,7 +138,7 @@ public: const typename QtPrivate::ContextTypeForFunctor::ContextType *receiver, Functor &&func) { - requestPermission(permission, + requestPermissionImpl(permission, QtPrivate::makeCallableObject(std::forward(func)), receiver); } @@ -164,11 +160,12 @@ public: } #endif // QT_NO_CONTEXTLESS_CONNECT +#if QT_CORE_REMOVED_SINCE(6, 10) private: - // ### Qt 7: rename to requestPermissionImpl to avoid ambiguity void requestPermission(const QPermission &permission, QtPrivate::QSlotObjectBase *slotObj, const QObject *context); public: +#endif #endif // QT_CONFIG(permission) @@ -230,6 +227,9 @@ private: static bool sendSpontaneousEvent(QObject *receiver, QEvent *event); static bool notifyInternal2(QObject *receiver, QEvent *); static bool forwardEvent(QObject *receiver, QEvent *event, QEvent *originatingEvent = nullptr); + + void requestPermissionImpl(const QPermission &permission, QtPrivate::QSlotObjectBase *slotObj, + const QObject *context); #endif #if QT_VERSION >= QT_VERSION_CHECK(7, 0, 0)