1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Build Android style on Windows host

Browse Source 
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>
This commit is contained in:
Eskil Abrahamsen Blomfeldt 2014-12-16 12:18:25 +01:00
parent 9f63e2dc0e
commit 2dbbff0364
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/configure/configureapp.cpp
View File

@ -1700,6 +1700,7 @@ void Configure::applySpecSpecifics()
dictionary[ "QT_GETIFADDRS" ] = "no"; dictionary[ "QT_GETIFADDRS" ] = "no";
dictionary[ "QT_XKBCOMMON" ] = "no"; dictionary[ "QT_XKBCOMMON" ] = "no";
dictionary["ANDROID_STYLE_ASSETS"] = "yes"; dictionary["ANDROID_STYLE_ASSETS"] = "yes";
dictionary[ "STYLE_ANDROID" ] = "yes";
} }
} }
@ -2712,6 +2713,9 @@ void Configure::generateOutputVars()
if (dictionary[ "STYLE_WINDOWSMOBILE" ] == "yes") if (dictionary[ "STYLE_WINDOWSMOBILE" ] == "yes")
qmakeStyles += "windowsmobile"; qmakeStyles += "windowsmobile";
if (dictionary[ "STYLE_ANDROID" ] == "yes")
qmakeStyles += "android";
// Databases ---------------------------------------------------- // Databases ----------------------------------------------------
if (dictionary[ "SQL_MYSQL" ] == "yes") if (dictionary[ "SQL_MYSQL" ] == "yes")
qmakeSql += "mysql"; qmakeSql += "mysql";