- commit dbf36eab217ffab51cdb74660dae76b552dae307
- Author: Tor Arne Vestbø <torarnv@gmail.com>
- Date: Fri Feb 17 14:32:18 2012 +0100
- Don't unconditionally enable debug_and_release for Qt modules
- If CONFIG is missing either debug or release we should not assume that
- doing a debug_and_release-build with build_all is the appropriate
- default.
- diff --git a/mkspecs/features/qt_module_config.prf b/mkspecs/features/qt_module_config.prf
- index 4da1666..bdfc0fb 100644
- --- a/mkspecs/features/qt_module_config.prf
- +++ b/mkspecs/features/qt_module_config.prf
- @@ -40,7 +40,7 @@ win32:!wince*:DLLDESTDIR = $$[QT_INSTALL_PREFIX]/bin
- CONFIG += qt warn_on depend_includepath
- CONFIG += qmake_cache target_qt
- CONFIG -= fix_output_dirs
- -win32|mac:!macx-xcode:CONFIG += debug_and_release
- +win32|mac:!macx-xcode:debug:release:CONFIG += debug_and_release
- linux*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF
- CONFIG += create_cmake
- commit fbfd986128baf25cbdcdd2622526ce0a7a29917a
- Author: Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
- Date: Mon Feb 13 15:36:36 2012 +0100
- Fix configure archs
- diff --git a/configure b/configure
- index 111ac86..dbba4a8 100755
- --- a/configure
- +++ b/configure
- @@ -771,7 +771,6 @@ CFG_GETIFADDRS=auto
- CFG_INOTIFY=auto
- CFG_RPATH=yes
- CFG_FRAMEWORK=auto
- -CFG_MAC_ARCHS=
- MAC_CONFIG_TEST_COMMANDLINE= # used to make the configure tests run with the correct arch's and SDK settings
- CFG_MAC_DWARF2=auto
- CFG_MAC_XARCH=auto
- @@ -1371,13 +1370,7 @@ while [ "$#" -gt 0 ]; do
- fi
- ;;
- arch)
- - # if this is a Mac then "windows" probably means
- - # we are cross-compiling for MinGW
- - if [ "$BUILD_ON_MAC" = "yes" ] && [ "$VAL" != "windows" ]; then
- - CFG_MAC_ARCHS="$CFG_MAC_ARCHS $VAL"
- - else
- - CFG_ARCH=$VAL
- - fi
- + CFG_ARCH=$VAL
- ;;
- host-arch)
- CFG_HOST_ARCH=$VAL
- @@ -2951,7 +2944,7 @@ if [ "$PLATFORM" != "$XPLATFORM" -a "$CFG_EMBEDDED" != "no" ]; then
- esac
- elif [ "$XPLATFORM_MINGW" = "yes" ]; then
- [ -z "$CFG_ARCH" ] && CFG_ARCH="windows"
- -elif [ "$PLATFORM_MAC" = "yes" ] || [ -z "$CFG_ARCH" ]; then
- +elif [ -z "$CFG_ARCH" ]; then
- CFG_ARCH=$CFG_HOST_ARCH
- fi
- @@ -3546,6 +3539,9 @@ fi
- See the README file for a list of supported
- operating systems and compilers.
- +
- + -arch <arch> ....... Build Qt for <arch>. Only one arch value can be specified.
- +
- EOF
- if [ "${PLATFORM_QWS}" != "yes" -a "${PLATFORM_QPA}" != "yes" ]; then
- @@ -3906,9 +3902,6 @@ Qt/Mac only:
- * -dwarf2 ............ Enable dwarf2 debugging symbols.
- -no-dwarf2 ......... Disable dwarf2 debugging symbols.
- - -arch <arch> ....... Build Qt for <arch>. Supported arch values: x86 x86_64.
- - Only one arch value can be specified.
- -
- -sdk <sdk> ......... Build Qt using Apple provided SDK <sdk>. This option requires gcc 4.
- To use a different SDK with gcc 3.3, set the SDKROOT environment variable.
- @@ -3939,6 +3932,7 @@ if [ "$PLATFORM_QWS" = "yes" -o "$PLATFORM_QPA" = "yes" ]; then
- cat << EOF
- -xplatform target ... The target platform when cross-compiling.
- + -host-arch <arch> ... The host architecture when cross-compiling.
- -no-feature-<feature> Do not compile in <feature>.
- -feature-<feature> .. Compile in <feature>. The available features
- @@ -6316,13 +6310,6 @@ if [ "$CFG_MAC_DWARF2" = "yes" ]; then
- QT_CONFIG="$QT_CONFIG dwarf2"
- fi
- -# Set the default arch if there are no "-arch" arguments on the configure line
- -if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_ARCHS" = "" ]; then
- - source "$mactests/defaultarch.test" "$TEST_COMPILER" "$OPT_VERBOSE" "$mactests"
- - CFG_MAC_ARCHS=" $QT_MAC_DEFAULT_ARCH"
- - [ "$OPT_VERBOSE" = "yes" ] && echo "Setting Mac architechture to$CFG_MAC_ARCHS."
- -fi
- -
- # ### Vestige
- if [ "$CFG_PHONON_BACKEND" = "yes" ]; then
- QT_CONFIG="$QT_CONFIG phonon-backend"
- @@ -6464,7 +6451,7 @@ fi
- [ "$CFG_AVX" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG avx"
- [ "$CFG_IWMMXT" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG iwmmxt"
- [ "$CFG_NEON" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG neon"
- -[ "$PLATFORM_MAC" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG $CFG_MAC_ARCHS"
- +[ "$BUILD_ON_MAC" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG $CFG_ARCH"
- if [ "$CFG_CLOCK_GETTIME" = "yes" ]; then
- QT_CONFIG="$QT_CONFIG clock-gettime"
- fi
- @@ -7276,17 +7263,13 @@ else
- QTCONFIG_CONFIG="$QTCONFIG_CONFIG qt_framework"
- fi
- if [ "$BUILD_ON_MAC" = "yes" ]; then
- - QT_CONFIG="$QT_CONFIG $CFG_MAC_ARCHS"
- + QT_CONFIG="$QT_CONFIG $CFG_ARCH"
- fi
- if [ "$CFG_DEV" = "yes" ]; then
- QT_CONFIG="$QT_CONFIG private_tests"
- fi
- -# Make the application arch follow the Qt arch for single arch builds.
- -# (for multiple-arch builds, set CONFIG manually in the application .pro file)
- -if [ `echo "$CFG_MAC_ARCHS" | wc -w` -eq 1 ]; then
- - QTCONFIG_CONFIG="$QTCONFIG_CONFIG $CFG_MAC_ARCHS"
- -fi
- +QTCONFIG_CONFIG="$QTCONFIG_CONFIG $CFG_ARCH"
- cat >>"$QTCONFIG.tmp" <<EOF
- #configuration
- @@ -7502,20 +7485,10 @@ esac
- echo
- if [ "$XPLATFORM" = "$PLATFORM" ]; then
- - echo "Build type: $PLATFORM"
- -else
- - echo "Building on: $PLATFORM"
- - echo "Building for: $XPLATFORM"
- -fi
- -
- -if [ ! -z "$CFG_MAC_ARCHS" ]; then
- - echo "Architecture: $CFG_ARCH ($CFG_MAC_ARCHS )"
- + echo "Build type: $PLATFORM ($CFG_ARCH)"
- else
- - echo "Architecture: $CFG_ARCH"
- -fi
- -
- -if [ "$PLATFORM_QWS" = "yes" -o "$PLATFORM_QPA" = "yes" ]; then
- - echo "Host architecture: $CFG_HOST_ARCH"
- + echo "Building on: $PLATFORM ($CFG_HOST_ARCH)"
- + echo "Building for: $XPLATFORM ($CFG_ARCH)"
- fi
- if [ -n "$PLATFORM_NOTES" ]; then
Don't like ads? PRO users don't see any ads ;-)
Text below is selected. Please press Ctrl+C to copy to your clipboard. (⌘+C on Mac)
create a new version of this paste
RAW Paste Data