From 1bf1d0f493a4561239961dbe582bdc798b69a946 Mon Sep 17 00:00:00 2001 From: Louai Al-Khanji Date: Thu, 10 Dec 2015 17:42:15 -0800 Subject: qt_safe_poll: fix Windows to QNX/Android cross compiles Task-number: QTBUG-49875 Change-Id: I8820f28351dff385d12a4c469ed689914f87b924 Reviewed-by: Eskil Abrahamsen Blomfeldt --- tools/configure/configureapp.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 7949d81bf9..0e06197414 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -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"; -- cgit v1.2.3