diff options
| author | Paul Olav Tvete <paul.tvete@theqtcompany.com> | 2015-06-09 13:59:07 +0200 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@theqtcompany.com> | 2015-06-09 13:59:07 +0200 |
| commit | 0963be63ce741ef6c7585358c3f3b1cb806b66e8 (patch) | |
| tree | 6f4964c196b8a52cb15e9efc0388b6a549574460 /src/android/templates/AndroidManifest.xml | |
| parent | 9e6a1351823b3ee3d7e380248f6ef42ff383b014 (diff) | |
| parent | eacfbbf64ef90dad8c5cb6b2c812ad64c1100779 (diff) | |
Merge remote-tracking branch 'qt/dev' into dev-highdpi
Conflicts:
src/gui/kernel/qsimpledrag.cpp
src/gui/kernel/qwindowsysteminterface.cpp
src/gui/kernel/qwindowsysteminterface_p.h
src/plugins/platforms/xcb/qxcbwindow.cpp
Change-Id: Icd887552ade61d6a2b2527383970f7145aa00faf
Diffstat (limited to 'src/android/templates/AndroidManifest.xml')
| -rw-r--r-- | src/android/templates/AndroidManifest.xml | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/android/templates/AndroidManifest.xml b/src/android/templates/AndroidManifest.xml index 779612cdaf..60c612976f 100644 --- a/src/android/templates/AndroidManifest.xml +++ b/src/android/templates/AndroidManifest.xml @@ -44,10 +44,6 @@ signal is sent! --> <meta-data android:name="android.app.background_running" android:value="false"/> <!-- Background running --> - - <!-- Show translucent UI on top of Qt's surface when system theme mandates it --> - <meta-data android:name="android.app.allow_overlapping_system_ui" android:value="false"/> - <!-- Show translucent UI on top of Qt's surface when system theme mandates it --> </activity> </application> <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="14"/> |