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

Disable app_bundle and lib_bundle when running configure tests

Browse Source 
Just like configure.prf.

Change-Id: I760e0ca5bec41b3befb738a8a7a468e8f1a15946
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
This commit is contained in:
Tor Arne Vestbø 2013-07-15 17:04:31 +02:00 committed by The Qt Project
parent c8cc4f162d
commit ba1aba61cc
56 changed files with 12 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config.tests/arch/arch.pro
View File

@ -2,4 +2,3 @@ TARGET = arch
SOURCES = arch.cpp
CONFIG -= qt dylib release debug_and_release
CONFIG += debug console
mac:CONFIG -= app_bundle

1
config.tests/common/avx/avx.pro
View File

@ -1,6 +1,5 @@
SOURCES = avx.cpp
CONFIG -= qt dylib release debug_and_release
CONFIG += debug console
mac:CONFIG -= app_bundle
isEmpty(QMAKE_CFLAGS_AVX):error("This compiler does not support AVX")
else:QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_AVX

1
config.tests/common/avx2/avx2.pro
View File

@ -1,6 +1,5 @@
SOURCES = avx2.cpp
CONFIG -= qt dylib release debug_and_release
CONFIG += debug console
mac:CONFIG -= app_bundle
isEmpty(QMAKE_CFLAGS_AVX2):error("This compiler does not support AVX2")
else:QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_AVX2

2
config.tests/common/c++11/c++11.pro
View File

@ -1,3 +1,3 @@
SOURCES = c++11.cpp
CONFIG += c++11
CONFIG -= qt app_bundle
CONFIG -= qt

1
config.tests/common/sse2/sse2.pro
View File

@ -1,6 +1,5 @@
SOURCES = sse2.cpp
CONFIG -= qt dylib release debug_and_release
CONFIG += debug console
mac:CONFIG -= app_bundle
isEmpty(QMAKE_CFLAGS_SSE2):error("This compiler does not support SSE2")
else:QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_SSE2

1
config.tests/common/sse3/sse3.pro
View File

@ -1,6 +1,5 @@
SOURCES = sse3.cpp
CONFIG -= qt dylib release debug_and_release
CONFIG += debug console
mac:CONFIG -= app_bundle
isEmpty(QMAKE_CFLAGS_SSE3):error("This compiler does not support SSE3")
else:QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_SSE3

1
config.tests/common/sse4_1/sse4_1.pro
View File

@ -1,6 +1,5 @@
SOURCES = sse4_1.cpp
CONFIG -= qt dylib release debug_and_release
CONFIG += debug console
mac:CONFIG -= app_bundle
isEmpty(QMAKE_CFLAGS_SSE4_1):error("This compiler does not support SSE4.1")
else:QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_SSE4_1

1
config.tests/common/sse4_2/sse4_2.pro
View File

@ -1,6 +1,5 @@
SOURCES = sse4_2.cpp
CONFIG -= qt dylib release debug_and_release
CONFIG += debug console
mac:CONFIG -= app_bundle
isEmpty(QMAKE_CFLAGS_SSE4_2):error("This compiler does not support SSE4.2")
else:QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_SSE4_2

1
config.tests/common/ssse3/ssse3.pro
View File

@ -1,6 +1,5 @@
SOURCES = ssse3.cpp
CONFIG -= qt dylib release debug_and_release
CONFIG += debug console
mac:CONFIG -= app_bundle
isEmpty(QMAKE_CFLAGS_SSSE3):error("This compiler does not support SSSE3")
else:QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_SSSE3

2
config.tests/mac/coreservices/coreservices.pro
View File

@ -1,3 +1,3 @@
OBJECTIVE_SOURCES = coreservices.mm
LIBS += -framework CoreServices
CONFIG -= app_bundle qt
CONFIG -= qt

2
config.tests/mac/corewlan/corewlan.pro
View File

@ -1,3 +1,3 @@
OBJECTIVE_SOURCES = corewlantest.mm
LIBS += -framework CoreWLAN -framework Foundation
CONFIG -= app_bundle qt
CONFIG -= qt

1
config.tests/qpa/directfb/directfb.pro
View File

@ -1,3 +1,2 @@
SOURCES = directfb.cpp
CONFIG -= qt
mac:CONFIG -= app_bundle

1
config.tests/unix/alsa/alsa.pro
View File

@ -1,4 +1,3 @@
SOURCES = alsatest.cpp
LIBS+=-lasound
CONFIG -= qt dylib
mac:CONFIG -= app_bundle

2
config.tests/unix/arch.test
View File

@ -26,7 +26,7 @@ CXXFLAGS="$SYSROOT_FLAG"
test -d "$OUTDIR/config.tests/arch" || mkdir -p "$OUTDIR/config.tests/arch"
cd "$OUTDIR/config.tests/arch"
[ -f Makefile ] && $MAKE distclean >/dev/null 2>&1
OUTDIR=$OUTDIR "$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "QT_BUILD_TREE=$OUTDIR" "LIBS+=$LFLAGS" "QMAKE_CXXFLAGS+=$CXXFLAGS" "$SRCDIR/config.tests/arch/arch$PROSUFFIX.pro" >/dev/null 2>&1 || echo "qmake is broken" >&2
OUTDIR=$OUTDIR "$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "QT_BUILD_TREE=$OUTDIR" "LIBS+=$LFLAGS" "QMAKE_CXXFLAGS+=$CXXFLAGS" "CONFIG-=app_bundle" "$SRCDIR/config.tests/arch/arch$PROSUFFIX.pro" >/dev/null 2>&1 || echo "qmake is broken" >&2
ARCH=""

1
config.tests/unix/clock-gettime/clock-gettime.pro
View File

@ -1,4 +1,3 @@
SOURCES = clock-gettime.cpp
CONFIG -= qt dylib
mac:CONFIG -= app_bundle
include(clock-gettime.pri)

1
config.tests/unix/clock-monotonic/clock-monotonic.pro
View File

@ -1,4 +1,3 @@
SOURCES = clock-monotonic.cpp
CONFIG -= qt dylib
mac:CONFIG -= app_bundle
include(../clock-gettime/clock-gettime.pri)

2
config.tests/unix/compile.test
View File

@ -67,7 +67,7 @@ test -r Makefile && $MAKE distclean >/dev/null 2>&1
# Make sure output from possible previous tests is gone
rm -f "$EXE" "${EXE}.exe"
set -- "$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "CONFIG+=android_app" "CONFIG-=debug_and_release" "LIBS*=$LFLAGS" "LIBS+=$MAC_ARCH_LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "QMAKE_CXXFLAGS+=$MAC_ARCH_CXXFLAGS" "QT_BUILD_TREE=$OUTDIR" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile"
set -- "$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "CONFIG+=android_app" "CONFIG-=debug_and_release app_bundle lib_bundle" "LIBS*=$LFLAGS" "LIBS+=$MAC_ARCH_LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "QMAKE_CXXFLAGS+=$MAC_ARCH_CXXFLAGS" "QT_BUILD_TREE=$OUTDIR" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile"
if [ "$VERBOSE" = "yes" ]; then
OUTDIR=$OUTDIR "$@"
$MAKE

1
config.tests/unix/cups/cups.pro
View File

@ -1,4 +1,3 @@
SOURCES = cups.cpp
CONFIG -= qt dylib
mac:CONFIG -= app_bundle
LIBS += -lcups

1
config.tests/unix/db2/db2.pro
View File

@ -1,4 +1,3 @@
SOURCES = db2.cpp
CONFIG -= qt dylib
mac:CONFIG -= app_bundle
LIBS += -ldb2

1
config.tests/unix/dbus/dbus.pro
View File

@ -1,3 +1,2 @@
SOURCES = dbus.cpp
CONFIG -= qt
mac:CONFIG -= app_bundle

1
config.tests/unix/eventfd/eventfd.pro
View File

@ -1,3 +1,2 @@
SOURCES = main.cpp
CONFIG -= qt dylib
mac:CONFIG -= app_bundle

2
config.tests/unix/fontconfig/fontconfig.pro
View File

@ -1,4 +1,4 @@
SOURCES = fontconfig.cpp
CONFIG -= qt app_bundle
CONFIG -= qt
LIBS += -lfreetype -lfontconfig
include(../../unix/freetype/freetype.pri)

1
config.tests/unix/getaddrinfo/getaddrinfo.pro
View File

@ -1,4 +1,3 @@
SOURCES = getaddrinfotest.cpp
CONFIG -= qt dylib
mac:CONFIG -= app_bundle
LIBS += $$QMAKE_LIBS_NETWORK

1
config.tests/unix/getifaddrs/getifaddrs.pro
View File

@ -1,5 +1,4 @@
SOURCES = getifaddrs.cpp
CONFIG -= qt
mac:CONFIG -= app_bundle
QT =
LIBS += $$QMAKE_LIBS_NETWORK

2
config.tests/unix/glib/glib.pro
View File

@ -1,2 +1,2 @@
SOURCES = glib.cpp
CONFIG -= qt app_bundle
CONFIG -= qt

1
config.tests/unix/gnu-libiconv/gnu-libiconv.pro
View File

@ -1,4 +1,3 @@
SOURCES = gnu-libiconv.cpp
CONFIG -= qt dylib
mac:CONFIG -= app_bundle
LIBS += -liconv

1
config.tests/unix/ibase/ibase.pro
View File

@ -1,4 +1,3 @@
SOURCES = ibase.cpp
CONFIG -= qt dylib
mac:CONFIG -= app_bundle
LIBS += -lgds

2
config.tests/unix/iconv/iconv.pro
View File

@ -1,3 +1,3 @@
SOURCES = iconv.cpp
CONFIG -= qt dylib app_bundle
CONFIG -= qt dylib
mac|win32-g++*|qnx:LIBS += -liconv

2
config.tests/unix/icu/icu.pro
View File

@ -1,4 +1,4 @@
SOURCES = icu.cpp
CONFIG -= qt dylib app_bundle
CONFIG -= qt dylib
unix:LIBS += -licuuc -licui18n
win32:LIBS += -licuin

1
config.tests/unix/inotify/inotify.pro
View File

@ -1,3 +1,2 @@
SOURCES = inotifytest.cpp
CONFIG -= qt dylib
mac:CONFIG -= app_bundle

1
config.tests/unix/iodbc/iodbc.pro
View File

@ -1,4 +1,3 @@
SOURCES = iodbc.cpp
CONFIG -= qt dylib
mac:CONFIG -= app_bundle
LIBS += -liodbc

1
config.tests/unix/ipv6ifname/ipv6ifname.pro
View File

@ -1,5 +1,4 @@
SOURCES = ipv6ifname.cpp
CONFIG -= qt
mac:CONFIG -= app_bundle
QT =
LIBS += $$QMAKE_LIBS_NETWORK

1
config.tests/unix/libjpeg/libjpeg.pro
View File

@ -1,4 +1,3 @@
SOURCES = libjpeg.cpp
CONFIG -= qt dylib
mac:CONFIG -= app_bundle
LIBS += -ljpeg

1
config.tests/unix/libpng/libpng.pro
View File

@ -1,4 +1,3 @@
SOURCES = libpng.cpp
CONFIG -= qt dylib
mac:CONFIG -= app_bundle
LIBS += -lpng

1
config.tests/unix/mremap/mremap.pro
View File

@ -1,3 +1,2 @@
SOURCES = mremap.cpp
CONFIG -= qt dylib
mac:CONFIG -= app_bundle

1
config.tests/unix/mysql/mysql.pro
View File

@ -1,4 +1,3 @@
SOURCES = mysql.cpp
CONFIG -= qt dylib
mac:CONFIG -= app_bundle
LIBS += -lmysqlclient

1
config.tests/unix/mysql_r/mysql_r.pro
View File

@ -1,4 +1,3 @@
SOURCES = ../mysql/mysql.cpp
CONFIG -= qt dylib
mac:CONFIG -= app_bundle
LIBS += -lmysqlclient_r

1
config.tests/unix/nis/nis.pro
View File

@ -1,5 +1,4 @@
SOURCES = nis.cpp
CONFIG -= qt dylib
mac: CONFIG -= app_bundle
solaris-*:LIBS += -lnsl
else:LIBS += $$QMAKE_LIBS_NIS

1
config.tests/unix/oci/oci.pro
View File

@ -1,4 +1,3 @@
SOURCES = oci.cpp
CONFIG -= qt dylib
mac:CONFIG -= app_bundle
LIBS += -lclntsh

1
config.tests/unix/odbc/odbc.pro
View File

@ -1,5 +1,4 @@
SOURCES = odbc.cpp
CONFIG -= qt dylib
mac:CONFIG -= app_bundle
win32-g++*:LIBS += -lodbc32
else:LIBS += -lodbc

1
config.tests/unix/opengldesktop/opengldesktop.pro
View File

@ -9,4 +9,3 @@ CONFIG -= qt
LIBS += $$QMAKE_LIBS_OPENGL
mac:DEFINES += Q_OS_MAC
CONFIG -= app_bundle

1
config.tests/unix/opengles1/opengles1.pro
View File

@ -9,5 +9,4 @@ CONFIG -= qt
LIBS += $$QMAKE_LIBS_OPENGL_ES1
mac {
DEFINES += BUILD_ON_MAC
CONFIG -= app_bundle
}

1
config.tests/unix/opengles2/opengles2.pro
View File

@ -9,5 +9,4 @@ CONFIG -= qt
LIBS += $$QMAKE_LIBS_OPENGL_ES2
mac {
DEFINES += BUILD_ON_MAC
CONFIG -= app_bundle
}

1
config.tests/unix/openssl/openssl.pro
View File

@ -1,3 +1,2 @@
SOURCES = openssl.cpp
CONFIG -= x11 qt
mac:CONFIG -= app_bundle

2
config.tests/unix/pcre/pcre.pro
View File

@ -1,3 +1,3 @@
SOURCES = pcre.cpp
CONFIG -= qt dylib app_bundle
CONFIG -= qt dylib
LIBS += -lpcre16

1
config.tests/unix/psql/psql.pro
View File

@ -1,4 +1,3 @@
SOURCES = psql.cpp
CONFIG -= qt dylib
mac:CONFIG -= app_bundle
LIBS *= -lpq

2
config.tests/unix/ptrsize.test
View File

@ -10,7 +10,7 @@ OUTDIR=$4
# build and run a test program
test -d "$OUTDIR/config.tests/unix/ptrsize" || mkdir -p "$OUTDIR/config.tests/unix/ptrsize"
"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "QT_BUILD_TREE=$OUTDIR" "$SRCDIR/config.tests/unix/ptrsize/ptrsizetest.pro" -o "$OUTDIR/config.tests/unix/ptrsize/Makefile" >/dev/null 2>&1
"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "QT_BUILD_TREE=$OUTDIR" "CONFIG-=app_bundle" "$SRCDIR/config.tests/unix/ptrsize/ptrsizetest.pro" -o "$OUTDIR/config.tests/unix/ptrsize/Makefile" >/dev/null 2>&1
cd "$OUTDIR/config.tests/unix/ptrsize"
if [ "$VERBOSE" = "yes" ]; then

1
config.tests/unix/ptrsize/ptrsizetest.pro
View File

@ -1,3 +1,2 @@
SOURCES = ptrsizetest.cpp
CONFIG -= qt dylib
mac:CONFIG -= app_bundle

1
config.tests/unix/slog2/slog2.pro
View File

@ -1,4 +1,3 @@
SOURCES = slog2.cpp
CONFIG -= qt
mac:CONFIG -= app_bundle
LIBS += -lslog2

1
config.tests/unix/sqlite/sqlite.pro
View File

@ -1,3 +1,2 @@
SOURCES = sqlite.cpp
CONFIG -= qt dylib
mac:CONFIG -= app_bundle

1
config.tests/unix/sqlite2/sqlite2.pro
View File

@ -1,4 +1,3 @@
SOURCES = sqlite2.cpp
CONFIG -= qt dylib
mac:CONFIG -= app_bundle
LIBS += -lsqlite

1
config.tests/unix/stdint/stdint.pro
View File

@ -1,4 +1,3 @@
SOURCES = main.cpp
CONFIG -= x11 qt
mac:CONFIG -= app_bundle

1
config.tests/unix/stl/stl.pro
View File

@ -1,3 +1,2 @@
SOURCES = stltest.cpp
CONFIG -= qt dylib
mac:CONFIG -= app_bundle

2
config.tests/unix/sun-libiconv/sun-libiconv.pro
View File

@ -1,2 +1,2 @@
SOURCES = ../gnu-libiconv/gnu-libiconv.cpp
CONFIG -= qt dylib app_bundle
CONFIG -= qt dylib

1
config.tests/unix/tds/tds.pro
View File

@ -1,4 +1,3 @@
SOURCES = tds.cpp
CONFIG -= qt dylib
mac:CONFIG -= app_bundle
LIBS += -lsybdb

1
config.tests/unix/zlib/zlib.pro
View File

@ -1,4 +1,3 @@
SOURCES = zlib.cpp
CONFIG -= qt dylib
mac:CONFIG -= app_bundle
LIBS += -lz