aboutsummaryrefslogtreecommitdiffstats
path: root/src/jar
diff options
context:
space:
mode:
authorAssam Boudjelthia <[email protected]>2021-05-11 12:49:40 +0300
committerAssam Boudjelthia <[email protected]>2021-06-29 14:08:24 +0300
commitae24e41ad4da78b029fd42ea317e4d2be73b015e (patch)
tree3f2d8c44dbf5a3eb666a7782bb5c1dfd62481c8e /src/jar
parentede82024b08842e9599b9bdbd00b7498601a921f (diff)
Remove QtAndroidExtras module and add note about its state in Qt 6HEADdev
The JNI utilities (i.e. QJniObject, QJniEnvironment) are already under qtbase as public APIs. Permission handling is now under QCoreApplication::{check,request}Permission and QPermission namespace. Some of the QtAndroid namespace functions are now under QNativeInterface's QAndroidApplication, this includes: * sdkVersion() * hideSplashScreen() * context() and isActivityContext() * runOnAndroidMainThread() The remaining APIs are now moved as private APIs under qtbase ee05af296f65e240f64db6470cdddafbddbf2fa3. That is until we add new cross-platform APIs to replace their functionalities like Intents handling, starting activites and working with Services. Task-number: QTBUG-83251 Task-number: QTBUG-84382 Pick-to: 6.2 Change-Id: Id077f8cbbe223a987916f737fad6088fb58e470d Reviewed-by: Ville Voutilainen <[email protected]>
Diffstat (limited to 'src/jar')
-rw-r--r--src/jar/AndroidManifest.xml6
-rw-r--r--src/jar/CMakeLists.txt19
-rw-r--r--src/jar/src/org/qtproject/qt/android/extras/QtAndroidBinder.java69
-rw-r--r--src/jar/src/org/qtproject/qt/android/extras/QtAndroidServiceConnection.java78
-rw-r--r--src/jar/src/org/qtproject/qt/android/extras/QtNative.java55
5 files changed, 0 insertions, 227 deletions
diff --git a/src/jar/AndroidManifest.xml b/src/jar/AndroidManifest.xml
deleted file mode 100644
index 17019fb..0000000
--- a/src/jar/AndroidManifest.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="org.qtproject.qt.android.multimedia"
- android:versionCode="1"
- android:versionName="1.0" >
- <supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/>
-</manifest>
diff --git a/src/jar/CMakeLists.txt b/src/jar/CMakeLists.txt
deleted file mode 100644
index 0aab31a..0000000
--- a/src/jar/CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-# Generated from jar.pro.
-
-set(java_sources
- src/org/qtproject/qt/android/extras/QtAndroidBinder.java
- src/org/qtproject/qt/android/extras/QtAndroidServiceConnection.java
- src/org/qtproject/qt/android/extras/QtNative.java
-)
-
-qt_internal_add_jar(Qt${QtAndroidExtras_VERSION_MAJOR}AndroidExtras # special case
- INCLUDE_JARS ${QT_ANDROID_JAR}
- SOURCES ${java_sources}
- OUTPUT_DIR "${QT_BUILD_DIR}/jar"
-)
-
-install_jar(Qt${QtAndroidExtras_VERSION_MAJOR}AndroidExtras # special case
- DESTINATION jar
- COMPONENT Devel
-)
-
diff --git a/src/jar/src/org/qtproject/qt/android/extras/QtAndroidBinder.java b/src/jar/src/org/qtproject/qt/android/extras/QtAndroidBinder.java
deleted file mode 100644
index 4e34955..0000000
--- a/src/jar/src/org/qtproject/qt/android/extras/QtAndroidBinder.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 BogDan Vatra <[email protected]>
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Android port 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$
-**
-****************************************************************************/
-
-package org.qtproject.qt.android.extras;
-
-import android.os.Binder;
-import android.os.Parcel;
-
-public class QtAndroidBinder extends Binder
-{
- public QtAndroidBinder(long id)
- {
- m_id = id;
- }
-
- public void setId(long id)
- {
- synchronized(this)
- {
- m_id = id;
- }
- }
- @Override
- protected boolean onTransact(int code, Parcel data, Parcel reply, int flags)
- {
- synchronized(this)
- {
- return QtNative.onTransact(m_id, code, data, reply, flags);
- }
- }
-
- private long m_id;
-}
diff --git a/src/jar/src/org/qtproject/qt/android/extras/QtAndroidServiceConnection.java b/src/jar/src/org/qtproject/qt/android/extras/QtAndroidServiceConnection.java
deleted file mode 100644
index bab4d3f..0000000
--- a/src/jar/src/org/qtproject/qt/android/extras/QtAndroidServiceConnection.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 BogDan Vatra <[email protected]>
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Android port 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$
-**
-****************************************************************************/
-
-package org.qtproject.qt.android.extras;
-
-import android.content.ComponentName;
-import android.content.ServiceConnection;
-import android.os.IBinder;
-
-public class QtAndroidServiceConnection implements ServiceConnection
-{
- public QtAndroidServiceConnection(long id)
- {
- m_id = id;
- }
-
- public void setId(long id)
- {
- synchronized(this)
- {
- m_id = id;
- }
- }
-
- @Override
- public void onServiceConnected(ComponentName name, IBinder service)
- {
- synchronized(this) {
- QtNative.onServiceConnected(m_id, name.flattenToString(), service);
- }
- }
-
- @Override
- public void onServiceDisconnected(ComponentName name)
- {
- synchronized(this) {
- QtNative.onServiceDisconnected(m_id, name.flattenToString());
- }
- }
-
- private long m_id;
-}
diff --git a/src/jar/src/org/qtproject/qt/android/extras/QtNative.java b/src/jar/src/org/qtproject/qt/android/extras/QtNative.java
deleted file mode 100644
index 86a9151..0000000
--- a/src/jar/src/org/qtproject/qt/android/extras/QtNative.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 BogDan Vatra <[email protected]>
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Android port 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$
-**
-****************************************************************************/
-
-package org.qtproject.qt.android.extras;
-
-import android.content.ComponentName;
-import android.content.ServiceConnection;
-import android.os.IBinder;
-import android.os.Parcel;
-
-public class QtNative {
- // Binder
- public static native boolean onTransact(long id, int code, Parcel data, Parcel reply, int flags);
-
-
- // ServiceConnection
- public static native void onServiceConnected(long id, String name, IBinder service);
- public static native void onServiceDisconnected(long id, String name);
-}