diff options
| -rw-r--r-- | src/corelib/kernel/qcoreapplication_platform.h | 6 | ||||
| -rw-r--r-- | src/corelib/platform/android/qandroidnativeinterface.cpp | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/corelib/kernel/qcoreapplication_platform.h b/src/corelib/kernel/qcoreapplication_platform.h index 76779b438c..b163ccb81c 100644 --- a/src/corelib/kernel/qcoreapplication_platform.h +++ b/src/corelib/kernel/qcoreapplication_platform.h @@ -69,14 +69,12 @@ struct Q_CORE_EXPORT QAndroidApplication #if QT_CONFIG(future) && !defined(QT_NO_QOBJECT) static QFuture<QVariant> runOnAndroidMainThread(const std::function<QVariant()> &runnable, - const QDeadlineTimer - &timeout = QDeadlineTimer(-1)); + const QDeadlineTimer timeout = QDeadlineTimer::Forever); template <class T> std::enable_if_t<std::is_invocable_v<T> && std::is_same_v<std::invoke_result_t<T>, void>, QFuture<void>> static runOnAndroidMainThread(const T &runnable, - const QDeadlineTimer - &timeout = QDeadlineTimer(-1)) + const QDeadlineTimer timeout = QDeadlineTimer::Forever) { std::function<QVariant()> func = [runnable](){ runnable(); return QVariant(); }; return static_cast<QFuture<void>>(runOnAndroidMainThread(func, timeout)); diff --git a/src/corelib/platform/android/qandroidnativeinterface.cpp b/src/corelib/platform/android/qandroidnativeinterface.cpp index 185f9c2daa..a3a10091cb 100644 --- a/src/corelib/platform/android/qandroidnativeinterface.cpp +++ b/src/corelib/platform/android/qandroidnativeinterface.cpp @@ -188,7 +188,7 @@ void QNativeInterface::QAndroidApplication::hideSplashScreen(int duration) #if QT_CONFIG(future) && !defined(QT_NO_QOBJECT) QFuture<QVariant> QNativeInterface::QAndroidApplication::runOnAndroidMainThread( const std::function<QVariant()> &runnable, - const QDeadlineTimer &timeout) + const QDeadlineTimer timeout) { QSharedPointer<QPromise<QVariant>> promise(new QPromise<QVariant>()); QFuture<QVariant> future = promise->future(); |