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

qt_safe_poll: fix Windows to QNX/Android cross compiles

Browse Source 
Task-number: QTBUG-49875
Change-Id: I8820f28351dff385d12a4c469ed689914f87b924
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
This commit is contained in:
Louai Al-Khanji 2015-12-10 17:42:15 -08:00 committed by Liang Qi
parent e3689949ba
commit 1bf1d0f493
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tools/configure/configureapp.cpp
View File

@ -1748,6 +1748,7 @@ void Configure::applySpecSpecifics()
dictionary[ "ANGLE" ] = "no";
dictionary[ "DYNAMICGL" ] = "no";
dictionary[ "FONT_CONFIG" ] = "auto";
dictionary[ "POLL" ] = "poll";
} else if (platform() == ANDROID) {
dictionary[ "REDUCE_EXPORTS" ] = "yes";
dictionary[ "BUILD" ] = "release";
@ -1760,6 +1761,7 @@ void Configure::applySpecSpecifics()
dictionary[ "QT_XKBCOMMON" ] = "no";
dictionary["ANDROID_STYLE_ASSETS"] = "yes";
dictionary[ "STYLE_ANDROID" ] = "yes";
dictionary[ "POLL" ] = "poll";
}
}
@ -3086,6 +3088,9 @@ void Configure::generateOutputVars()
if (dictionary["REDUCE_EXPORTS"] == "yes")
qtConfig += "reduce_exports";
if (!dictionary["POLL"].isEmpty())
qtConfig += "poll_" + dictionary["POLL"];
// We currently have no switch for QtConcurrent, so add it unconditionally.
qtConfig += "concurrent";