diff options
Diffstat (limited to 'src/corelib/doc/include')
-rw-r--r-- | src/corelib/doc/include/QtCoreDoc | 4 | ||||
-rw-r--r-- | src/corelib/doc/include/jni.h | 43 |
2 files changed, 9 insertions, 38 deletions
diff --git a/src/corelib/doc/include/QtCoreDoc b/src/corelib/doc/include/QtCoreDoc new file mode 100644 index 0000000000..5f5490cbc9 --- /dev/null +++ b/src/corelib/doc/include/QtCoreDoc @@ -0,0 +1,4 @@ +#include <QtCore/QtCore> +#include "../../platform/android/qandroidextras_p.h" +#include "../../kernel/qpermissions.h" +#include "../../tools/qatomicscopedvaluerollback_p.h" diff --git a/src/corelib/doc/include/jni.h b/src/corelib/doc/include/jni.h index 09186969dd..4eff8636f6 100644 --- a/src/corelib/doc/include/jni.h +++ b/src/corelib/doc/include/jni.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** 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 #pragma once @@ -58,5 +22,8 @@ struct _jclass; typedef _jclass* jclass; struct _jobject; typedef _jobject* jobject; +typedef int jint; +typedef int jmethodID; +typedef int jfieldID; typedef void* JavaVM; #endif |