1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Android: rename Android's package name for Qt 6

Browse Source 
Rename Android package name org.qtproject.qt5.android to
org.qtproject.qt.android to avoid inconsistency with Qt 6 name.
Also, we include the major version number in the jar target.

Task-number: QTBUG-86969
Change-Id: Ibb68947289be1079911b34ea157bf089cc52c47f
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Assam Boudjelthia 2020-09-29 11:48:04 +03:00
parent 4e675cb85e
commit 1907599bfd
45 changed files with 96 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qmake/doc/src/qmake-manual.qdoc
View File

@ -959,7 +959,7 @@
dependencies used by the module in a \c .jar format, for example: dependencies used by the module in a \c .jar format, for example:
\badcode \badcode
ANDROID_BUNDLED_JAR_DEPENDENCIES += jar/QtAndroid.jar ANDROID_BUNDLED_JAR_DEPENDENCIES += jar/Qt6Android.jar
\endcode \endcode
\target ANDROID_DEPLOYMENT_DEPENDENCIES \target ANDROID_DEPLOYMENT_DEPENDENCIES

30
src/android/jar/.prev_CMakeLists.txt
View File

@ -1,21 +1,21 @@
# Generated from jar.pro. # Generated from jar.pro.
set(java_sources set(java_sources
src/org/qtproject/qt5/android//accessibility/QtAccessibilityDelegate.java src/org/qtproject/qt/android//accessibility/QtAccessibilityDelegate.java
src/org/qtproject/qt5/android//accessibility/QtNativeAccessibility.java src/org/qtproject/qt/android//accessibility/QtNativeAccessibility.java
src/org/qtproject/qt5/android//CursorHandle.java src/org/qtproject/qt/android//CursorHandle.java
src/org/qtproject/qt5/android//EditContextView.java src/org/qtproject/qt/android//EditContextView.java
src/org/qtproject/qt5/android//EditPopupMenu.java src/org/qtproject/qt/android//EditPopupMenu.java
src/org/qtproject/qt5/android//ExtractStyle.java src/org/qtproject/qt/android//ExtractStyle.java
src/org/qtproject/qt5/android//QtActivityDelegate.java src/org/qtproject/qt/android//QtActivityDelegate.java
src/org/qtproject/qt5/android//QtEditText.java src/org/qtproject/qt/android//QtEditText.java
src/org/qtproject/qt5/android//QtInputConnection.java src/org/qtproject/qt/android//QtInputConnection.java
src/org/qtproject/qt5/android//QtLayout.java src/org/qtproject/qt/android//QtLayout.java
src/org/qtproject/qt5/android//QtMessageDialogHelper.java src/org/qtproject/qt/android//QtMessageDialogHelper.java
src/org/qtproject/qt5/android//QtNative.java src/org/qtproject/qt/android//QtNative.java
src/org/qtproject/qt5/android//QtNativeLibrariesDir.java src/org/qtproject/qt/android//QtNativeLibrariesDir.java
src/org/qtproject/qt5/android//QtSurface.java src/org/qtproject/qt/android//QtSurface.java
src/org/qtproject/qt5/android//QtThread.java src/org/qtproject/qt/android//QtThread.java
) )
qt_internal_add_jar(QtAndroid qt_internal_add_jar(QtAndroid

2
src/android/jar/AndroidManifest.xml
View File

@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?> <?xml version='1.0' encoding='utf-8'?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="org.qtproject.qt5.android"> <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="org.qtproject.qt.android">
<supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/> <supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/>
<uses-sdk android:minSdkVersion="9" /> <uses-sdk android:minSdkVersion="9" />
</manifest> </manifest>

36
src/android/jar/CMakeLists.txt
View File

@ -1,31 +1,31 @@
# Generated from jar.pro. # Generated from jar.pro.
set(java_sources set(java_sources
src/org/qtproject/qt5/android/accessibility/QtAccessibilityDelegate.java src/org/qtproject/qt/android/accessibility/QtAccessibilityDelegate.java
src/org/qtproject/qt5/android/accessibility/QtNativeAccessibility.java src/org/qtproject/qt/android/accessibility/QtNativeAccessibility.java
src/org/qtproject/qt5/android/CursorHandle.java src/org/qtproject/qt/android/CursorHandle.java
src/org/qtproject/qt5/android/EditContextView.java src/org/qtproject/qt/android/EditContextView.java
src/org/qtproject/qt5/android/EditPopupMenu.java src/org/qtproject/qt/android/EditPopupMenu.java
src/org/qtproject/qt5/android/ExtractStyle.java src/org/qtproject/qt/android/ExtractStyle.java
src/org/qtproject/qt5/android/QtActivityDelegate.java src/org/qtproject/qt/android/QtActivityDelegate.java
src/org/qtproject/qt5/android/QtEditText.java src/org/qtproject/qt/android/QtEditText.java
src/org/qtproject/qt5/android/QtInputConnection.java src/org/qtproject/qt/android/QtInputConnection.java
src/org/qtproject/qt5/android/QtLayout.java src/org/qtproject/qt/android/QtLayout.java
src/org/qtproject/qt5/android/QtMessageDialogHelper.java src/org/qtproject/qt/android/QtMessageDialogHelper.java
src/org/qtproject/qt5/android/QtNative.java src/org/qtproject/qt/android/QtNative.java
src/org/qtproject/qt5/android/QtNativeLibrariesDir.java src/org/qtproject/qt/android/QtNativeLibrariesDir.java
src/org/qtproject/qt5/android/QtSurface.java src/org/qtproject/qt/android/QtSurface.java
src/org/qtproject/qt5/android/QtThread.java src/org/qtproject/qt/android/QtThread.java
src/org/qtproject/qt5/android/QtServiceDelegate.java # special case src/org/qtproject/qt/android/QtServiceDelegate.java # special case
) )
qt_internal_add_jar(QtAndroid qt_internal_add_jar(Qt${QtBase_VERSION_MAJOR}Android # special case
INCLUDE_JARS ${QT_ANDROID_JAR} INCLUDE_JARS ${QT_ANDROID_JAR}
SOURCES ${java_sources} SOURCES ${java_sources}
OUTPUT_DIR "${QT_BUILD_DIR}/jar" OUTPUT_DIR "${QT_BUILD_DIR}/jar"
) )
install_jar(QtAndroid install_jar(Qt${QtBase_VERSION_MAJOR}Android # special case
DESTINATION jar DESTINATION jar
COMPONENT Devel COMPONENT Devel
) )

4
src/android/jar/jar.pro
View File

@ -1,10 +1,10 @@
TARGET = QtAndroid TARGET = Qt$${QT_MAJOR_VERSION}Android
CONFIG += java CONFIG += java
DESTDIR = $$[QT_INSTALL_PREFIX/get]/jar DESTDIR = $$[QT_INSTALL_PREFIX/get]/jar
PATHPREFIX = $$PWD/src/org/qtproject/qt5/android/ PATHPREFIX = $$PWD/src/org/qtproject/qt/android/
JAVACLASSPATH += $$PWD/src/ JAVACLASSPATH += $$PWD/src/
JAVASOURCES += \ JAVASOURCES += \

2
src/android/jar/src/org/qtproject/qt5/android/CursorHandle.java → src/android/jar/src/org/qtproject/qt/android/CursorHandle.java
View File

@ -37,7 +37,7 @@
** **
****************************************************************************/ ****************************************************************************/
package org.qtproject.qt5.android; package org.qtproject.qt.android;
import android.content.Context; import android.content.Context;
import android.os.Bundle; import android.os.Bundle;

2
src/android/jar/src/org/qtproject/qt5/android/EditContextView.java → src/android/jar/src/org/qtproject/qt/android/EditContextView.java
View File

@ -37,7 +37,7 @@
** **
****************************************************************************/ ****************************************************************************/
package org.qtproject.qt5.android; package org.qtproject.qt.android;
import android.content.Context; import android.content.Context;

2
src/android/jar/src/org/qtproject/qt5/android/EditPopupMenu.java → src/android/jar/src/org/qtproject/qt/android/EditPopupMenu.java
View File

@ -38,7 +38,7 @@
** **
****************************************************************************/ ****************************************************************************/
package org.qtproject.qt5.android; package org.qtproject.qt.android;
import android.content.Context; import android.content.Context;
import android.os.Bundle; import android.os.Bundle;

2
src/android/jar/src/org/qtproject/qt5/android/ExtractStyle.java → src/android/jar/src/org/qtproject/qt/android/ExtractStyle.java
View File

@ -37,7 +37,7 @@
** **
****************************************************************************/ ****************************************************************************/
package org.qtproject.qt5.android; package org.qtproject.qt.android;
import java.io.File; import java.io.File;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;

4
src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java → src/android/jar/src/org/qtproject/qt/android/QtActivityDelegate.java
View File

@ -39,7 +39,7 @@
** **
****************************************************************************/ ****************************************************************************/
package org.qtproject.qt5.android; package org.qtproject.qt.android;
import android.app.Activity; import android.app.Activity;
import android.content.Context; import android.content.Context;
@ -96,7 +96,7 @@ import java.lang.reflect.Method;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import org.qtproject.qt5.android.accessibility.QtAccessibilityDelegate; import org.qtproject.qt.android.accessibility.QtAccessibilityDelegate;
public class QtActivityDelegate public class QtActivityDelegate
{ {

2
src/android/jar/src/org/qtproject/qt5/android/QtEditText.java → src/android/jar/src/org/qtproject/qt/android/QtEditText.java
View File

@ -38,7 +38,7 @@
** **
****************************************************************************/ ****************************************************************************/
package org.qtproject.qt5.android; package org.qtproject.qt.android;
import android.content.Context; import android.content.Context;
import android.text.InputType; import android.text.InputType;

2
src/android/jar/src/org/qtproject/qt5/android/QtInputConnection.java → src/android/jar/src/org/qtproject/qt/android/QtInputConnection.java
View File

@ -38,7 +38,7 @@
** **
****************************************************************************/ ****************************************************************************/
package org.qtproject.qt5.android; package org.qtproject.qt.android;
import android.content.Context; import android.content.Context;
import android.view.inputmethod.BaseInputConnection; import android.view.inputmethod.BaseInputConnection;

2
src/android/jar/src/org/qtproject/qt5/android/QtLayout.java → src/android/jar/src/org/qtproject/qt/android/QtLayout.java
View File

@ -38,7 +38,7 @@
** **
****************************************************************************/ ****************************************************************************/
package org.qtproject.qt5.android; package org.qtproject.qt.android;
import android.app.Activity; import android.app.Activity;
import android.content.Context; import android.content.Context;

2
src/android/jar/src/org/qtproject/qt5/android/QtMessageDialogHelper.java → src/android/jar/src/org/qtproject/qt/android/QtMessageDialogHelper.java
View File

@ -38,7 +38,7 @@
****************************************************************************/ ****************************************************************************/
package org.qtproject.qt5.android; package org.qtproject.qt.android;
import android.app.Activity; import android.app.Activity;
import android.app.AlertDialog; import android.app.AlertDialog;

2
src/android/jar/src/org/qtproject/qt5/android/QtNative.java → src/android/jar/src/org/qtproject/qt/android/QtNative.java
View File

@ -38,7 +38,7 @@
** **
****************************************************************************/ ****************************************************************************/
package org.qtproject.qt5.android; package org.qtproject.qt.android;
import java.io.File; import java.io.File;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;

2
src/android/jar/src/org/qtproject/qt5/android/QtNativeLibrariesDir.java → src/android/jar/src/org/qtproject/qt/android/QtNativeLibrariesDir.java
View File

@ -38,7 +38,7 @@
** **
****************************************************************************/ ****************************************************************************/
package org.qtproject.qt5.android; package org.qtproject.qt.android;
import android.content.Context; import android.content.Context;
import android.content.pm.ApplicationInfo; import android.content.pm.ApplicationInfo;

2
src/android/jar/src/org/qtproject/qt5/android/QtServiceDelegate.java → src/android/jar/src/org/qtproject/qt/android/QtServiceDelegate.java
View File

@ -38,7 +38,7 @@
** **
****************************************************************************/ ****************************************************************************/
package org.qtproject.qt5.android; package org.qtproject.qt.android;
import android.app.Service; import android.app.Service;
import android.content.Context; import android.content.Context;

2
src/android/jar/src/org/qtproject/qt5/android/QtSurface.java → src/android/jar/src/org/qtproject/qt/android/QtSurface.java
View File

@ -38,7 +38,7 @@
** **
****************************************************************************/ ****************************************************************************/
package org.qtproject.qt5.android; package org.qtproject.qt.android;
import android.app.Activity; import android.app.Activity;
import android.content.Context; import android.content.Context;

2
src/android/jar/src/org/qtproject/qt5/android/QtThread.java → src/android/jar/src/org/qtproject/qt/android/QtThread.java
View File

@ -37,7 +37,7 @@
** **
****************************************************************************/ ****************************************************************************/
package org.qtproject.qt5.android; package org.qtproject.qt.android;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.concurrent.Semaphore; import java.util.concurrent.Semaphore;

4
src/android/jar/src/org/qtproject/qt5/android/accessibility/QtAccessibilityDelegate.java → src/android/jar/src/org/qtproject/qt/android/accessibility/QtAccessibilityDelegate.java
View File

@ -38,7 +38,7 @@
****************************************************************************/ ****************************************************************************/
package org.qtproject.qt5.android.accessibility; package org.qtproject.qt.android.accessibility;
import android.accessibilityservice.AccessibilityService; import android.accessibilityservice.AccessibilityService;
import android.app.Activity; import android.app.Activity;
@ -59,7 +59,7 @@ import android.content.Context;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import org.qtproject.qt5.android.QtActivityDelegate; import org.qtproject.qt.android.QtActivityDelegate;
public class QtAccessibilityDelegate extends View.AccessibilityDelegate public class QtAccessibilityDelegate extends View.AccessibilityDelegate
{ {

2
src/android/jar/src/org/qtproject/qt5/android/accessibility/QtNativeAccessibility.java → src/android/jar/src/org/qtproject/qt/android/accessibility/QtNativeAccessibility.java
View File

@ -37,7 +37,7 @@
** **
****************************************************************************/ ****************************************************************************/
package org.qtproject.qt5.android.accessibility; package org.qtproject.qt.android.accessibility;
import android.graphics.Rect; import android.graphics.Rect;
import android.view.accessibility.AccessibilityNodeInfo; import android.view.accessibility.AccessibilityNodeInfo;

4
src/android/java/src/org/qtproject/qt5/android/bindings/QtActivity.java → src/android/java/src/org/qtproject/qt/android/bindings/QtActivity.java
View File

@ -34,7 +34,7 @@
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
package org.qtproject.qt5.android.bindings; package org.qtproject.qt.android.bindings;
import android.app.Activity; import android.app.Activity;
import android.app.Dialog; import android.app.Dialog;
@ -60,7 +60,7 @@ import android.view.View;
import android.view.WindowManager.LayoutParams; import android.view.WindowManager.LayoutParams;
import android.view.accessibility.AccessibilityEvent; import android.view.accessibility.AccessibilityEvent;
import org.qtproject.qt5.android.QtNative; import org.qtproject.qt.android.QtNative;
public class QtActivity extends Activity public class QtActivity extends Activity
{ {

4
src/android/java/src/org/qtproject/qt5/android/bindings/QtActivityLoader.java → src/android/java/src/org/qtproject/qt/android/bindings/QtActivityLoader.java
View File

@ -34,7 +34,7 @@
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
package org.qtproject.qt5.android.bindings; package org.qtproject.qt.android.bindings;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.content.DialogInterface; import android.content.DialogInterface;
@ -87,7 +87,7 @@ public class QtActivityLoader extends QtLoader {
@Override @Override
protected String loaderClassName() { protected String loaderClassName() {
return "org.qtproject.qt5.android.QtActivityDelegate"; return "org.qtproject.qt.android.QtActivityDelegate";
} }
@Override @Override

4
src/android/java/src/org/qtproject/qt5/android/bindings/QtApplication.java → src/android/java/src/org/qtproject/qt/android/bindings/QtApplication.java
View File

@ -34,7 +34,7 @@
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
package org.qtproject.qt5.android.bindings; package org.qtproject.qt.android.bindings;
import android.app.Application; import android.app.Application;
@ -73,7 +73,7 @@ public class QtApplication extends Application
ArrayList<Method> delegateMethods = new ArrayList<Method>(); ArrayList<Method> delegateMethods = new ArrayList<Method>();
for (Method m : listener.getClass().getMethods()) { for (Method m : listener.getClass().getMethods()) {
if (m.getDeclaringClass().getName().startsWith("org.qtproject.qt5.android")) if (m.getDeclaringClass().getName().startsWith("org.qtproject.qt.android"))
delegateMethods.add(m); delegateMethods.add(m);
} }

2
src/android/java/src/org/qtproject/qt5/android/bindings/QtLoader.java → src/android/java/src/org/qtproject/qt/android/bindings/QtLoader.java
View File

@ -34,7 +34,7 @@
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
package org.qtproject.qt5.android.bindings; package org.qtproject.qt.android.bindings;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.content.ComponentName; import android.content.ComponentName;

2
src/android/java/src/org/qtproject/qt5/android/bindings/QtService.java → src/android/java/src/org/qtproject/qt/android/bindings/QtService.java
View File

@ -34,7 +34,7 @@
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
package org.qtproject.qt5.android.bindings; package org.qtproject.qt.android.bindings;
import android.app.Service; import android.app.Service;
import android.content.Intent; import android.content.Intent;

4
src/android/java/src/org/qtproject/qt5/android/bindings/QtServiceLoader.java → src/android/java/src/org/qtproject/qt/android/bindings/QtServiceLoader.java
View File

@ -34,7 +34,7 @@
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
package org.qtproject.qt5.android.bindings; package org.qtproject.qt.android.bindings;
import android.os.Bundle; import android.os.Bundle;
import android.content.ComponentName; import android.content.ComponentName;
@ -70,7 +70,7 @@ public class QtServiceLoader extends QtLoader {
@Override @Override
protected String loaderClassName() { protected String loaderClassName() {
return "org.qtproject.qt5.android.QtServiceDelegate"; return "org.qtproject.qt.android.QtServiceDelegate";
} }
@Override @Override

4
src/android/templates/AndroidManifest.xml
View File

@ -9,8 +9,8 @@
<!-- %%INSERT_FEATURES --> <!-- %%INSERT_FEATURES -->
<supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/> <supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/>
<application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="-- %%INSERT_APP_NAME%% --" android:extractNativeLibs="true"> <application android:hardwareAccelerated="true" android:name="org.qtproject.qt.android.bindings.QtApplication" android:label="-- %%INSERT_APP_NAME%% --" android:extractNativeLibs="true">
<activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation|mcc|mnc|density" android:name="org.qtproject.qt5.android.bindings.QtActivity" android:label="-- %%INSERT_APP_NAME%% --" android:screenOrientation="unspecified" android:launchMode="singleTop"> <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation|mcc|mnc|density" android:name="org.qtproject.qt.android.bindings.QtActivity" android:label="-- %%INSERT_APP_NAME%% --" android:screenOrientation="unspecified" android:launchMode="singleTop">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN"/> <action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/> <category android:name="android.intent.category.LAUNCHER"/>

2
src/corelib/CMakeLists.txt
View File

@ -368,7 +368,7 @@ endif()
if(ANDROID) if(ANDROID)
set_property(TARGET Core APPEND PROPERTY QT_ANDROID_BUNDLED_JAR_DEPENDENCIES set_property(TARGET Core APPEND PROPERTY QT_ANDROID_BUNDLED_JAR_DEPENDENCIES
jar/QtAndroid.jar jar/Qt${QtBase_VERSION_MAJOR}Android.jar # special case
) )
set_property(TARGET Core APPEND PROPERTY QT_ANDROID_LIB_DEPENDENCIES set_property(TARGET Core APPEND PROPERTY QT_ANDROID_LIB_DEPENDENCIES
plugins/platforms/libplugins_platforms_qtforandroid.so plugins/platforms/libplugins_platforms_qtforandroid.so

2
src/corelib/corelib.pro
View File

@ -24,7 +24,7 @@ QMAKE_DOCS = $$PWD/doc/qtcore.qdocconf
ANDROID_LIB_DEPENDENCIES = \ ANDROID_LIB_DEPENDENCIES = \
plugins/platforms/libplugins_platforms_qtforandroid.so plugins/platforms/libplugins_platforms_qtforandroid.so
ANDROID_BUNDLED_JAR_DEPENDENCIES = \ ANDROID_BUNDLED_JAR_DEPENDENCIES = \
jar/QtAndroid.jar jar/Qt$${QT_MAJOR_VERSION}Android.jar
ANDROID_PERMISSIONS = \ ANDROID_PERMISSIONS = \
android.permission.INTERNET \ android.permission.INTERNET \
android.permission.WRITE_EXTERNAL_STORAGE android.permission.WRITE_EXTERNAL_STORAGE

4
src/corelib/kernel/qjnihelpers.cpp
View File

@ -340,7 +340,7 @@ static void setNativeService(JNIEnv *env, jclass, jobject service)
jint QtAndroidPrivate::initJNI(JavaVM *vm, JNIEnv *env) jint QtAndroidPrivate::initJNI(JavaVM *vm, JNIEnv *env)
{ {
jclass jQtNative = env->FindClass("org/qtproject/qt5/android/QtNative"); jclass jQtNative = env->FindClass("org/qtproject/qt/android/QtNative");
if (exceptionCheck(env)) if (exceptionCheck(env))
return JNI_ERR; return JNI_ERR;
@ -543,7 +543,7 @@ QtAndroidPrivate::PermissionsHash QtAndroidPrivate::requestPermissionsSync(JNIEn
QtAndroidPrivate::PermissionsResult QtAndroidPrivate::checkPermission(const QString &permission) QtAndroidPrivate::PermissionsResult QtAndroidPrivate::checkPermission(const QString &permission)
{ {
const auto res = QJNIObjectPrivate::callStaticMethod<jint>("org/qtproject/qt5/android/QtNative", const auto res = QJNIObjectPrivate::callStaticMethod<jint>("org/qtproject/qt/android/QtNative",
"checkSelfPermission", "checkSelfPermission",
"(Ljava/lang/String;)I", "(Ljava/lang/String;)I",
QJNIObjectPrivate::fromString(permission).object()); QJNIObjectPrivate::fromString(permission).object());

2
src/network/CMakeLists.txt
View File

@ -258,7 +258,7 @@ qt_internal_extend_target(Network CONDITION UNIX AND NOT ANDROID AND NOT MACOS A
if(ANDROID AND (ANDROID)) if(ANDROID AND (ANDROID))
set_property(TARGET Network APPEND PROPERTY QT_ANDROID_BUNDLED_JAR_DEPENDENCIES set_property(TARGET Network APPEND PROPERTY QT_ANDROID_BUNDLED_JAR_DEPENDENCIES
jar/QtAndroidNetwork.jar jar/Qt${QtBase_VERSION_MAJOR}AndroidNetwork.jar # special case
) )
endif() endif()

6
src/network/android/jar/CMakeLists.txt
View File

@ -1,16 +1,16 @@
# Generated from jar.pro. # Generated from jar.pro.
set(java_sources set(java_sources
src/org/qtproject/qt5/android/network/QtNetwork.java src/org/qtproject/qt/android/network/QtNetwork.java
) )
qt_internal_add_jar(QtAndroidNetwork qt_internal_add_jar(Qt${QtBase_VERSION_MAJOR}AndroidNetwork # special case
INCLUDE_JARS ${QT_ANDROID_JAR} INCLUDE_JARS ${QT_ANDROID_JAR}
SOURCES ${java_sources} SOURCES ${java_sources}
OUTPUT_DIR "${QT_BUILD_DIR}/jar" OUTPUT_DIR "${QT_BUILD_DIR}/jar"
) )
install_jar(QtAndroidNetwork install_jar(Qt${QtBase_VERSION_MAJOR}AndroidNetwork # special case
DESTINATION jar DESTINATION jar
COMPONENT Devel COMPONENT Devel
) )

4
src/network/android/jar/jar.pro
View File

@ -1,6 +1,6 @@
CONFIG += single_arch CONFIG += single_arch
TARGET = QtAndroidNetwork TARGET = Qt$${QT_MAJOR_VERSION}AndroidNetwork
load(qt_build_paths) load(qt_build_paths)
CONFIG += java CONFIG += java
@ -8,7 +8,7 @@ DESTDIR = $$MODULE_BASE_OUTDIR/jar
JAVACLASSPATH += $$PWD/src JAVACLASSPATH += $$PWD/src
JAVASOURCES += $$PWD/src/org/qtproject/qt5/android/network/QtNetwork.java JAVASOURCES += $$PWD/src/org/qtproject/qt/android/network/QtNetwork.java
# install # install
target.path = $$[QT_INSTALL_PREFIX]/jar target.path = $$[QT_INSTALL_PREFIX]/jar

2
src/network/android/jar/src/org/qtproject/qt5/android/network/QtNetwork.java → src/network/android/jar/src/org/qtproject/qt/android/network/QtNetwork.java
View File

@ -37,7 +37,7 @@
** **
****************************************************************************/ ****************************************************************************/
package org.qtproject.qt5.android.network; package org.qtproject.qt.android.network;
import android.content.BroadcastReceiver; import android.content.BroadcastReceiver;
import android.content.Context; import android.content.Context;

2
src/network/kernel/kernel.pri
View File

@ -92,4 +92,4 @@ else:android: SOURCES += kernel/qnetworkproxy_android.cpp
else: SOURCES += kernel/qnetworkproxy_generic.cpp else: SOURCES += kernel/qnetworkproxy_generic.cpp
android: ANDROID_BUNDLED_JAR_DEPENDENCIES = \ android: ANDROID_BUNDLED_JAR_DEPENDENCIES = \
jar/QtAndroidNetwork.jar jar/Qt$${QT_MAJOR_VERSION}AndroidNetwork.jar

2
src/network/kernel/qnetworkproxy_android.cpp
View File

@ -54,7 +54,7 @@ public:
Q_GLOBAL_STATIC(ProxyInfoObject, proxyInfoInstance) Q_GLOBAL_STATIC(ProxyInfoObject, proxyInfoInstance)
static const char networkClass[] = "org/qtproject/qt5/android/network/QtNetwork"; static const char networkClass[] = "org/qtproject/qt/android/network/QtNetwork";
ProxyInfoObject::ProxyInfoObject() ProxyInfoObject::ProxyInfoObject()
{ {

2
src/network/ssl/qsslsocket_openssl_android.cpp
View File

@ -61,7 +61,7 @@ QList<QByteArray> QSslSocketPrivate::fetchSslCertificateData()
{ {
QList<QByteArray> certificateData; QList<QByteArray> certificateData;
QJNIObjectPrivate certificates = QJNIObjectPrivate::callStaticObjectMethod("org/qtproject/qt5/android/QtNative", QJNIObjectPrivate certificates = QJNIObjectPrivate::callStaticObjectMethod("org/qtproject/qt/android/QtNative",
"getSSLCertificates", "getSSLCertificates",
"()[[B"); "()[[B");
if (!certificates.isValid()) if (!certificates.isValid())

12
src/plugins/platforms/android/androidcontentfileengine.cpp
View File

@ -65,7 +65,7 @@ bool AndroidContentFileEngine::open(QIODevice::OpenMode openMode)
openModeStr += QLatin1Char('a'); openModeStr += QLatin1Char('a');
} }
const auto fd = QJNIObjectPrivate::callStaticMethod<jint>("org/qtproject/qt5/android/QtNative", const auto fd = QJNIObjectPrivate::callStaticMethod<jint>("org/qtproject/qt/android/QtNative",
"openFdForContentUrl", "openFdForContentUrl",
"(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;)I", "(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;)I",
QtAndroidPrivate::context(), QtAndroidPrivate::context(),
@ -82,7 +82,7 @@ bool AndroidContentFileEngine::open(QIODevice::OpenMode openMode)
qint64 AndroidContentFileEngine::size() const qint64 AndroidContentFileEngine::size() const
{ {
const jlong size = QJNIObjectPrivate::callStaticMethod<jlong>( const jlong size = QJNIObjectPrivate::callStaticMethod<jlong>(
"org/qtproject/qt5/android/QtNative", "getSize", "org/qtproject/qt/android/QtNative", "getSize",
"(Landroid/content/Context;Ljava/lang/String;)J", QtAndroidPrivate::context(), "(Landroid/content/Context;Ljava/lang/String;)J", QtAndroidPrivate::context(),
QJNIObjectPrivate::fromString(fileName(DefaultName)).object()); QJNIObjectPrivate::fromString(fileName(DefaultName)).object());
return (qint64)size; return (qint64)size;
@ -93,12 +93,12 @@ AndroidContentFileEngine::FileFlags AndroidContentFileEngine::fileFlags(FileFlag
FileFlags commonFlags(ReadOwnerPerm|ReadUserPerm|ReadGroupPerm|ReadOtherPerm|ExistsFlag); FileFlags commonFlags(ReadOwnerPerm|ReadUserPerm|ReadGroupPerm|ReadOtherPerm|ExistsFlag);
FileFlags flags; FileFlags flags;
const bool isDir = QJNIObjectPrivate::callStaticMethod<jboolean>( const bool isDir = QJNIObjectPrivate::callStaticMethod<jboolean>(
"org/qtproject/qt5/android/QtNative", "checkIfDir", "org/qtproject/qt/android/QtNative", "checkIfDir",
"(Landroid/content/Context;Ljava/lang/String;)Z", QtAndroidPrivate::context(), "(Landroid/content/Context;Ljava/lang/String;)Z", QtAndroidPrivate::context(),
QJNIObjectPrivate::fromString(fileName(DefaultName)).object()); QJNIObjectPrivate::fromString(fileName(DefaultName)).object());
// If it is a directory then we know it exists so there is no reason to explicitly check // If it is a directory then we know it exists so there is no reason to explicitly check
const bool exists = isDir ? true : QJNIObjectPrivate::callStaticMethod<jboolean>( const bool exists = isDir ? true : QJNIObjectPrivate::callStaticMethod<jboolean>(
"org/qtproject/qt5/android/QtNative", "checkFileExists", "org/qtproject/qt/android/QtNative", "checkFileExists",
"(Landroid/content/Context;Ljava/lang/String;)Z", QtAndroidPrivate::context(), "(Landroid/content/Context;Ljava/lang/String;)Z", QtAndroidPrivate::context(),
QJNIObjectPrivate::fromString(fileName(DefaultName)).object()); QJNIObjectPrivate::fromString(fileName(DefaultName)).object());
if (!exists && !isDir) if (!exists && !isDir)
@ -176,12 +176,12 @@ bool AndroidContentFileEngineIterator::hasNext() const
if (path().isEmpty()) if (path().isEmpty())
return false; return false;
const bool isDir = QJNIObjectPrivate::callStaticMethod<jboolean>( const bool isDir = QJNIObjectPrivate::callStaticMethod<jboolean>(
"org/qtproject/qt5/android/QtNative", "checkIfDir", "org/qtproject/qt/android/QtNative", "checkIfDir",
"(Landroid/content/Context;Ljava/lang/String;)Z", "(Landroid/content/Context;Ljava/lang/String;)Z",
QtAndroidPrivate::context(), QtAndroidPrivate::context(),
QJNIObjectPrivate::fromString(path()).object()); QJNIObjectPrivate::fromString(path()).object());
if (isDir) { if (isDir) {
QJNIObjectPrivate objArray = QJNIObjectPrivate::callStaticObjectMethod("org/qtproject/qt5/android/QtNative", QJNIObjectPrivate objArray = QJNIObjectPrivate::callStaticObjectMethod("org/qtproject/qt/android/QtNative",
"listContentsFromTreeUri", "listContentsFromTreeUri",
"(Landroid/content/Context;Ljava/lang/String;)[Ljava/lang/String;", "(Landroid/content/Context;Ljava/lang/String;)[Ljava/lang/String;",
QtAndroidPrivate::context(), QtAndroidPrivate::context(),

2
src/plugins/platforms/android/androidjniaccessibility.cpp
View File

@ -318,7 +318,7 @@ if (!clazz) { \
bool registerNatives(JNIEnv *env) bool registerNatives(JNIEnv *env)
{ {
jclass clazz; jclass clazz;
FIND_AND_CHECK_CLASS("org/qtproject/qt5/android/accessibility/QtNativeAccessibility"); FIND_AND_CHECK_CLASS("org/qtproject/qt/android/accessibility/QtNativeAccessibility");
jclass appClass = static_cast<jclass>(env->NewGlobalRef(clazz)); jclass appClass = static_cast<jclass>(env->NewGlobalRef(clazz));
if (env->RegisterNatives(appClass, methods, sizeof(methods) / sizeof(methods[0])) < 0) { if (env->RegisterNatives(appClass, methods, sizeof(methods) / sizeof(methods[0])) < 0) {

2
src/plugins/platforms/android/androidjnimain.cpp
View File

@ -806,7 +806,7 @@ if (!VAR) { \
static int registerNatives(JNIEnv *env) static int registerNatives(JNIEnv *env)
{ {
jclass clazz; jclass clazz;
FIND_AND_CHECK_CLASS("org/qtproject/qt5/android/QtNative"); FIND_AND_CHECK_CLASS("org/qtproject/qt/android/QtNative");
m_applicationClass = static_cast<jclass>(env->NewGlobalRef(clazz)); m_applicationClass = static_cast<jclass>(env->NewGlobalRef(clazz));
if (env->RegisterNatives(m_applicationClass, methods, sizeof(methods) / sizeof(methods[0])) < 0) { if (env->RegisterNatives(m_applicationClass, methods, sizeof(methods) / sizeof(methods[0])) < 0) {

6
src/plugins/platforms/android/qandroidinputcontext.cpp
View File

@ -92,8 +92,8 @@ private:
} // namespace anonymous } // namespace anonymous
static QAndroidInputContext *m_androidInputContext = 0; static QAndroidInputContext *m_androidInputContext = 0;
static char const *const QtNativeInputConnectionClassName = "org/qtproject/qt5/android/QtNativeInputConnection"; static char const *const QtNativeInputConnectionClassName = "org/qtproject/qt/android/QtNativeInputConnection";
static char const *const QtExtractedTextClassName = "org/qtproject/qt5/android/QtExtractedText"; static char const *const QtExtractedTextClassName = "org/qtproject/qt/android/QtExtractedText";
static jclass m_extractedTextClass = 0; static jclass m_extractedTextClass = 0;
static jmethodID m_classConstructorMethodID = 0; static jmethodID m_classConstructorMethodID = 0;
static jfieldID m_partialEndOffsetFieldID = 0; static jfieldID m_partialEndOffsetFieldID = 0;
@ -392,7 +392,7 @@ static JNINativeMethod methods[] = {
{"deleteSurroundingText", "(II)Z", (void *)deleteSurroundingText}, {"deleteSurroundingText", "(II)Z", (void *)deleteSurroundingText},
{"finishComposingText", "()Z", (void *)finishComposingText}, {"finishComposingText", "()Z", (void *)finishComposingText},
{"getCursorCapsMode", "(I)I", (void *)getCursorCapsMode}, {"getCursorCapsMode", "(I)I", (void *)getCursorCapsMode},
{"getExtractedText", "(III)Lorg/qtproject/qt5/android/QtExtractedText;", (void *)getExtractedText}, {"getExtractedText", "(III)Lorg/qtproject/qt/android/QtExtractedText;", (void *)getExtractedText},
{"getSelectedText", "(I)Ljava/lang/String;", (void *)getSelectedText}, {"getSelectedText", "(I)Ljava/lang/String;", (void *)getSelectedText},
{"getTextAfterCursor", "(II)Ljava/lang/String;", (void *)getTextAfterCursor}, {"getTextAfterCursor", "(II)Ljava/lang/String;", (void *)getTextAfterCursor},
{"getTextBeforeCursor", "(II)Ljava/lang/String;", (void *)getTextBeforeCursor}, {"getTextBeforeCursor", "(II)Ljava/lang/String;", (void *)getTextBeforeCursor},

4
src/plugins/platforms/android/qandroidplatformdialoghelpers.cpp
View File

@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE
namespace QtAndroidDialogHelpers { namespace QtAndroidDialogHelpers {
static jclass g_messageDialogHelperClass = 0; static jclass g_messageDialogHelperClass = 0;
static const char QtMessageHandlerHelperClassName[] = "org/qtproject/qt5/android/QtMessageDialogHelper"; static const char QtMessageHandlerHelperClassName[] = "org/qtproject/qt/android/QtMessageDialogHelper";
QAndroidPlatformMessageDialogHelper::QAndroidPlatformMessageDialogHelper() QAndroidPlatformMessageDialogHelper::QAndroidPlatformMessageDialogHelper()
:m_buttonId(-1) :m_buttonId(-1)
@ -190,7 +190,7 @@ bool registerNatives(JNIEnv *env)
return false; return false;
} }
g_messageDialogHelperClass = static_cast<jclass>(env->NewGlobalRef(clazz)); g_messageDialogHelperClass = static_cast<jclass>(env->NewGlobalRef(clazz));
FIND_AND_CHECK_CLASS("org/qtproject/qt5/android/QtNativeDialogHelper"); FIND_AND_CHECK_CLASS("org/qtproject/qt/android/QtNativeDialogHelper");
jclass appClass = static_cast<jclass>(env->NewGlobalRef(clazz)); jclass appClass = static_cast<jclass>(env->NewGlobalRef(clazz));
if (env->RegisterNatives(appClass, methods, sizeof(methods) / sizeof(methods[0])) < 0) { if (env->RegisterNatives(appClass, methods, sizeof(methods) / sizeof(methods[0])) < 0) {

2
src/plugins/platforms/android/qandroidplatformfiledialoghelper.cpp
View File

@ -176,7 +176,7 @@ void QAndroidPlatformFileDialogHelper::setMimeTypes()
JniIntentClass, "EXTRA_MIME_TYPES", "Ljava/lang/String;"); JniIntentClass, "EXTRA_MIME_TYPES", "Ljava/lang/String;");
QJNIObjectPrivate mimeTypesArray = QJNIObjectPrivate::callStaticObjectMethod( QJNIObjectPrivate mimeTypesArray = QJNIObjectPrivate::callStaticObjectMethod(
"org/qtproject/qt5/android/QtNative", "org/qtproject/qt/android/QtNative",
"getStringArray", "getStringArray",
"(Ljava/lang/String;)[Ljava/lang/String;", "(Ljava/lang/String;)[Ljava/lang/String;",
QJNIObjectPrivate::fromString(mimeTypes.join(",")).object()); QJNIObjectPrivate::fromString(mimeTypes.join(",")).object());

2
src/tools/androiddeployqt/main.cpp
View File

@ -680,7 +680,7 @@ bool alwaysOverwritableFile(const QString &fileName)
return (fileName.endsWith(QLatin1String("/res/values/libs.xml")) return (fileName.endsWith(QLatin1String("/res/values/libs.xml"))
|| fileName.endsWith(QLatin1String("/AndroidManifest.xml")) || fileName.endsWith(QLatin1String("/AndroidManifest.xml"))
|| fileName.endsWith(QLatin1String("/res/values/strings.xml")) || fileName.endsWith(QLatin1String("/res/values/strings.xml"))
|| fileName.endsWith(QLatin1String("/src/org/qtproject/qt5/android/bindings/QtActivity.java"))); || fileName.endsWith(QLatin1String("/src/org/qtproject/qt/android/bindings/QtActivity.java")));
} }