From 12f7596cf68e7e8709c3054df182940a9fcbc7e3 Mon Sep 17 00:00:00 2001 From: Paul Olav Tvete Date: Wed, 3 Apr 2013 10:41:48 +0200 Subject: [PATCH] Android: use Fusion style by default The Android style is not fully implemented yet, so prefer the Fusion style by default. Task-number: QTBUG-29565 Change-Id: Ida413e6b34a41b618b8e2206688922195ffcc519 Reviewed-by: BogDan Vatra Reviewed-by: Eskil Abrahamsen Blomfeldt --- .../src/org/qtproject/qt5/android/bindings/QtActivity.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 4b01d29143..1e24db7bee 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 @@ -111,12 +111,13 @@ public class QtActivity extends Activity // and must be separated with "\t" // e.g "-param1\t-param2=value2\t-param3\tvalue3" - private static final String ENVIRONMENT_VARIABLES = "QT_USE_ANDROID_NATIVE_STYLE=1\t"; + private static final String ENVIRONMENT_VARIABLES = "QT_USE_ANDROID_NATIVE_STYLE=0\t"; // use this variable to add any environment variables to your application. // the env vars must be separated with "\t" // e.g. "ENV_VAR1=1\tENV_VAR2=2\t" // Currently the following vars are used by the android plugin: - // * QT_USE_ANDROID_NATIVE_STYLE - 0 if you don't want to use android style plugin, it will save a few ms at startup. + // * QT_USE_ANDROID_NATIVE_STYLE - 1 to use the android widget style if available, + // note that the android style plugin in Qt 5.1 is not fully functional. private static final int INCOMPATIBLE_MINISTRO_VERSION = 1; // Incompatible Ministro version. Ministro needs to be upgraded. private ActivityInfo m_activityInfo = null; // activity info object, used to access the libs and the strings