diff options
Diffstat (limited to 'src/android/java')
| -rw-r--r-- | src/android/java/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | src/android/java/res/layout/splash.xml | 4 | ||||
| -rw-r--r-- | src/android/java/src/org/qtproject/qt5/android/bindings/QtActivity.java | 9 |
3 files changed, 14 insertions, 11 deletions
diff --git a/src/android/java/CMakeLists.txt b/src/android/java/CMakeLists.txt new file mode 100644 index 0000000000..1c24bd5e82 --- /dev/null +++ b/src/android/java/CMakeLists.txt @@ -0,0 +1,12 @@ +# Android Java Resource files + +# special case skip regeneration +# special case begin +set(resource_directories + res + src) + +qt_install(DIRECTORY ${resource_directories} + DESTINATION src/android/java + COMPONENT Devel) +# special case end diff --git a/src/android/java/res/layout/splash.xml b/src/android/java/res/layout/splash.xml deleted file mode 100644 index 476d91a844..0000000000 --- a/src/android/java/res/layout/splash.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" /> diff --git a/src/android/java/src/org/qtproject/qt5/android/bindings/QtActivity.java b/src/android/java/src/org/qtproject/qt5/android/bindings/QtActivity.java index 3348527b3c..86775619ec 100644 --- a/src/android/java/src/org/qtproject/qt5/android/bindings/QtActivity.java +++ b/src/android/java/src/org/qtproject/qt5/android/bindings/QtActivity.java @@ -93,13 +93,8 @@ public class QtActivity extends Activity public QtActivity() { m_loader = new QtActivityLoader(this); - if (Build.VERSION.SDK_INT >= 21) { - QT_ANDROID_THEMES = new String[] {"Theme_Holo_Light"}; - QT_ANDROID_DEFAULT_THEME = "Theme_Holo_Light"; - } else { - QT_ANDROID_THEMES = new String[] {"Theme_DeviceDefault_Light"}; - QT_ANDROID_DEFAULT_THEME = "Theme_DeviceDefault_Light"; - } + QT_ANDROID_THEMES = new String[] {"Theme_Holo_Light"}; + QT_ANDROID_DEFAULT_THEME = "Theme_Holo_Light"; } |