diff --git a/QtAndroidToolsDemo/Main.cpp b/QtAndroidToolsDemo/Main.cpp index 5b8d8b0..ef91e79 100644 --- a/QtAndroidToolsDemo/Main.cpp +++ b/QtAndroidToolsDemo/Main.cpp @@ -2,6 +2,9 @@ #include #include #include +#include +#include +#include #include "QtAndroidTools.h" void prepareSharedFiles(const QString &sharedFolderName) diff --git a/QtAndroidToolsDemo/QtAndroidToolsDemo.pro b/QtAndroidToolsDemo/QtAndroidToolsDemo.pro index e4329d1..65228aa 100644 --- a/QtAndroidToolsDemo/QtAndroidToolsDemo.pro +++ b/QtAndroidToolsDemo/QtAndroidToolsDemo.pro @@ -41,3 +41,5 @@ DEFINES += \ include(../QtAndroidTools/QtAndroidTools.pri) } +ANDROID_ABIS = x86_64 + diff --git a/QtAndroidToolsDemo/android/AndroidManifest.xml b/QtAndroidToolsDemo/android/AndroidManifest.xml index 090efcf..b5e15e5 100644 --- a/QtAndroidToolsDemo/android/AndroidManifest.xml +++ b/QtAndroidToolsDemo/android/AndroidManifest.xml @@ -1,12 +1,11 @@ - + - @@ -17,18 +16,15 @@ - - - @@ -36,7 +32,6 @@ - @@ -51,7 +46,6 @@ - - - - - - - - - - - - - - + + + + + + + + + - @@ -112,11 +101,10 @@ - - + + - - - + + diff --git a/QtAndroidToolsDemo/android/res/drawable-hdpi/icon.png b/QtAndroidToolsDemo/android/res/drawable-hdpi/icon.png index 173c3b5..5db38cd 100644 Binary files a/QtAndroidToolsDemo/android/res/drawable-hdpi/icon.png and b/QtAndroidToolsDemo/android/res/drawable-hdpi/icon.png differ diff --git a/QtAndroidToolsDemo/android/res/drawable-hdpi/logo.png b/QtAndroidToolsDemo/android/res/drawable-hdpi/logo.png new file mode 100644 index 0000000..f322289 Binary files /dev/null and b/QtAndroidToolsDemo/android/res/drawable-hdpi/logo.png differ diff --git a/QtAndroidToolsDemo/android/res/drawable-ldpi/icon.png b/QtAndroidToolsDemo/android/res/drawable-ldpi/icon.png index fe3f41d..a2b7252 100644 Binary files a/QtAndroidToolsDemo/android/res/drawable-ldpi/icon.png and b/QtAndroidToolsDemo/android/res/drawable-ldpi/icon.png differ diff --git a/QtAndroidToolsDemo/android/res/drawable-ldpi/logo.png b/QtAndroidToolsDemo/android/res/drawable-ldpi/logo.png new file mode 100644 index 0000000..dd51ed2 Binary files /dev/null and b/QtAndroidToolsDemo/android/res/drawable-ldpi/logo.png differ diff --git a/QtAndroidToolsDemo/android/res/drawable-mdpi/icon.png b/QtAndroidToolsDemo/android/res/drawable-mdpi/icon.png index 5c8b804..605954d 100644 Binary files a/QtAndroidToolsDemo/android/res/drawable-mdpi/icon.png and b/QtAndroidToolsDemo/android/res/drawable-mdpi/icon.png differ diff --git a/QtAndroidToolsDemo/android/res/drawable-mdpi/logo.png b/QtAndroidToolsDemo/android/res/drawable-mdpi/logo.png new file mode 100644 index 0000000..ac669a1 Binary files /dev/null and b/QtAndroidToolsDemo/android/res/drawable-mdpi/logo.png differ diff --git a/QtAndroidToolsDemo/android/res/drawable-xhdpi/icon.png b/QtAndroidToolsDemo/android/res/drawable-xhdpi/icon.png deleted file mode 100644 index 9aff82f..0000000 Binary files a/QtAndroidToolsDemo/android/res/drawable-xhdpi/icon.png and /dev/null differ diff --git a/QtAndroidToolsDemo/android/res/drawable-xhdpi/qtatoolsdemo_notification_icon1.png b/QtAndroidToolsDemo/android/res/drawable-xhdpi/qtatoolsdemo_notification_icon1.png deleted file mode 100644 index c0cbe2d..0000000 Binary files a/QtAndroidToolsDemo/android/res/drawable-xhdpi/qtatoolsdemo_notification_icon1.png and /dev/null differ diff --git a/QtAndroidToolsDemo/android/res/drawable-xhdpi/qtatoolsdemo_notification_icon2.png b/QtAndroidToolsDemo/android/res/drawable-xhdpi/qtatoolsdemo_notification_icon2.png deleted file mode 100644 index 3fa4320..0000000 Binary files a/QtAndroidToolsDemo/android/res/drawable-xhdpi/qtatoolsdemo_notification_icon2.png and /dev/null differ diff --git a/QtAndroidToolsDemo/android/res/drawable-xxhdpi/icon.png b/QtAndroidToolsDemo/android/res/drawable-xxhdpi/icon.png deleted file mode 100644 index efedaf3..0000000 Binary files a/QtAndroidToolsDemo/android/res/drawable-xxhdpi/icon.png and /dev/null differ diff --git a/QtAndroidToolsDemo/android/res/drawable-xxhdpi/qtatoolsdemo_notification_icon1.png b/QtAndroidToolsDemo/android/res/drawable-xxhdpi/qtatoolsdemo_notification_icon1.png deleted file mode 100644 index 53b416b..0000000 Binary files a/QtAndroidToolsDemo/android/res/drawable-xxhdpi/qtatoolsdemo_notification_icon1.png and /dev/null differ diff --git a/QtAndroidToolsDemo/android/res/drawable-xxhdpi/qtatoolsdemo_notification_icon2.png b/QtAndroidToolsDemo/android/res/drawable-xxhdpi/qtatoolsdemo_notification_icon2.png deleted file mode 100644 index e7c4a85..0000000 Binary files a/QtAndroidToolsDemo/android/res/drawable-xxhdpi/qtatoolsdemo_notification_icon2.png and /dev/null differ diff --git a/QtAndroidToolsDemo/android/res/drawable-xxxhdpi/icon.png b/QtAndroidToolsDemo/android/res/drawable-xxxhdpi/icon.png deleted file mode 100644 index 6c5dba5..0000000 Binary files a/QtAndroidToolsDemo/android/res/drawable-xxxhdpi/icon.png and /dev/null differ diff --git a/QtAndroidToolsDemo/android/res/drawable-xxxhdpi/qtatoolsdemo_notification_icon1.png b/QtAndroidToolsDemo/android/res/drawable-xxxhdpi/qtatoolsdemo_notification_icon1.png deleted file mode 100644 index 2ed74e0..0000000 Binary files a/QtAndroidToolsDemo/android/res/drawable-xxxhdpi/qtatoolsdemo_notification_icon1.png and /dev/null differ diff --git a/QtAndroidToolsDemo/android/res/drawable-xxxhdpi/qtatoolsdemo_notification_icon2.png b/QtAndroidToolsDemo/android/res/drawable-xxxhdpi/qtatoolsdemo_notification_icon2.png deleted file mode 100644 index d549428..0000000 Binary files a/QtAndroidToolsDemo/android/res/drawable-xxxhdpi/qtatoolsdemo_notification_icon2.png and /dev/null differ diff --git a/QtAndroidToolsDemo/android/res/drawable/splashscreen.xml b/QtAndroidToolsDemo/android/res/drawable/splashscreen.xml deleted file mode 100644 index 15ac4f8..0000000 --- a/QtAndroidToolsDemo/android/res/drawable/splashscreen.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/QtAndroidToolsDemo/android/res/values/splashscreentheme.xml b/QtAndroidToolsDemo/android/res/values/splashscreentheme.xml deleted file mode 100644 index 16c01cf..0000000 --- a/QtAndroidToolsDemo/android/res/values/splashscreentheme.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file