From 54987c6bf55b159d3ddb79461439700f6e0111f9 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 17 Jul 2013 14:34:10 +0200 Subject: default to -compile-examples because of popular confusion. the packaging scripts now need to use -no-compile-examples explicitly. Task-number: QTBUG-32449 Change-Id: Iecab1f345afe21e540204fe69a2292ef932cbb61 Reviewed-by: Andy Shaw Reviewed-by: Joerg Bornemann --- configure | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 938b23b000..140c7b4131 100755 --- a/configure +++ b/configure @@ -888,7 +888,7 @@ QT_DEFAULT_BUILD_PARTS="libs tools examples" CFG_BUILD_PARTS="" CFG_NOBUILD_PARTS="" CFG_SKIP_MODULES="" -CFG_COMPILE_EXAMPLES=auto +CFG_COMPILE_EXAMPLES=yes CFG_RELEASE_QMAKE=no CFG_AUDIO_BACKEND=auto CFG_V8SNAPSHOT=auto @@ -3204,14 +3204,6 @@ else QT_HOST_DATA=`"$relpath/config.tests/unix/makeabs" "$QT_HOST_DATA"` fi -# Do not actually build the examples in production builds with -prefix, unless requested -if [ "$CFG_COMPILE_EXAMPLES" = auto ]; then - if [ "$CFG_DEV" = "yes" ] || [ "x$outpath" = "x$QT_INSTALL_PREFIX" ]; then - CFG_COMPILE_EXAMPLES=yes - else - CFG_COMPILE_EXAMPLES=no - fi -fi if [ "$CFG_COMPILE_EXAMPLES" = "yes" ]; then QMAKE_CONFIG="$QMAKE_CONFIG compile_examples" fi @@ -3517,7 +3509,7 @@ Additional options: -skip ..... Exclude an entire module from the build. - -compile-examples .. Compile examples even in a production build. + -no-compile-examples ... Install only the sources of examples. -no-gui ............ Don't build the Qt GUI module and dependencies. + -gui ............... Build the Qt GUI module and dependencies. -- cgit v1.2.3