diff options
Diffstat (limited to 'config.tests/unix')
-rw-r--r-- | config.tests/unix/harfbuzz/harfbuzz.cpp | 2 | ||||
-rwxr-xr-x | config.tests/unix/ptrsize.test | 37 | ||||
-rw-r--r-- | config.tests/unix/ptrsize/ptrsizetest.cpp | 53 | ||||
-rw-r--r-- | config.tests/unix/ptrsize/ptrsizetest.pro | 3 |
4 files changed, 1 insertions, 94 deletions
diff --git a/config.tests/unix/harfbuzz/harfbuzz.cpp b/config.tests/unix/harfbuzz/harfbuzz.cpp index bbaa9fc14d..1e6f7e70d6 100644 --- a/config.tests/unix/harfbuzz/harfbuzz.cpp +++ b/config.tests/unix/harfbuzz/harfbuzz.cpp @@ -33,7 +33,7 @@ #include <harfbuzz/hb.h> -#if !HB_VERSION_ATLEAST(0, 9, 31) +#if !HB_VERSION_ATLEAST(0, 9, 42) # error "This version of harfbuzz is too old." #endif diff --git a/config.tests/unix/ptrsize.test b/config.tests/unix/ptrsize.test deleted file mode 100755 index 5fede1d7ce..0000000000 --- a/config.tests/unix/ptrsize.test +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh - -QMKSPEC=$1 -VERBOSE=$2 -SRCDIR=$3 -OUTDIR=$4 -QMAKE=$5 -QTCONF=$6 - -LFLAGS=$SYSROOT_FLAG -CXXFLAGS=$SYSROOT_FLAG - -# debuggery -[ "$VERBOSE" = "yes" ] && echo "Testing size of pointers ... ($*)" - -# build and run a test program -test -d "$OUTDIR/config.tests/unix/ptrsize" || mkdir -p "$OUTDIR/config.tests/unix/ptrsize" -"$QMAKE" -qtconf "$QTCONF" -nocache -spec "$QMKSPEC" "CONFIG-=app_bundle" "QMAKE_LFLAGS*=$LFLAGS" "QMAKE_CXXFLAGS*=$CXXFLAGS" "$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 - ($MAKE clean && $MAKE) -else - ($MAKE clean && $MAKE) >/dev/null 2>&1 -fi -RETVAL=$? - -if [ "$RETVAL" -ne 0 ]; then - PTRSIZE=4 -else - PTRSIZE=8 -fi - - -# done -[ "$VERBOSE" = "yes" ] && echo "Pointer size: $PTRSIZE" -exit $PTRSIZE diff --git a/config.tests/unix/ptrsize/ptrsizetest.cpp b/config.tests/unix/ptrsize/ptrsizetest.cpp deleted file mode 100644 index 826095d0e9..0000000000 --- a/config.tests/unix/ptrsize/ptrsizetest.cpp +++ /dev/null @@ -1,53 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the config.tests of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL21$ -** 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 The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/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 or version 3 as published by the Free -** Software Foundation and appearing in the file LICENSE.LGPLv21 and -** LICENSE.LGPLv3 included in the packaging of this file. Please review the -** following information to ensure the GNU Lesser General Public License -** requirements will be met: https://www.gnu.org/licenses/lgpl.html and -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** As a special exception, The Qt Company gives you certain additional -** rights. These rights are described in The Qt Company LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -/* Sample program for configure to test pointer size on target -platforms. -*/ - -template<int> -struct QPointerSizeTest -{ -}; - -template<> -struct QPointerSizeTest<8> -{ - enum { PointerSize = 8 }; -}; - -int main( int, char ** ) -{ - return QPointerSizeTest<sizeof(void*)>::PointerSize; -} - diff --git a/config.tests/unix/ptrsize/ptrsizetest.pro b/config.tests/unix/ptrsize/ptrsizetest.pro deleted file mode 100644 index a7ae38a5d9..0000000000 --- a/config.tests/unix/ptrsize/ptrsizetest.pro +++ /dev/null @@ -1,3 +0,0 @@ -SOURCES = ptrsizetest.cpp -CONFIG -= qt dylib -CONFIG += debug console |