From 2dbbff0364bd36bc25737cb31516f98e0546c9dc Mon Sep 17 00:00:00 2001 From: Eskil Abrahamsen Blomfeldt Date: Tue, 16 Dec 2014 12:18:25 +0100 Subject: Build Android style on Windows host The Windows configure application was missing the logic to enable the Android style, so this was missing from the Windows packages. [ChangeLog][Android] Included Android style on Windows hosts. Task-number: QTBUG-43302 Change-Id: I6a1423d58d00e7b4d4fd0a3d1a12cce10aa2fc91 Reviewed-by: BogDan Vatra Reviewed-by: Oswald Buddenhagen --- tools/configure/configureapp.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'tools') diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 92422c2829..2bd94c199e 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -1700,6 +1700,7 @@ void Configure::applySpecSpecifics() dictionary[ "QT_GETIFADDRS" ] = "no"; dictionary[ "QT_XKBCOMMON" ] = "no"; dictionary["ANDROID_STYLE_ASSETS"] = "yes"; + dictionary[ "STYLE_ANDROID" ] = "yes"; } } @@ -2712,6 +2713,9 @@ void Configure::generateOutputVars() if (dictionary[ "STYLE_WINDOWSMOBILE" ] == "yes") qmakeStyles += "windowsmobile"; + if (dictionary[ "STYLE_ANDROID" ] == "yes") + qmakeStyles += "android"; + // Databases ---------------------------------------------------- if (dictionary[ "SQL_MYSQL" ] == "yes") qmakeSql += "mysql"; -- cgit v1.2.3