1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

configure: fixed setting of CFG_MAC_ARCHS for mac qpa builds

Browse Source 
Previously, the mac arch was only put into qconfig.pri for carbon
and cocoa builds.  Make sure it is also available for qpa builds.
This is needed for projects which need to select architecture-specific
sources in their .pro file.

Change-Id: I5f72e3b699b11dafc4dae052620913f2b9b81d0a
Reviewed-on: http://codereview.qt.nokia.com/2313
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
This commit is contained in:
Rohan McGovern 2011-07-28 11:48:28 +10:00 committed by Qt by Nokia
parent 1cd497a14e
commit 3ca3ea4742
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure vendored
View File

@ -6877,7 +6877,7 @@ fi
# For "-carbon" builds: 32 bit x86/ppc. # For "-carbon" builds: 32 bit x86/ppc.
# For builds on snow leopard : compiler default (64-bit). # For builds on snow leopard : compiler default (64-bit).
# For builds on leopard : compiler default (32-bit). # For builds on leopard : compiler default (32-bit).
if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_ARCHS" = "" ]; then if [ "$CFG_ARCH" = "macosx" ] && [ "$CFG_MAC_ARCHS" = "" ]; then
source "$mactests/defaultarch.test" "$TEST_COMPILER" "$OPT_VERBOSE" "$mactests" source "$mactests/defaultarch.test" "$TEST_COMPILER" "$OPT_VERBOSE" "$mactests"
if [ "$CFG_MAC_CARBON" = "yes" ]; then if [ "$CFG_MAC_CARBON" = "yes" ]; then
@ -7129,7 +7129,7 @@ fi
[ "$CFG_AVX" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG avx" [ "$CFG_AVX" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG avx"
[ "$CFG_IWMMXT" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG iwmmxt" [ "$CFG_IWMMXT" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG iwmmxt"
[ "$CFG_NEON" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG neon" [ "$CFG_NEON" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG neon"
[ "$PLATFORM_MAC" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG $CFG_MAC_ARCHS" [ "$CFG_ARCH" = "macosx" ] && QMAKE_CONFIG="$QMAKE_CONFIG $CFG_MAC_ARCHS"
if [ "$CFG_CLOCK_GETTIME" = "yes" ]; then if [ "$CFG_CLOCK_GETTIME" = "yes" ]; then
QT_CONFIG="$QT_CONFIG clock-gettime" QT_CONFIG="$QT_CONFIG clock-gettime"
fi fi
@ -8598,7 +8598,7 @@ else
echo "Building for: $XPLATFORM" echo "Building for: $XPLATFORM"
fi fi
if [ "$PLATFORM_MAC" = "yes" ]; then if [ ! -z "$CFG_MAC_ARCHS" ]; then
echo "Architecture: $CFG_ARCH ($CFG_MAC_ARCHS )" echo "Architecture: $CFG_ARCH ($CFG_MAC_ARCHS )"
else else
echo "Architecture: $CFG_ARCH" echo "Architecture: $CFG_ARCH"