diff options
| -rw-r--r-- | examples/gamepad/configureButtons/android/AndroidManifest.xml | 4 | ||||
| -rw-r--r-- | examples/gamepad/simple/android/AndroidManifest.xml | 4 | ||||
| -rw-r--r-- | src/gamepad/gamepad.pro | 2 | ||||
| -rw-r--r-- | src/plugins/gamepads/android/jar/jar.pro | 4 | ||||
| -rw-r--r-- | src/plugins/gamepads/android/jar/src/org/qtproject/qt/android/gamepad/QtGamepad.java (renamed from src/plugins/gamepads/android/jar/src/org/qtproject/qt5/android/gamepad/QtGamepad.java) | 2 | ||||
| -rw-r--r-- | src/plugins/gamepads/android/src/qandroidgamepadbackend.cpp | 4 |
6 files changed, 10 insertions, 10 deletions
diff --git a/examples/gamepad/configureButtons/android/AndroidManifest.xml b/examples/gamepad/configureButtons/android/AndroidManifest.xml index c38273a..e3f5e51 100644 --- a/examples/gamepad/configureButtons/android/AndroidManifest.xml +++ b/examples/gamepad/configureButtons/android/AndroidManifest.xml @@ -1,7 +1,7 @@ <?xml version="1.0"?> <manifest package="org.qtproject.example" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.0" android:versionCode="1" android:installLocation="auto"> - <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" android:name="org.qtproject.qt5.android.bindings.QtActivity" android:label="-- %%INSERT_APP_NAME%% --" android:screenOrientation="portrait" android:launchMode="singleTop"> + <application android:hardwareAccelerated="true" android:name="org.qtproject.qt.android.bindings.QtApplication" android:label="-- %%INSERT_APP_NAME%% --"> + <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation" android:name="org.qtproject.qt.android.bindings.QtActivity" android:label="-- %%INSERT_APP_NAME%% --" android:screenOrientation="portrait" android:launchMode="singleTop"> <intent-filter> <action android:name="android.intent.action.MAIN"/> <category android:name="android.intent.category.LAUNCHER"/> diff --git a/examples/gamepad/simple/android/AndroidManifest.xml b/examples/gamepad/simple/android/AndroidManifest.xml index 80d0477..37e238f 100644 --- a/examples/gamepad/simple/android/AndroidManifest.xml +++ b/examples/gamepad/simple/android/AndroidManifest.xml @@ -1,7 +1,7 @@ <?xml version="1.0"?> <manifest package="org.qtproject.example" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.0" android:versionCode="1" android:installLocation="auto"> - <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" 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%% --"> + <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation" 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"/> diff --git a/src/gamepad/gamepad.pro b/src/gamepad/gamepad.pro index 3615841..5151d95 100644 --- a/src/gamepad/gamepad.pro +++ b/src/gamepad/gamepad.pro @@ -27,7 +27,7 @@ SOURCES += \ ANDROID_BUNDLED_JAR_DEPENDENCIES = \ - jar/QtAndroidGamepad.jar + jar/Qt$${QT_MAJOR_VERSION}AndroidGamepad.jar ANDROID_LIB_DEPENDENCIES = \ plugins/gamepads/libplugins_gamepads_androidgamepad.so diff --git a/src/plugins/gamepads/android/jar/jar.pro b/src/plugins/gamepads/android/jar/jar.pro index 947a887..879bbd9 100644 --- a/src/plugins/gamepads/android/jar/jar.pro +++ b/src/plugins/gamepads/android/jar/jar.pro @@ -1,4 +1,4 @@ -TARGET = QtAndroidGamepad +TARGET = Qt$${QT_MAJOR_VERSION}AndroidGamepad load(qt_build_paths) CONFIG += java @@ -9,7 +9,7 @@ API_VERSION = android-16 JAVACLASSPATH += $$PWD/src -JAVASOURCES += $$PWD/src/org/qtproject/qt5/android/gamepad/QtGamepad.java +JAVASOURCES += $$PWD/src/org/qtproject/qt/android/gamepad/QtGamepad.java # install target.path = $$[QT_INSTALL_PREFIX]/jar diff --git a/src/plugins/gamepads/android/jar/src/org/qtproject/qt5/android/gamepad/QtGamepad.java b/src/plugins/gamepads/android/jar/src/org/qtproject/qt/android/gamepad/QtGamepad.java index 84f5ffc..94ffa9f 100644 --- a/src/plugins/gamepads/android/jar/src/org/qtproject/qt5/android/gamepad/QtGamepad.java +++ b/src/plugins/gamepads/android/jar/src/org/qtproject/qt/android/gamepad/QtGamepad.java @@ -34,7 +34,7 @@ ** ****************************************************************************/ -package org.qtproject.qt5.android.gamepad; +package org.qtproject.qt.android.gamepad; import android.app.Activity; import android.content.Context; diff --git a/src/plugins/gamepads/android/src/qandroidgamepadbackend.cpp b/src/plugins/gamepads/android/src/qandroidgamepadbackend.cpp index df96296..eae0e6a 100644 --- a/src/plugins/gamepads/android/src/qandroidgamepadbackend.cpp +++ b/src/plugins/gamepads/android/src/qandroidgamepadbackend.cpp @@ -198,7 +198,7 @@ namespace { {"onInputDeviceChanged", "(JI)V", (void *)onInputDeviceChanged} }; - const char qtGamePadClassName[] = "org/qtproject/qt5/android/gamepad/QtGamepad"; + const char qtGamePadClassName[] = "org/qtproject/qt/android/gamepad/QtGamepad"; inline void setAxisInfo(QJNIObjectPrivate &event, int axis, QAndroidGamepadBackend::Mapping::AndroidAxisInfo &info) { @@ -620,7 +620,7 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void */*reserved*/) return JNI_ERR; // search for Java class which declares the native methods - jclass javaClass = env->FindClass("org/qtproject/qt5/android/gamepad/QtGamepad"); + jclass javaClass = env->FindClass("org/qtproject/qt/android/gamepad/QtGamepad"); if (!javaClass) return JNI_ERR; |