diff options
Diffstat (limited to 'src/corelib/kernel/qcoreapplication_platform.h')
| -rw-r--r-- | src/corelib/kernel/qcoreapplication_platform.h | 70 |
1 files changed, 26 insertions, 44 deletions
diff --git a/src/corelib/kernel/qcoreapplication_platform.h b/src/corelib/kernel/qcoreapplication_platform.h index 76779b438c..e430f3495b 100644 --- a/src/corelib/kernel/qcoreapplication_platform.h +++ b/src/corelib/kernel/qcoreapplication_platform.h @@ -1,82 +1,64 @@ -/**************************************************************************** -** -** Copyright (C) 2021 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2021 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QCOREAPPLICATION_PLATFORM_H #define QCOREAPPLICATION_PLATFORM_H +// +// W A R N I N G +// ------------- +// +// This file is part of the native interface APIs. Usage of +// this API may make your code source and binary incompatible +// with future versions of Qt. +// + #include <QtCore/qglobal.h> #include <QtCore/qnativeinterface.h> #include <QtCore/qcoreapplication.h> +#if defined(Q_OS_ANDROID) || defined(Q_QDOC) +#include <QtCore/qjnitypes.h> #if QT_CONFIG(future) && !defined(QT_NO_QOBJECT) #include <QtCore/qfuture.h> #include <QtCore/qvariant.h> #endif +#endif // #if defined(Q_OS_ANDROID) || defined(Q_QDOC) -#if defined(Q_OS_ANDROID) && !defined(Q_OS_ANDROID_EMBEDDED) +#if defined(Q_OS_ANDROID) class _jobject; typedef _jobject* jobject; #endif QT_BEGIN_NAMESPACE +#if defined(Q_OS_ANDROID) +Q_DECLARE_JNI_CLASS(Context, "android/content/Context") +#endif + namespace QNativeInterface { -#if defined(Q_OS_ANDROID) && !defined(Q_OS_ANDROID_EMBEDDED) || defined(Q_CLANG_QDOC) +#if defined(Q_OS_ANDROID) || defined(Q_QDOC) struct Q_CORE_EXPORT QAndroidApplication { QT_DECLARE_NATIVE_INTERFACE(QAndroidApplication, 1, QCoreApplication) +#ifdef Q_QDOC static jobject context(); +#else + static QtJniTypes::Context context(); +#endif static bool isActivityContext(); static int sdkVersion(); static void hideSplashScreen(int duration = 0); #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)); |