From 95f4751ff313d5e0e410162b7569e3625dfd81d8 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 27 Mar 2013 20:04:15 +0000 Subject: Add some more qconfigs to configureapp. REDUCE_EXPORTS -> QT_VISIBILITY_AVAILABLE REDUCE_RELOCATIONS -> QT_REDUCE_RELOCATIONS !QT_GETIFADDRS -> QT_NO_GETIFADDRS These will be used for Android build on Windows. Change-Id: I2cde989e41dc5b7f9bef1345e935cc7e19aba983 Reviewed-by: Oswald Buddenhagen --- tools/configure/configureapp.cpp | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'tools') diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index b9d50d62c4..bd74e08707 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -2673,6 +2673,9 @@ void Configure::generateOutputVars() if (dictionary["STACK_PROTECTOR_STRONG"] == "yes") qtConfig += "stack-protector-strong"; + if (dictionary["REDUCE_EXPORTS"] == "yes") + qtConfig += "reduce_exports"; + // We currently have no switch for QtConcurrent, so add it unconditionally. qtConfig += "concurrent"; @@ -3309,6 +3312,10 @@ void Configure::generateConfigfiles() if (dictionary["QT_GLIB"] == "no") qconfigList += "QT_NO_GLIB"; if (dictionary["QT_INOTIFY"] == "no") qconfigList += "QT_NO_INOTIFY"; + if (dictionary["REDUCE_EXPORTS"] == "yes") qconfigList += "QT_VISIBILITY_AVAILABLE"; + if (dictionary["REDUCE_RELOCATIONS"] == "yes") qconfigList += "QT_REDUCE_RELOCATIONS"; + if (dictionary["QT_GETIFADDRS"] == "no") qconfigList += "QT_NO_GETIFADDRS"; + qconfigList.sort(); for (int i = 0; i < qconfigList.count(); ++i) tmpStream << addDefine(qconfigList.at(i)); -- cgit v1.2.3