diff options
Diffstat (limited to 'config.tests')
59 files changed, 95 insertions, 56 deletions
diff --git a/config.tests/arch/arch.cpp b/config.tests/arch/arch.cpp index b9c244e29e..b3c0d3b7d2 100644 --- a/config.tests/arch/arch.cpp +++ b/config.tests/arch/arch.cpp @@ -106,6 +106,22 @@ const char msg2[] = "==Qt=magic=Qt== Sub-architecture:" // AVX 2, Intel Core 4th Generation ("Haswell") " avx2" #endif +#ifdef __AVX512F__ +// AVX512 Foundation, Intel Xeon Phi codename "Knights Landing" +" avx512f" +#endif +#ifdef __AVX512CD__ +// AVX512 Conflict Detection, Intel Xeon Phi codename "Knights Landing" +" avx512cd" +#endif +#ifdef __AVX512ER__ +// AVX512 Exponentiation & Reciprocal, Intel Xeon Phi codename "Knights Landing" +" avx512ef" +#endif +#ifdef __AVX512PF__ +// AVX512 Prefetch, Intel Xeon Phi codename "Knights Landing" +" avx512pf" +#endif #ifdef __BMI__ // Bit Manipulation Instructions 1, Intel Core 4th Generation ("Haswell"), AMD "Bulldozer 2" " bmi" @@ -169,6 +185,10 @@ const char msg2[] = "==Qt=magic=Qt== Sub-architecture:" // Random number generator, Intel Core 3rd Generation ("Ivy Bridge") " rdrnd" #endif +#ifdef __SHA__ +// SHA-1 and SHA-256 instructions, Intel processor TBA +" sha" +#endif #if defined(__SSE__) || (defined(_M_IX86_FP) && _M_IX86_FP >= 1) || defined(_M_X64) // Streaming SIMD Extensions, Intel Pentium III, AMD Athlon " sse" diff --git a/config.tests/arch/arch.pro b/config.tests/arch/arch.pro index fda4acc601..d89d70b1ee 100644 --- a/config.tests/arch/arch.pro +++ b/config.tests/arch/arch.pro @@ -2,4 +2,3 @@ TARGET = arch SOURCES = arch.cpp CONFIG -= qt dylib release debug_and_release CONFIG += debug console -mac:CONFIG -= app_bundle diff --git a/config.tests/common/avx/avx.pro b/config.tests/common/avx/avx.pro index ba7fd96e43..8d1b9702bc 100644 --- a/config.tests/common/avx/avx.pro +++ b/config.tests/common/avx/avx.pro @@ -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 diff --git a/config.tests/common/avx2/avx2.pro b/config.tests/common/avx2/avx2.pro index 5aa9429d68..927f64efc8 100644 --- a/config.tests/common/avx2/avx2.pro +++ b/config.tests/common/avx2/avx2.pro @@ -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 diff --git a/config.tests/common/c++11/c++11.pro b/config.tests/common/c++11/c++11.pro index dd4042b8d6..dbe764ba84 100644 --- a/config.tests/common/c++11/c++11.pro +++ b/config.tests/common/c++11/c++11.pro @@ -1,3 +1,3 @@ SOURCES = c++11.cpp CONFIG += c++11 -CONFIG -= qt app_bundle +CONFIG -= qt diff --git a/config.tests/common/sse2/sse2.pro b/config.tests/common/sse2/sse2.pro index c8d0861170..b4031f13fa 100644 --- a/config.tests/common/sse2/sse2.pro +++ b/config.tests/common/sse2/sse2.pro @@ -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 diff --git a/config.tests/common/sse3/sse3.pro b/config.tests/common/sse3/sse3.pro index 90f61d2065..f704c40c75 100644 --- a/config.tests/common/sse3/sse3.pro +++ b/config.tests/common/sse3/sse3.pro @@ -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 diff --git a/config.tests/common/sse4_1/sse4_1.pro b/config.tests/common/sse4_1/sse4_1.pro index d92be9dc43..5cc04e7c5c 100644 --- a/config.tests/common/sse4_1/sse4_1.pro +++ b/config.tests/common/sse4_1/sse4_1.pro @@ -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 diff --git a/config.tests/common/sse4_2/sse4_2.pro b/config.tests/common/sse4_2/sse4_2.pro index 744098dce8..6a04b1f9a5 100644 --- a/config.tests/common/sse4_2/sse4_2.pro +++ b/config.tests/common/sse4_2/sse4_2.pro @@ -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 diff --git a/config.tests/common/ssse3/ssse3.pro b/config.tests/common/ssse3/ssse3.pro index e3984bd1cd..5b207e78ce 100644 --- a/config.tests/common/ssse3/ssse3.pro +++ b/config.tests/common/ssse3/ssse3.pro @@ -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 diff --git a/config.tests/mac/coreservices/coreservices.pro b/config.tests/mac/coreservices/coreservices.pro index 6f7c07a487..64936eb974 100644 --- a/config.tests/mac/coreservices/coreservices.pro +++ b/config.tests/mac/coreservices/coreservices.pro @@ -1,3 +1,3 @@ OBJECTIVE_SOURCES = coreservices.mm LIBS += -framework CoreServices -CONFIG -= app_bundle qt +CONFIG -= qt diff --git a/config.tests/mac/corewlan/corewlan.pro b/config.tests/mac/corewlan/corewlan.pro index a9c256043c..8db0c8c1e7 100644 --- a/config.tests/mac/corewlan/corewlan.pro +++ b/config.tests/mac/corewlan/corewlan.pro @@ -1,3 +1,3 @@ OBJECTIVE_SOURCES = corewlantest.mm LIBS += -framework CoreWLAN -framework Foundation -CONFIG -= app_bundle qt +CONFIG -= qt diff --git a/config.tests/qpa/directfb/directfb.pro b/config.tests/qpa/directfb/directfb.pro index 958ced7bea..b138fd0109 100644 --- a/config.tests/qpa/directfb/directfb.pro +++ b/config.tests/qpa/directfb/directfb.pro @@ -1,3 +1,2 @@ SOURCES = directfb.cpp CONFIG -= qt -mac:CONFIG -= app_bundle diff --git a/config.tests/unix/alsa/alsa.pro b/config.tests/unix/alsa/alsa.pro index 4931d38ea8..6d5d55bcfd 100644 --- a/config.tests/unix/alsa/alsa.pro +++ b/config.tests/unix/alsa/alsa.pro @@ -1,4 +1,3 @@ SOURCES = alsatest.cpp LIBS+=-lasound CONFIG -= qt dylib -mac:CONFIG -= app_bundle diff --git a/config.tests/unix/arch.test b/config.tests/unix/arch.test index 3efd6f4f25..529ed5e547 100755 --- a/config.tests/unix/arch.test +++ b/config.tests/unix/arch.test @@ -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="" diff --git a/config.tests/unix/clock-gettime/clock-gettime.pro b/config.tests/unix/clock-gettime/clock-gettime.pro index c527535183..bdbb1c2a82 100644 --- a/config.tests/unix/clock-gettime/clock-gettime.pro +++ b/config.tests/unix/clock-gettime/clock-gettime.pro @@ -1,4 +1,3 @@ SOURCES = clock-gettime.cpp CONFIG -= qt dylib -mac:CONFIG -= app_bundle include(clock-gettime.pri) diff --git a/config.tests/unix/clock-monotonic/clock-monotonic.pro b/config.tests/unix/clock-monotonic/clock-monotonic.pro index 961e3a848d..253a9f7346 100644 --- a/config.tests/unix/clock-monotonic/clock-monotonic.pro +++ b/config.tests/unix/clock-monotonic/clock-monotonic.pro @@ -1,4 +1,3 @@ SOURCES = clock-monotonic.cpp CONFIG -= qt dylib -mac:CONFIG -= app_bundle include(../clock-gettime/clock-gettime.pri) diff --git a/config.tests/unix/compile.test b/config.tests/unix/compile.test index 6b90044009..22064b85e9 100755 --- a/config.tests/unix/compile.test +++ b/config.tests/unix/compile.test @@ -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 diff --git a/config.tests/unix/cups/cups.pro b/config.tests/unix/cups/cups.pro index d7b78c877f..3f8ca99d0f 100644 --- a/config.tests/unix/cups/cups.pro +++ b/config.tests/unix/cups/cups.pro @@ -1,4 +1,3 @@ SOURCES = cups.cpp CONFIG -= qt dylib -mac:CONFIG -= app_bundle LIBS += -lcups diff --git a/config.tests/unix/db2/db2.pro b/config.tests/unix/db2/db2.pro index 0fa39a8242..b7316051f9 100644 --- a/config.tests/unix/db2/db2.pro +++ b/config.tests/unix/db2/db2.pro @@ -1,4 +1,3 @@ SOURCES = db2.cpp CONFIG -= qt dylib -mac:CONFIG -= app_bundle LIBS += -ldb2 diff --git a/config.tests/unix/dbus/dbus.pro b/config.tests/unix/dbus/dbus.pro index 1e4aea73e4..c2a01ea269 100644 --- a/config.tests/unix/dbus/dbus.pro +++ b/config.tests/unix/dbus/dbus.pro @@ -1,3 +1,2 @@ SOURCES = dbus.cpp CONFIG -= qt -mac:CONFIG -= app_bundle diff --git a/config.tests/unix/eventfd/eventfd.pro b/config.tests/unix/eventfd/eventfd.pro index c41204f49f..de99717750 100644 --- a/config.tests/unix/eventfd/eventfd.pro +++ b/config.tests/unix/eventfd/eventfd.pro @@ -1,3 +1,2 @@ SOURCES = main.cpp CONFIG -= qt dylib -mac:CONFIG -= app_bundle diff --git a/config.tests/unix/fontconfig/fontconfig.pro b/config.tests/unix/fontconfig/fontconfig.pro index 5989586751..8360774035 100644 --- a/config.tests/unix/fontconfig/fontconfig.pro +++ b/config.tests/unix/fontconfig/fontconfig.pro @@ -1,4 +1,4 @@ SOURCES = fontconfig.cpp -CONFIG -= qt app_bundle +CONFIG -= qt LIBS += -lfreetype -lfontconfig include(../../unix/freetype/freetype.pri) diff --git a/config.tests/unix/getaddrinfo/getaddrinfo.pro b/config.tests/unix/getaddrinfo/getaddrinfo.pro index c9121db9b4..cc739118fa 100644 --- a/config.tests/unix/getaddrinfo/getaddrinfo.pro +++ b/config.tests/unix/getaddrinfo/getaddrinfo.pro @@ -1,4 +1,3 @@ SOURCES = getaddrinfotest.cpp CONFIG -= qt dylib -mac:CONFIG -= app_bundle LIBS += $$QMAKE_LIBS_NETWORK diff --git a/config.tests/unix/getifaddrs/getifaddrs.pro b/config.tests/unix/getifaddrs/getifaddrs.pro index c3fead6354..14a89f87b8 100644 --- a/config.tests/unix/getifaddrs/getifaddrs.pro +++ b/config.tests/unix/getifaddrs/getifaddrs.pro @@ -1,5 +1,4 @@ SOURCES = getifaddrs.cpp CONFIG -= qt -mac:CONFIG -= app_bundle QT = LIBS += $$QMAKE_LIBS_NETWORK diff --git a/config.tests/unix/glib/glib.pro b/config.tests/unix/glib/glib.pro index c7cd53d116..15d059df77 100644 --- a/config.tests/unix/glib/glib.pro +++ b/config.tests/unix/glib/glib.pro @@ -1,2 +1,2 @@ SOURCES = glib.cpp -CONFIG -= qt app_bundle +CONFIG -= qt diff --git a/config.tests/unix/gnu-libiconv/gnu-libiconv.pro b/config.tests/unix/gnu-libiconv/gnu-libiconv.pro index d879b205f1..1ecf94390a 100644 --- a/config.tests/unix/gnu-libiconv/gnu-libiconv.pro +++ b/config.tests/unix/gnu-libiconv/gnu-libiconv.pro @@ -1,4 +1,3 @@ SOURCES = gnu-libiconv.cpp CONFIG -= qt dylib -mac:CONFIG -= app_bundle LIBS += -liconv diff --git a/config.tests/unix/harfbuzz/harfbuzz.cpp b/config.tests/unix/harfbuzz/harfbuzz.cpp new file mode 100644 index 0000000000..9e26b04499 --- /dev/null +++ b/config.tests/unix/harfbuzz/harfbuzz.cpp @@ -0,0 +1,60 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the config.tests of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include <harfbuzz/hb.h> + +#if ((HB_VERSION_MAJOR*10000 + HB_VERSION_MINOR*100 + HB_VERSION_MICRO) < 912) +# error "This version of harfbuzz is too old." +#endif + +int main(int, char **) +{ + hb_buffer_t *buffer = hb_buffer_create(); + + const uint16_t string[] = { 'A', 'b', 'c' }; + hb_buffer_add_utf16(buffer, string, 3, 0, 3); + hb_buffer_guess_segment_properties(buffer); + hb_buffer_set_flags(buffer, hb_buffer_flags_t(HB_BUFFER_FLAG_PRESERVE_DEFAULT_IGNORABLES)); + + hb_buffer_destroy(buffer); + + return 0; +} diff --git a/config.tests/unix/harfbuzz/harfbuzz.pro b/config.tests/unix/harfbuzz/harfbuzz.pro new file mode 100644 index 0000000000..32edd6e358 --- /dev/null +++ b/config.tests/unix/harfbuzz/harfbuzz.pro @@ -0,0 +1,3 @@ +SOURCES = harfbuzz.cpp +CONFIG -= qt dylib +LIBS += -lharfbuzz diff --git a/config.tests/unix/ibase/ibase.pro b/config.tests/unix/ibase/ibase.pro index 01e7429733..58787851e1 100644 --- a/config.tests/unix/ibase/ibase.pro +++ b/config.tests/unix/ibase/ibase.pro @@ -1,4 +1,3 @@ SOURCES = ibase.cpp CONFIG -= qt dylib -mac:CONFIG -= app_bundle LIBS += -lgds diff --git a/config.tests/unix/iconv/iconv.pro b/config.tests/unix/iconv/iconv.pro index 39375a5714..1ef6aa7207 100644 --- a/config.tests/unix/iconv/iconv.pro +++ b/config.tests/unix/iconv/iconv.pro @@ -1,3 +1,3 @@ SOURCES = iconv.cpp -CONFIG -= qt dylib app_bundle +CONFIG -= qt dylib mac|win32-g++*|qnx:LIBS += -liconv diff --git a/config.tests/unix/icu/icu.pro b/config.tests/unix/icu/icu.pro index 8e583348bb..002c4840d5 100644 --- a/config.tests/unix/icu/icu.pro +++ b/config.tests/unix/icu/icu.pro @@ -1,4 +1,4 @@ SOURCES = icu.cpp -CONFIG -= qt dylib app_bundle +CONFIG -= qt dylib unix:LIBS += -licuuc -licui18n win32:LIBS += -licuin diff --git a/config.tests/unix/inotify/inotify.pro b/config.tests/unix/inotify/inotify.pro index e2e1560a47..35880de3c0 100644 --- a/config.tests/unix/inotify/inotify.pro +++ b/config.tests/unix/inotify/inotify.pro @@ -1,3 +1,2 @@ SOURCES = inotifytest.cpp CONFIG -= qt dylib -mac:CONFIG -= app_bundle diff --git a/config.tests/unix/iodbc/iodbc.pro b/config.tests/unix/iodbc/iodbc.pro index 465a9a7a1b..68a0bd0ef4 100644 --- a/config.tests/unix/iodbc/iodbc.pro +++ b/config.tests/unix/iodbc/iodbc.pro @@ -1,4 +1,3 @@ SOURCES = iodbc.cpp CONFIG -= qt dylib -mac:CONFIG -= app_bundle LIBS += -liodbc diff --git a/config.tests/unix/ipv6ifname/ipv6ifname.pro b/config.tests/unix/ipv6ifname/ipv6ifname.pro index ed62869cb9..88203a782c 100644 --- a/config.tests/unix/ipv6ifname/ipv6ifname.pro +++ b/config.tests/unix/ipv6ifname/ipv6ifname.pro @@ -1,5 +1,4 @@ SOURCES = ipv6ifname.cpp CONFIG -= qt -mac:CONFIG -= app_bundle QT = LIBS += $$QMAKE_LIBS_NETWORK diff --git a/config.tests/unix/libjpeg/libjpeg.pro b/config.tests/unix/libjpeg/libjpeg.pro index d06888c57d..01329a11fe 100644 --- a/config.tests/unix/libjpeg/libjpeg.pro +++ b/config.tests/unix/libjpeg/libjpeg.pro @@ -1,4 +1,3 @@ SOURCES = libjpeg.cpp CONFIG -= qt dylib -mac:CONFIG -= app_bundle LIBS += -ljpeg diff --git a/config.tests/unix/libpng/libpng.pro b/config.tests/unix/libpng/libpng.pro index f03838663e..4e50fe26e5 100644 --- a/config.tests/unix/libpng/libpng.pro +++ b/config.tests/unix/libpng/libpng.pro @@ -1,4 +1,3 @@ SOURCES = libpng.cpp CONFIG -= qt dylib -mac:CONFIG -= app_bundle LIBS += -lpng diff --git a/config.tests/unix/mremap/mremap.pro b/config.tests/unix/mremap/mremap.pro index a36d756db3..1dbd3b7a7e 100644 --- a/config.tests/unix/mremap/mremap.pro +++ b/config.tests/unix/mremap/mremap.pro @@ -1,3 +1,2 @@ SOURCES = mremap.cpp CONFIG -= qt dylib -mac:CONFIG -= app_bundle diff --git a/config.tests/unix/mysql/mysql.pro b/config.tests/unix/mysql/mysql.pro index a22579e1bd..06d1880f08 100644 --- a/config.tests/unix/mysql/mysql.pro +++ b/config.tests/unix/mysql/mysql.pro @@ -1,4 +1,3 @@ SOURCES = mysql.cpp CONFIG -= qt dylib -mac:CONFIG -= app_bundle LIBS += -lmysqlclient diff --git a/config.tests/unix/mysql_r/mysql_r.pro b/config.tests/unix/mysql_r/mysql_r.pro index 8c06067305..096da69487 100644 --- a/config.tests/unix/mysql_r/mysql_r.pro +++ b/config.tests/unix/mysql_r/mysql_r.pro @@ -1,4 +1,3 @@ SOURCES = ../mysql/mysql.cpp CONFIG -= qt dylib -mac:CONFIG -= app_bundle LIBS += -lmysqlclient_r diff --git a/config.tests/unix/nis/nis.pro b/config.tests/unix/nis/nis.pro index 1f985b2049..b7f5693b60 100644 --- a/config.tests/unix/nis/nis.pro +++ b/config.tests/unix/nis/nis.pro @@ -1,5 +1,4 @@ SOURCES = nis.cpp CONFIG -= qt dylib -mac: CONFIG -= app_bundle solaris-*:LIBS += -lnsl else:LIBS += $$QMAKE_LIBS_NIS diff --git a/config.tests/unix/oci/oci.pro b/config.tests/unix/oci/oci.pro index 4add225f5d..3ffda1ddd7 100644 --- a/config.tests/unix/oci/oci.pro +++ b/config.tests/unix/oci/oci.pro @@ -1,4 +1,3 @@ SOURCES = oci.cpp CONFIG -= qt dylib -mac:CONFIG -= app_bundle LIBS += -lclntsh diff --git a/config.tests/unix/odbc/odbc.pro b/config.tests/unix/odbc/odbc.pro index 06a548fd71..418a0e0d54 100644 --- a/config.tests/unix/odbc/odbc.pro +++ b/config.tests/unix/odbc/odbc.pro @@ -1,5 +1,4 @@ SOURCES = odbc.cpp CONFIG -= qt dylib -mac:CONFIG -= app_bundle win32-g++*:LIBS += -lodbc32 else:LIBS += -lodbc diff --git a/config.tests/unix/opengldesktop/opengldesktop.pro b/config.tests/unix/opengldesktop/opengldesktop.pro index fbf36a0c67..c3e700c50a 100644 --- a/config.tests/unix/opengldesktop/opengldesktop.pro +++ b/config.tests/unix/opengldesktop/opengldesktop.pro @@ -9,4 +9,3 @@ CONFIG -= qt LIBS += $$QMAKE_LIBS_OPENGL mac:DEFINES += Q_OS_MAC -CONFIG -= app_bundle diff --git a/config.tests/unix/opengles1/opengles1.pro b/config.tests/unix/opengles1/opengles1.pro index 9e6012474d..58817e6a6e 100644 --- a/config.tests/unix/opengles1/opengles1.pro +++ b/config.tests/unix/opengles1/opengles1.pro @@ -9,5 +9,4 @@ CONFIG -= qt LIBS += $$QMAKE_LIBS_OPENGL_ES1 mac { DEFINES += BUILD_ON_MAC - CONFIG -= app_bundle } diff --git a/config.tests/unix/opengles2/opengles2.pro b/config.tests/unix/opengles2/opengles2.pro index 34d77371b4..c4d76895a8 100644 --- a/config.tests/unix/opengles2/opengles2.pro +++ b/config.tests/unix/opengles2/opengles2.pro @@ -9,5 +9,4 @@ CONFIG -= qt LIBS += $$QMAKE_LIBS_OPENGL_ES2 mac { DEFINES += BUILD_ON_MAC - CONFIG -= app_bundle } diff --git a/config.tests/unix/openssl/openssl.pro b/config.tests/unix/openssl/openssl.pro index 1c537cb2b1..a023aee4aa 100644 --- a/config.tests/unix/openssl/openssl.pro +++ b/config.tests/unix/openssl/openssl.pro @@ -1,3 +1,2 @@ SOURCES = openssl.cpp CONFIG -= x11 qt -mac:CONFIG -= app_bundle diff --git a/config.tests/unix/pcre/pcre.pro b/config.tests/unix/pcre/pcre.pro index b29c55da47..7b8bfc6545 100644 --- a/config.tests/unix/pcre/pcre.pro +++ b/config.tests/unix/pcre/pcre.pro @@ -1,3 +1,3 @@ SOURCES = pcre.cpp -CONFIG -= qt dylib app_bundle +CONFIG -= qt dylib LIBS += -lpcre16 diff --git a/config.tests/unix/psql/psql.pro b/config.tests/unix/psql/psql.pro index 38bfb3ed70..d0f3761bfb 100644 --- a/config.tests/unix/psql/psql.pro +++ b/config.tests/unix/psql/psql.pro @@ -1,4 +1,3 @@ SOURCES = psql.cpp CONFIG -= qt dylib -mac:CONFIG -= app_bundle LIBS *= -lpq diff --git a/config.tests/unix/ptrsize.test b/config.tests/unix/ptrsize.test index c78c73f7a2..3ad15dbd2b 100755 --- a/config.tests/unix/ptrsize.test +++ b/config.tests/unix/ptrsize.test @@ -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 diff --git a/config.tests/unix/ptrsize/ptrsizetest.pro b/config.tests/unix/ptrsize/ptrsizetest.pro index 41aba86dd9..045a759ec9 100644 --- a/config.tests/unix/ptrsize/ptrsizetest.pro +++ b/config.tests/unix/ptrsize/ptrsizetest.pro @@ -1,3 +1,2 @@ SOURCES = ptrsizetest.cpp CONFIG -= qt dylib -mac:CONFIG -= app_bundle diff --git a/config.tests/unix/slog2/slog2.pro b/config.tests/unix/slog2/slog2.pro index 9f5b34d664..e65460bb94 100644 --- a/config.tests/unix/slog2/slog2.pro +++ b/config.tests/unix/slog2/slog2.pro @@ -1,4 +1,3 @@ SOURCES = slog2.cpp CONFIG -= qt -mac:CONFIG -= app_bundle LIBS += -lslog2 diff --git a/config.tests/unix/sqlite/sqlite.pro b/config.tests/unix/sqlite/sqlite.pro index ba2cac1465..4b24e014ba 100644 --- a/config.tests/unix/sqlite/sqlite.pro +++ b/config.tests/unix/sqlite/sqlite.pro @@ -1,3 +1,2 @@ SOURCES = sqlite.cpp CONFIG -= qt dylib -mac:CONFIG -= app_bundle diff --git a/config.tests/unix/sqlite2/sqlite2.pro b/config.tests/unix/sqlite2/sqlite2.pro index 14a64d5db9..7e69fdf2f3 100644 --- a/config.tests/unix/sqlite2/sqlite2.pro +++ b/config.tests/unix/sqlite2/sqlite2.pro @@ -1,4 +1,3 @@ SOURCES = sqlite2.cpp CONFIG -= qt dylib -mac:CONFIG -= app_bundle LIBS += -lsqlite diff --git a/config.tests/unix/stdint/stdint.pro b/config.tests/unix/stdint/stdint.pro index 79a0d9cd3a..9975484889 100644 --- a/config.tests/unix/stdint/stdint.pro +++ b/config.tests/unix/stdint/stdint.pro @@ -1,4 +1,3 @@ SOURCES = main.cpp CONFIG -= x11 qt -mac:CONFIG -= app_bundle diff --git a/config.tests/unix/stl/stl.pro b/config.tests/unix/stl/stl.pro index a2feab431c..7303e8d31c 100644 --- a/config.tests/unix/stl/stl.pro +++ b/config.tests/unix/stl/stl.pro @@ -1,3 +1,2 @@ SOURCES = stltest.cpp CONFIG -= qt dylib -mac:CONFIG -= app_bundle diff --git a/config.tests/unix/sun-libiconv/sun-libiconv.pro b/config.tests/unix/sun-libiconv/sun-libiconv.pro index 00df8653c8..923afc7dd2 100644 --- a/config.tests/unix/sun-libiconv/sun-libiconv.pro +++ b/config.tests/unix/sun-libiconv/sun-libiconv.pro @@ -1,2 +1,2 @@ SOURCES = ../gnu-libiconv/gnu-libiconv.cpp -CONFIG -= qt dylib app_bundle +CONFIG -= qt dylib diff --git a/config.tests/unix/tds/tds.pro b/config.tests/unix/tds/tds.pro index 5516a14c8f..6712779d58 100644 --- a/config.tests/unix/tds/tds.pro +++ b/config.tests/unix/tds/tds.pro @@ -1,4 +1,3 @@ SOURCES = tds.cpp CONFIG -= qt dylib -mac:CONFIG -= app_bundle LIBS += -lsybdb diff --git a/config.tests/unix/zlib/zlib.pro b/config.tests/unix/zlib/zlib.pro index 67cc870516..d9bd03e5df 100644 --- a/config.tests/unix/zlib/zlib.pro +++ b/config.tests/unix/zlib/zlib.pro @@ -1,4 +1,3 @@ SOURCES = zlib.cpp CONFIG -= qt dylib -mac:CONFIG -= app_bundle LIBS += -lz |