diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com> | 2014-12-16 12:18:25 +0100 |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com> | 2014-12-18 09:43:19 +0100 |
| commit | 2dbbff0364bd36bc25737cb31516f98e0546c9dc (patch) | |
| tree | 1494ee15b4f9c4c9de00775a546c54e7607f99ab | |
| parent | 9f63e2dc0e57fc35683f1aec915f699647987408 (diff) | |
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 <bogdan@kde.org>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| -rw-r--r-- | tools/configure/configureapp.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
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"; |