diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-07-24 15:09:38 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-24 15:09:38 +0200 |
| commit | 509ed01c85c926387f6573dd1b5fe6611fa08118 (patch) | |
| tree | cdc2b8a7df4c9778176a1e3341d018971f769daa /configure | |
| parent | 288e50227dd5af7cdaba7e4b54a61c539021f1e0 (diff) | |
| parent | 084c5b3db794af1ce86b2b17455d9be5e64baebe (diff) | |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 12 |
1 files changed, 2 insertions, 10 deletions
@@ -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 @@ -3187,14 +3187,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 @@ -3500,7 +3492,7 @@ Additional options: -skip <module> ..... 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. |