From 7582bb51f39f2336e9d14b83206873bbb3e47de3 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Tue, 14 May 2013 02:02:21 +0100 Subject: Android: Disable xkbcommon in configure.exe Task-number: QTBUG-31220 Change-Id: I711fa5d37cb58216199cc0ce479a14a3300d8cb8 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 bb314280cf..a030351443 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -1622,6 +1622,7 @@ void Configure::applySpecSpecifics() dictionary[ "ANGLE" ] = "no"; dictionary[ "REDUCE_RELOCATIONS" ] = "yes"; dictionary[ "QT_GETIFADDRS" ] = "no"; + dictionary[ "QT_XKBCOMMON" ] = "no"; } } @@ -2812,6 +2813,9 @@ void Configure::generateCachefile() if (dictionary["QT_EDITION"] != "QT_EDITION_OPENSOURCE") moduleStream << "DEFINES *= QT_EDITION=QT_EDITION_DESKTOP" << endl; + if (dictionary["QT_XKBCOMMON"] == "no") + moduleStream << "DEFINES += QT_NO_XKBCOMMON" << endl; + if (dictionary["CETEST"] == "yes") { moduleStream << "QT_CE_RAPI_INC = " << formatPath(dictionary["QT_CE_RAPI_INC"]) << endl; moduleStream << "QT_CE_RAPI_LIB = " << formatPath(dictionary["QT_CE_RAPI_LIB"]) << endl; -- cgit v1.2.3