diff options
author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2020-09-29 11:48:04 +0300 |
---|---|---|
committer | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2020-10-03 11:22:35 +0300 |
commit | 1907599bfd817e00c7f42b8cb941ebf93a098e7f (patch) | |
tree | 643210622dc9ef0c218210453d7f8bd98aa60599 /src/android | |
parent | 4e675cb85e81b67f36473914f5822dd6e626ddf0 (diff) |
Android: rename Android's package name for Qt 6
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>
Diffstat (limited to 'src/android')
-rw-r--r-- | src/android/jar/.prev_CMakeLists.txt | 30 | ||||
-rw-r--r-- | src/android/jar/AndroidManifest.xml | 2 | ||||
-rw-r--r-- | src/android/jar/CMakeLists.txt | 36 | ||||
-rw-r--r-- | src/android/jar/jar.pro | 4 | ||||
-rw-r--r-- | src/android/jar/src/org/qtproject/qt/android/CursorHandle.java (renamed from src/android/jar/src/org/qtproject/qt5/android/CursorHandle.java) | 2 | ||||
-rw-r--r-- | src/android/jar/src/org/qtproject/qt/android/EditContextView.java (renamed from src/android/jar/src/org/qtproject/qt5/android/EditContextView.java) | 2 | ||||
-rw-r--r-- | src/android/jar/src/org/qtproject/qt/android/EditPopupMenu.java (renamed from src/android/jar/src/org/qtproject/qt5/android/EditPopupMenu.java) | 2 | ||||
-rw-r--r-- | src/android/jar/src/org/qtproject/qt/android/ExtractStyle.java (renamed from src/android/jar/src/org/qtproject/qt5/android/ExtractStyle.java) | 2 | ||||
-rw-r--r-- | src/android/jar/src/org/qtproject/qt/android/QtActivityDelegate.java (renamed from src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java) | 4 | ||||
-rw-r--r-- | src/android/jar/src/org/qtproject/qt/android/QtEditText.java (renamed from src/android/jar/src/org/qtproject/qt5/android/QtEditText.java) | 2 | ||||
-rw-r--r-- | src/android/jar/src/org/qtproject/qt/android/QtInputConnection.java (renamed from src/android/jar/src/org/qtproject/qt5/android/QtInputConnection.java) | 2 | ||||
-rw-r--r-- | src/android/jar/src/org/qtproject/qt/android/QtLayout.java (renamed from src/android/jar/src/org/qtproject/qt5/android/QtLayout.java) | 2 | ||||
-rw-r--r-- | src/android/jar/src/org/qtproject/qt/android/QtMessageDialogHelper.java (renamed from src/android/jar/src/org/qtproject/qt5/android/QtMessageDialogHelper.java) | 2 | ||||
-rw-r--r-- | src/android/jar/src/org/qtproject/qt/android/QtNative.java (renamed from src/android/jar/src/org/qtproject/qt5/android/QtNative.java) | 2 | ||||
-rw-r--r-- | src/android/jar/src/org/qtproject/qt/android/QtNativeLibrariesDir.java (renamed from src/android/jar/src/org/qtproject/qt5/android/QtNativeLibrariesDir.java) | 2 | ||||
-rw-r--r-- | src/android/jar/src/org/qtproject/qt/android/QtServiceDelegate.java (renamed from src/android/jar/src/org/qtproject/qt5/android/QtServiceDelegate.java) | 2 | ||||
-rw-r--r-- | src/android/jar/src/org/qtproject/qt/android/QtSurface.java (renamed from src/android/jar/src/org/qtproject/qt5/android/QtSurface.java) | 2 | ||||
-rw-r--r-- | src/android/jar/src/org/qtproject/qt/android/QtThread.java (renamed from src/android/jar/src/org/qtproject/qt5/android/QtThread.java) | 2 | ||||
-rw-r--r-- | src/android/jar/src/org/qtproject/qt/android/accessibility/QtAccessibilityDelegate.java (renamed from src/android/jar/src/org/qtproject/qt5/android/accessibility/QtAccessibilityDelegate.java) | 4 | ||||
-rw-r--r-- | src/android/jar/src/org/qtproject/qt/android/accessibility/QtNativeAccessibility.java (renamed from src/android/jar/src/org/qtproject/qt5/android/accessibility/QtNativeAccessibility.java) | 2 | ||||
-rw-r--r-- | src/android/java/src/org/qtproject/qt/android/bindings/QtActivity.java (renamed from src/android/java/src/org/qtproject/qt5/android/bindings/QtActivity.java) | 4 | ||||
-rw-r--r-- | src/android/java/src/org/qtproject/qt/android/bindings/QtActivityLoader.java (renamed from src/android/java/src/org/qtproject/qt5/android/bindings/QtActivityLoader.java) | 4 | ||||
-rw-r--r-- | src/android/java/src/org/qtproject/qt/android/bindings/QtApplication.java (renamed from src/android/java/src/org/qtproject/qt5/android/bindings/QtApplication.java) | 4 | ||||
-rw-r--r-- | src/android/java/src/org/qtproject/qt/android/bindings/QtLoader.java (renamed from src/android/java/src/org/qtproject/qt5/android/bindings/QtLoader.java) | 2 | ||||
-rw-r--r-- | src/android/java/src/org/qtproject/qt/android/bindings/QtService.java (renamed from src/android/java/src/org/qtproject/qt5/android/bindings/QtService.java) | 2 | ||||
-rw-r--r-- | src/android/java/src/org/qtproject/qt/android/bindings/QtServiceLoader.java (renamed from src/android/java/src/org/qtproject/qt5/android/bindings/QtServiceLoader.java) | 4 | ||||
-rw-r--r-- | src/android/templates/AndroidManifest.xml | 4 |
27 files changed, 66 insertions, 66 deletions
diff --git a/src/android/jar/.prev_CMakeLists.txt b/src/android/jar/.prev_CMakeLists.txt index bff97e90ef..9be8738fa2 100644 --- a/src/android/jar/.prev_CMakeLists.txt +++ b/src/android/jar/.prev_CMakeLists.txt @@ -1,21 +1,21 @@ # Generated from jar.pro. set(java_sources - src/org/qtproject/qt5/android//accessibility/QtAccessibilityDelegate.java - src/org/qtproject/qt5/android//accessibility/QtNativeAccessibility.java - src/org/qtproject/qt5/android//CursorHandle.java - src/org/qtproject/qt5/android//EditContextView.java - src/org/qtproject/qt5/android//EditPopupMenu.java - src/org/qtproject/qt5/android//ExtractStyle.java - src/org/qtproject/qt5/android//QtActivityDelegate.java - src/org/qtproject/qt5/android//QtEditText.java - src/org/qtproject/qt5/android//QtInputConnection.java - src/org/qtproject/qt5/android//QtLayout.java - src/org/qtproject/qt5/android//QtMessageDialogHelper.java - src/org/qtproject/qt5/android//QtNative.java - src/org/qtproject/qt5/android//QtNativeLibrariesDir.java - src/org/qtproject/qt5/android//QtSurface.java - src/org/qtproject/qt5/android//QtThread.java + src/org/qtproject/qt/android//accessibility/QtAccessibilityDelegate.java + src/org/qtproject/qt/android//accessibility/QtNativeAccessibility.java + src/org/qtproject/qt/android//CursorHandle.java + src/org/qtproject/qt/android//EditContextView.java + src/org/qtproject/qt/android//EditPopupMenu.java + src/org/qtproject/qt/android//ExtractStyle.java + src/org/qtproject/qt/android//QtActivityDelegate.java + src/org/qtproject/qt/android//QtEditText.java + src/org/qtproject/qt/android//QtInputConnection.java + src/org/qtproject/qt/android//QtLayout.java + src/org/qtproject/qt/android//QtMessageDialogHelper.java + src/org/qtproject/qt/android//QtNative.java + src/org/qtproject/qt/android//QtNativeLibrariesDir.java + src/org/qtproject/qt/android//QtSurface.java + src/org/qtproject/qt/android//QtThread.java ) qt_internal_add_jar(QtAndroid diff --git a/src/android/jar/AndroidManifest.xml b/src/android/jar/AndroidManifest.xml index cef88f7f19..b461cac762 100644 --- a/src/android/jar/AndroidManifest.xml +++ b/src/android/jar/AndroidManifest.xml @@ -1,5 +1,5 @@ <?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"/> <uses-sdk android:minSdkVersion="9" /> </manifest> diff --git a/src/android/jar/CMakeLists.txt b/src/android/jar/CMakeLists.txt index 0fb666bcb3..4336c58ae5 100644 --- a/src/android/jar/CMakeLists.txt +++ b/src/android/jar/CMakeLists.txt @@ -1,31 +1,31 @@ # Generated from jar.pro. set(java_sources - src/org/qtproject/qt5/android/accessibility/QtAccessibilityDelegate.java - src/org/qtproject/qt5/android/accessibility/QtNativeAccessibility.java - src/org/qtproject/qt5/android/CursorHandle.java - src/org/qtproject/qt5/android/EditContextView.java - src/org/qtproject/qt5/android/EditPopupMenu.java - src/org/qtproject/qt5/android/ExtractStyle.java - src/org/qtproject/qt5/android/QtActivityDelegate.java - src/org/qtproject/qt5/android/QtEditText.java - src/org/qtproject/qt5/android/QtInputConnection.java - src/org/qtproject/qt5/android/QtLayout.java - src/org/qtproject/qt5/android/QtMessageDialogHelper.java - src/org/qtproject/qt5/android/QtNative.java - src/org/qtproject/qt5/android/QtNativeLibrariesDir.java - src/org/qtproject/qt5/android/QtSurface.java - src/org/qtproject/qt5/android/QtThread.java - src/org/qtproject/qt5/android/QtServiceDelegate.java # special case + src/org/qtproject/qt/android/accessibility/QtAccessibilityDelegate.java + src/org/qtproject/qt/android/accessibility/QtNativeAccessibility.java + src/org/qtproject/qt/android/CursorHandle.java + src/org/qtproject/qt/android/EditContextView.java + src/org/qtproject/qt/android/EditPopupMenu.java + src/org/qtproject/qt/android/ExtractStyle.java + src/org/qtproject/qt/android/QtActivityDelegate.java + src/org/qtproject/qt/android/QtEditText.java + src/org/qtproject/qt/android/QtInputConnection.java + src/org/qtproject/qt/android/QtLayout.java + src/org/qtproject/qt/android/QtMessageDialogHelper.java + src/org/qtproject/qt/android/QtNative.java + src/org/qtproject/qt/android/QtNativeLibrariesDir.java + src/org/qtproject/qt/android/QtSurface.java + src/org/qtproject/qt/android/QtThread.java + 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} SOURCES ${java_sources} OUTPUT_DIR "${QT_BUILD_DIR}/jar" ) -install_jar(QtAndroid +install_jar(Qt${QtBase_VERSION_MAJOR}Android # special case DESTINATION jar COMPONENT Devel ) diff --git a/src/android/jar/jar.pro b/src/android/jar/jar.pro index 24a83d56a1..de86f855ed 100644 --- a/src/android/jar/jar.pro +++ b/src/android/jar/jar.pro @@ -1,10 +1,10 @@ -TARGET = QtAndroid +TARGET = Qt$${QT_MAJOR_VERSION}Android CONFIG += java DESTDIR = $$[QT_INSTALL_PREFIX/get]/jar -PATHPREFIX = $$PWD/src/org/qtproject/qt5/android/ +PATHPREFIX = $$PWD/src/org/qtproject/qt/android/ JAVACLASSPATH += $$PWD/src/ JAVASOURCES += \ diff --git a/src/android/jar/src/org/qtproject/qt5/android/CursorHandle.java b/src/android/jar/src/org/qtproject/qt/android/CursorHandle.java index 38cc695c37..fd650a149c 100644 --- a/src/android/jar/src/org/qtproject/qt5/android/CursorHandle.java +++ b/src/android/jar/src/org/qtproject/qt/android/CursorHandle.java @@ -37,7 +37,7 @@ ** ****************************************************************************/ -package org.qtproject.qt5.android; +package org.qtproject.qt.android; import android.content.Context; import android.os.Bundle; diff --git a/src/android/jar/src/org/qtproject/qt5/android/EditContextView.java b/src/android/jar/src/org/qtproject/qt/android/EditContextView.java index 104132934d..c96ab11ffa 100644 --- a/src/android/jar/src/org/qtproject/qt5/android/EditContextView.java +++ b/src/android/jar/src/org/qtproject/qt/android/EditContextView.java @@ -37,7 +37,7 @@ ** ****************************************************************************/ -package org.qtproject.qt5.android; +package org.qtproject.qt.android; import android.content.Context; diff --git a/src/android/jar/src/org/qtproject/qt5/android/EditPopupMenu.java b/src/android/jar/src/org/qtproject/qt/android/EditPopupMenu.java index 18a8b36273..131f2a103f 100644 --- a/src/android/jar/src/org/qtproject/qt5/android/EditPopupMenu.java +++ b/src/android/jar/src/org/qtproject/qt/android/EditPopupMenu.java @@ -38,7 +38,7 @@ ** ****************************************************************************/ -package org.qtproject.qt5.android; +package org.qtproject.qt.android; import android.content.Context; import android.os.Bundle; diff --git a/src/android/jar/src/org/qtproject/qt5/android/ExtractStyle.java b/src/android/jar/src/org/qtproject/qt/android/ExtractStyle.java index ae06506c96..ff321fabde 100644 --- a/src/android/jar/src/org/qtproject/qt5/android/ExtractStyle.java +++ b/src/android/jar/src/org/qtproject/qt/android/ExtractStyle.java @@ -37,7 +37,7 @@ ** ****************************************************************************/ -package org.qtproject.qt5.android; +package org.qtproject.qt.android; import java.io.File; import java.io.FileNotFoundException; diff --git a/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java b/src/android/jar/src/org/qtproject/qt/android/QtActivityDelegate.java index 92d9c46043..e04da7376d 100644 --- a/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java +++ b/src/android/jar/src/org/qtproject/qt/android/QtActivityDelegate.java @@ -39,7 +39,7 @@ ** ****************************************************************************/ -package org.qtproject.qt5.android; +package org.qtproject.qt.android; import android.app.Activity; import android.content.Context; @@ -96,7 +96,7 @@ import java.lang.reflect.Method; import java.util.ArrayList; import java.util.HashMap; -import org.qtproject.qt5.android.accessibility.QtAccessibilityDelegate; +import org.qtproject.qt.android.accessibility.QtAccessibilityDelegate; public class QtActivityDelegate { diff --git a/src/android/jar/src/org/qtproject/qt5/android/QtEditText.java b/src/android/jar/src/org/qtproject/qt/android/QtEditText.java index e6da5482ca..ff58b6b27f 100644 --- a/src/android/jar/src/org/qtproject/qt5/android/QtEditText.java +++ b/src/android/jar/src/org/qtproject/qt/android/QtEditText.java @@ -38,7 +38,7 @@ ** ****************************************************************************/ -package org.qtproject.qt5.android; +package org.qtproject.qt.android; import android.content.Context; import android.text.InputType; diff --git a/src/android/jar/src/org/qtproject/qt5/android/QtInputConnection.java b/src/android/jar/src/org/qtproject/qt/android/QtInputConnection.java index 7c621a11e2..dab8ebf324 100644 --- a/src/android/jar/src/org/qtproject/qt5/android/QtInputConnection.java +++ b/src/android/jar/src/org/qtproject/qt/android/QtInputConnection.java @@ -38,7 +38,7 @@ ** ****************************************************************************/ -package org.qtproject.qt5.android; +package org.qtproject.qt.android; import android.content.Context; import android.view.inputmethod.BaseInputConnection; diff --git a/src/android/jar/src/org/qtproject/qt5/android/QtLayout.java b/src/android/jar/src/org/qtproject/qt/android/QtLayout.java index 63993f81b5..a65df48a17 100644 --- a/src/android/jar/src/org/qtproject/qt5/android/QtLayout.java +++ b/src/android/jar/src/org/qtproject/qt/android/QtLayout.java @@ -38,7 +38,7 @@ ** ****************************************************************************/ -package org.qtproject.qt5.android; +package org.qtproject.qt.android; import android.app.Activity; import android.content.Context; diff --git a/src/android/jar/src/org/qtproject/qt5/android/QtMessageDialogHelper.java b/src/android/jar/src/org/qtproject/qt/android/QtMessageDialogHelper.java index a3bbff4e1a..c1fd998764 100644 --- a/src/android/jar/src/org/qtproject/qt5/android/QtMessageDialogHelper.java +++ b/src/android/jar/src/org/qtproject/qt/android/QtMessageDialogHelper.java @@ -38,7 +38,7 @@ ****************************************************************************/ -package org.qtproject.qt5.android; +package org.qtproject.qt.android; import android.app.Activity; import android.app.AlertDialog; diff --git a/src/android/jar/src/org/qtproject/qt5/android/QtNative.java b/src/android/jar/src/org/qtproject/qt/android/QtNative.java index 6fd6a9ca98..40b3a79bf0 100644 --- a/src/android/jar/src/org/qtproject/qt5/android/QtNative.java +++ b/src/android/jar/src/org/qtproject/qt/android/QtNative.java @@ -38,7 +38,7 @@ ** ****************************************************************************/ -package org.qtproject.qt5.android; +package org.qtproject.qt.android; import java.io.File; import java.io.FileNotFoundException; diff --git a/src/android/jar/src/org/qtproject/qt5/android/QtNativeLibrariesDir.java b/src/android/jar/src/org/qtproject/qt/android/QtNativeLibrariesDir.java index 4a732f7f7f..7283570609 100644 --- a/src/android/jar/src/org/qtproject/qt5/android/QtNativeLibrariesDir.java +++ b/src/android/jar/src/org/qtproject/qt/android/QtNativeLibrariesDir.java @@ -38,7 +38,7 @@ ** ****************************************************************************/ -package org.qtproject.qt5.android; +package org.qtproject.qt.android; import android.content.Context; import android.content.pm.ApplicationInfo; diff --git a/src/android/jar/src/org/qtproject/qt5/android/QtServiceDelegate.java b/src/android/jar/src/org/qtproject/qt/android/QtServiceDelegate.java index 6e75eafeab..8ac4395ac9 100644 --- a/src/android/jar/src/org/qtproject/qt5/android/QtServiceDelegate.java +++ b/src/android/jar/src/org/qtproject/qt/android/QtServiceDelegate.java @@ -38,7 +38,7 @@ ** ****************************************************************************/ -package org.qtproject.qt5.android; +package org.qtproject.qt.android; import android.app.Service; import android.content.Context; diff --git a/src/android/jar/src/org/qtproject/qt5/android/QtSurface.java b/src/android/jar/src/org/qtproject/qt/android/QtSurface.java index 08b5a80f7e..1d89aeebef 100644 --- a/src/android/jar/src/org/qtproject/qt5/android/QtSurface.java +++ b/src/android/jar/src/org/qtproject/qt/android/QtSurface.java @@ -38,7 +38,7 @@ ** ****************************************************************************/ -package org.qtproject.qt5.android; +package org.qtproject.qt.android; import android.app.Activity; import android.content.Context; diff --git a/src/android/jar/src/org/qtproject/qt5/android/QtThread.java b/src/android/jar/src/org/qtproject/qt/android/QtThread.java index 975e787345..1689174e86 100644 --- a/src/android/jar/src/org/qtproject/qt5/android/QtThread.java +++ b/src/android/jar/src/org/qtproject/qt/android/QtThread.java @@ -37,7 +37,7 @@ ** ****************************************************************************/ -package org.qtproject.qt5.android; +package org.qtproject.qt.android; import java.util.ArrayList; import java.util.concurrent.Semaphore; diff --git a/src/android/jar/src/org/qtproject/qt5/android/accessibility/QtAccessibilityDelegate.java b/src/android/jar/src/org/qtproject/qt/android/accessibility/QtAccessibilityDelegate.java index 79caaf318e..1591a5b52e 100644 --- a/src/android/jar/src/org/qtproject/qt5/android/accessibility/QtAccessibilityDelegate.java +++ b/src/android/jar/src/org/qtproject/qt/android/accessibility/QtAccessibilityDelegate.java @@ -38,7 +38,7 @@ ****************************************************************************/ -package org.qtproject.qt5.android.accessibility; +package org.qtproject.qt.android.accessibility; import android.accessibilityservice.AccessibilityService; import android.app.Activity; @@ -59,7 +59,7 @@ import android.content.Context; import java.util.LinkedList; import java.util.List; -import org.qtproject.qt5.android.QtActivityDelegate; +import org.qtproject.qt.android.QtActivityDelegate; public class QtAccessibilityDelegate extends View.AccessibilityDelegate { diff --git a/src/android/jar/src/org/qtproject/qt5/android/accessibility/QtNativeAccessibility.java b/src/android/jar/src/org/qtproject/qt/android/accessibility/QtNativeAccessibility.java index a83174377d..aa6f7c5a67 100644 --- a/src/android/jar/src/org/qtproject/qt5/android/accessibility/QtNativeAccessibility.java +++ b/src/android/jar/src/org/qtproject/qt/android/accessibility/QtNativeAccessibility.java @@ -37,7 +37,7 @@ ** ****************************************************************************/ -package org.qtproject.qt5.android.accessibility; +package org.qtproject.qt.android.accessibility; import android.graphics.Rect; import android.view.accessibility.AccessibilityNodeInfo; diff --git a/src/android/java/src/org/qtproject/qt5/android/bindings/QtActivity.java b/src/android/java/src/org/qtproject/qt/android/bindings/QtActivity.java index 978a2c221e..1b34658300 100644 --- a/src/android/java/src/org/qtproject/qt5/android/bindings/QtActivity.java +++ b/src/android/java/src/org/qtproject/qt/android/bindings/QtActivity.java @@ -34,7 +34,7 @@ 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.Dialog; @@ -60,7 +60,7 @@ import android.view.View; import android.view.WindowManager.LayoutParams; import android.view.accessibility.AccessibilityEvent; -import org.qtproject.qt5.android.QtNative; +import org.qtproject.qt.android.QtNative; public class QtActivity extends Activity { diff --git a/src/android/java/src/org/qtproject/qt5/android/bindings/QtActivityLoader.java b/src/android/java/src/org/qtproject/qt/android/bindings/QtActivityLoader.java index 9e00b14999..da6b01c9a7 100644 --- a/src/android/java/src/org/qtproject/qt5/android/bindings/QtActivityLoader.java +++ b/src/android/java/src/org/qtproject/qt/android/bindings/QtActivityLoader.java @@ -34,7 +34,7 @@ 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.content.DialogInterface; @@ -87,7 +87,7 @@ public class QtActivityLoader extends QtLoader { @Override protected String loaderClassName() { - return "org.qtproject.qt5.android.QtActivityDelegate"; + return "org.qtproject.qt.android.QtActivityDelegate"; } @Override diff --git a/src/android/java/src/org/qtproject/qt5/android/bindings/QtApplication.java b/src/android/java/src/org/qtproject/qt/android/bindings/QtApplication.java index 47dcde304c..34a3bc28ea 100644 --- a/src/android/java/src/org/qtproject/qt5/android/bindings/QtApplication.java +++ b/src/android/java/src/org/qtproject/qt/android/bindings/QtApplication.java @@ -34,7 +34,7 @@ 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; @@ -73,7 +73,7 @@ public class QtApplication extends Application ArrayList<Method> delegateMethods = new ArrayList<Method>(); 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); } diff --git a/src/android/java/src/org/qtproject/qt5/android/bindings/QtLoader.java b/src/android/java/src/org/qtproject/qt/android/bindings/QtLoader.java index 1e72aa3841..3dfac43339 100644 --- a/src/android/java/src/org/qtproject/qt5/android/bindings/QtLoader.java +++ b/src/android/java/src/org/qtproject/qt/android/bindings/QtLoader.java @@ -34,7 +34,7 @@ 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.content.ComponentName; diff --git a/src/android/java/src/org/qtproject/qt5/android/bindings/QtService.java b/src/android/java/src/org/qtproject/qt/android/bindings/QtService.java index cdd6c1efea..cb24d1f541 100644 --- a/src/android/java/src/org/qtproject/qt5/android/bindings/QtService.java +++ b/src/android/java/src/org/qtproject/qt/android/bindings/QtService.java @@ -34,7 +34,7 @@ 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.content.Intent; diff --git a/src/android/java/src/org/qtproject/qt5/android/bindings/QtServiceLoader.java b/src/android/java/src/org/qtproject/qt/android/bindings/QtServiceLoader.java index e32a4048e1..f0606a4d9b 100644 --- a/src/android/java/src/org/qtproject/qt5/android/bindings/QtServiceLoader.java +++ b/src/android/java/src/org/qtproject/qt/android/bindings/QtServiceLoader.java @@ -34,7 +34,7 @@ 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.content.ComponentName; @@ -70,7 +70,7 @@ public class QtServiceLoader extends QtLoader { @Override protected String loaderClassName() { - return "org.qtproject.qt5.android.QtServiceDelegate"; + return "org.qtproject.qt.android.QtServiceDelegate"; } @Override diff --git a/src/android/templates/AndroidManifest.xml b/src/android/templates/AndroidManifest.xml index d42ed067c6..abb6b1e354 100644 --- a/src/android/templates/AndroidManifest.xml +++ b/src/android/templates/AndroidManifest.xml @@ -9,8 +9,8 @@ <!-- %%INSERT_FEATURES --> <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"> - <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"> + <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.qt.android.bindings.QtActivity" android:label="-- %%INSERT_APP_NAME%% --" android:screenOrientation="unspecified" android:launchMode="singleTop"> <intent-filter> <action android:name="android.intent.action.MAIN"/> <category android:name="android.intent.category.LAUNCHER"/> |