diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> | 2014-03-20 12:41:13 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-21 18:49:06 +0100 |
| commit | 523d1c54e4ff365863ae463cc30edfb2fbb15ee3 (patch) | |
| tree | c38e6603b936af08a7941cf63507ba43e6be2df5 | |
| parent | 374d0a0b8c40310bf542b01d66cbee4446f3f956 (diff) | |
REG: Fix compilation with old AndroidManifest.xml
For apps created with Qt 5.2.1, the AndroidManifest.xml will
contain a reference to android.app.splash_screen, which was
removed from the application template when the splash screen
functionality was fixed by 4d08d80be60af14c5daed7c6f8d37538aea6c429.
To make sure existing apps still compile, we put back a dummy
splash.xml so that the reference in existing manifests still
work. If this splash screen was actually used for something,
it will no longer show up, so we also need to document that people
should update their AndroidManifest.xml to the new system, but
we can't inform people via mysterious compilation failures :)
Task-number: QTBUG-37493
Change-Id: I6289f9b5e2c315fa6db502cbde27bd18e15f1f8d
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
| -rw-r--r-- | src/android/java/res/layout/splash.xml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/android/java/res/layout/splash.xml b/src/android/java/res/layout/splash.xml new file mode 100644 index 0000000000..6875521a12 --- /dev/null +++ b/src/android/java/res/layout/splash.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" /> |