diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-08-14 09:05:42 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-08-14 09:06:31 +0200 |
| commit | 5c23199d4e8ff21661dfa5aacc13149178e78cab (patch) | |
| tree | 322aee61581d7c85f1ccb65e47d1e79eba1ba6c9 /configure | |
| parent | 252bad7c589e03d3e12df02354b00a84d8e3159a (diff) | |
| parent | c8d9b17367cfdcb034d11f8a168ca4ae3993e7c3 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
configure
mkspecs/macx-xcode/Info.plist.app
mkspecs/macx-xcode/Info.plist.lib
qmake/doc/qmake.qdocconf
src/corelib/global/qglobal.h
tests/auto/other/exceptionsafety/exceptionsafety.pro
tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
Change-Id: I3c769a4a82dc2e99a12c69123fbf17613fd2ac2a
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 36 |
1 files changed, 13 insertions, 23 deletions
@@ -2347,11 +2347,19 @@ while [ "$#" -gt 0 ]; do CFG_DEFAULT_ANDROID_NDK_TOOLCHAIN_VERSION="$VAL" ;; l*) # -lfoo - L_FLAGS="$L_FLAGS -l\"${VAR#l}\"" + if [ "$VAL" = "yes" ]; then + L_FLAGS="$L_FLAGS -l\"${VAR#l}\"" + else + UNKNOWN_OPT=yes + fi ;; fw*) # -fwfoo - if [ "$BUILD_ON_MAC" = "yes" ]; then - L_FLAGS="$L_FLAGS -framework \"${VAR#fw}\"" + if [ "$VAL" = "yes" ]; then + if [ "$BUILD_ON_MAC" = "yes" ]; then + L_FLAGS="$L_FLAGS -framework \"${VAR#fw}\"" + else + UNKNOWN_OPT=yes + fi else UNKNOWN_OPT=yes fi @@ -2851,7 +2859,7 @@ if [ "$XPLATFORM_IOS" = "yes" ]; then CFG_NOBUILD_PARTS="$CFG_NOBUILD_PARTS examples tests" CFG_SHARED="no" # iOS builds should be static to be able to submit to the App Store CFG_CXX11="no" # C++11 support disabled for now - CFG_SKIP_MODULES="$CFG_SKIP_MODULES qtquickcontrols qtwebkit qtgraphicaleffects qtdoc qtmultimedia qtwebkit-examples-and-demos qttools" + CFG_SKIP_MODULES="$CFG_SKIP_MODULES qtquickcontrols qtwebkit qtgraphicaleffects qtdoc qtmultimedia qtwebkit-examples qttools" fi # disable GTK style support auto-detection on Mac @@ -5348,7 +5356,7 @@ if [ "$CFG_XKBCOMMON" != "qt" ]; then QMakeVar set QMAKE_CFLAGS_XKBCOMMON "$QMAKE_CFLAGS_XKBCOMMON" QMakeVar set QMAKE_LIBS_XKBCOMMON "$QMAKE_LIBS_XKBCOMMON" QMakeVar set QMAKE_VERSION_XKBCOMMON "$QMAKE_VERSION_XKBCOMMON" - CFG_XKBCOMMON=yes + CFG_XKBCOMMON=system else CFG_XKBCOMMON=no fi @@ -6665,24 +6673,6 @@ else fi #------------------------------------------------------------------------------- -# save configuration into .qmake.cache -#------------------------------------------------------------------------------- - -CACHEFILE="$outpath/.qmake.cache" -[ -f "$CACHEFILE.tmp" ] && rm -f "$CACHEFILE.tmp" -cat >>"$CACHEFILE.tmp" <<EOF -QT_SOURCE_TREE = \$\$quote($relpath) -QT_BUILD_TREE = \$\$quote($outpath) -EOF - -# replace .qmake.cache if it differs from the newly created temp file -if cmp -s "$CACHEFILE.tmp" "$CACHEFILE"; then - rm -f "$CACHEFILE.tmp" -else - mv -f "$CACHEFILE.tmp" "$CACHEFILE" -fi - -#------------------------------------------------------------------------------- # give feedback on configuration #------------------------------------------------------------------------------- exec 3>&1 1>$outpath/config.summary # redirect output temporarily to config.summary |