From 0738c38f0ec435ad4510a1c8eb60f74a2ba46a2f Mon Sep 17 00:00:00 2001 From: Donald Carr Date: Wed, 7 Mar 2012 00:11:44 +0000 Subject: Add Qt Widgets opt out support to build system There should be a clear QWidget free path for people with no interest in legacy QWidget functionality. Adding this option to configure makes this path readily accessible and hence testable. Change-Id: If87c1063fcf4c46f5280836126c11999feaa9f8a Reviewed-by: Oswald Buddenhagen --- configure | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'configure') diff --git a/configure b/configure index 04f6005a8b..db3289a799 100755 --- a/configure +++ b/configure @@ -651,6 +651,7 @@ CFG_CONFIGURE_EXIT_ON_ERROR=yes CFG_PROFILE=no CFG_EXCEPTIONS=unspecified CFG_GUI=auto # (yes|no|auto) +CFG_WIDGETS=yes CFG_QCONFIG=full CFG_DEBUG=auto CFG_MYSQL_CONFIG= @@ -1712,6 +1713,15 @@ while [ "$#" -gt 0 ]; do fi fi ;; + widgets) + if [ "$VAL" = "yes" ] || [ "$VAL" = "auto" ]; then + CFG_WIDGETS="yes" + elif [ "$VAL" = "no" ]; then + CFG_WIDGETS="no" + else + UNKNOWN_OPT=yes + fi + ;; dbus) if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ] || [ "$VAL" = "linked" ]; then CFG_DBUS="$VAL" @@ -5602,8 +5612,12 @@ if [ "$CFG_GUI" = "auto" ]; then fi if [ "$CFG_GUI" = "no" ]; then QT_CONFIG="$QT_CONFIG no-gui" + CFG_WIDGETS="no" +fi +if [ "$CFG_WIDGETS" = "no" ]; then + QT_CONFIG="$QT_CONFIG no-widgets" + QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_WIDGETS" fi - if [ "x$BUILD_ON_MAC" = "xyes" ] && [ "$XPLATFORM_MINGW" != "yes" ]; then #On Mac we implicitly link against libz, so we @@ -6473,6 +6487,7 @@ fi [ "$CFG_DBUS" = "linked" ] && echo "QtDBus module .......... yes (linked)" echo "QtConcurrent code ...... $CFG_CONCURRENT" echo "QtGui module ........... $CFG_GUI" +echo "QtWidgets module ....... $CFG_WIDGETS" if [ "$CFG_JAVASCRIPTCORE_JIT" = "auto" ]; then echo "JavaScriptCore JIT ..... To be decided by JavaScriptCore" else -- cgit v1.2.3