diff options
Diffstat (limited to 'config.tests')
46 files changed, 76 insertions, 989 deletions
diff --git a/config.tests/unix/stdint/main.cpp b/config.tests/common/c++98default/c++98default.cpp index f232e8bb85..5edcf2d76c 100644 --- a/config.tests/unix/stdint/main.cpp +++ b/config.tests/common/c++98default/c++98default.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2016 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the config.tests of the Qt Toolkit. +** This file is part of the configuration of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -37,11 +37,8 @@ ** ****************************************************************************/ -/* Check for the presence of stdint.h */ -#include <stdint.h> - -int main() -{ - return 0; -} +#if __cplusplus >= 201103L +#error "compiler uses c++11 or higher by default" +#endif +int main(int, char **) {} diff --git a/config.tests/common/c++98default/c++98default.pro b/config.tests/common/c++98default/c++98default.pro new file mode 100644 index 0000000000..97cf2d7b20 --- /dev/null +++ b/config.tests/common/c++98default/c++98default.pro @@ -0,0 +1,3 @@ +TEMPLATE = app +CONFIG -= c++11 c++14 c++1z +SOURCES = c++98default.cpp diff --git a/config.tests/common/c++default/c++default.cpp b/config.tests/common/c++default/c++default.cpp deleted file mode 100644 index 018963beb3..0000000000 --- a/config.tests/common/c++default/c++default.cpp +++ /dev/null @@ -1 +0,0 @@ -__cplusplus diff --git a/config.tests/common/c++default/c++default.pro b/config.tests/common/c++default/c++default.pro deleted file mode 100644 index 7e6bcefe69..0000000000 --- a/config.tests/common/c++default/c++default.pro +++ /dev/null @@ -1,14 +0,0 @@ -TEMPLATE = aux -CONFIG -= qt c++11 -PREPROCESSOR_SOURCES += c++default.cpp - -preprocessor.commands = $(CXX) $(CXXFLAGS) $(INCPATH) -o $@ -E $< -msvc:preprocessor.commands = $(CXX) $(CXXFLAGS) $(INCPATH) -E ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} -preprocessor.output = ${QMAKE_FILE_BASE}.ii -preprocessor.input = PREPROCESSOR_SOURCES -preprocessor.variable_out = GENERATED_FILES -QMAKE_EXTRA_COMPILERS += preprocessor - -all.target = all -all.depends += c++default.ii -QMAKE_EXTRA_TARGETS += all diff --git a/config.tests/common/pch/header.h b/config.tests/common/pch/header.h new file mode 100644 index 0000000000..ebc22c4fb0 --- /dev/null +++ b/config.tests/common/pch/header.h @@ -0,0 +1 @@ +#define HEADER_H diff --git a/config.tests/common/pch/pch.pro b/config.tests/common/pch/pch.pro new file mode 100644 index 0000000000..a6f842dff0 --- /dev/null +++ b/config.tests/common/pch/pch.pro @@ -0,0 +1,3 @@ +CONFIG += precompile_header +PRECOMPILED_HEADER = header.h +SOURCES = source.cpp diff --git a/config.tests/unix/javascriptcore-jit/hwcap_test.cpp b/config.tests/common/pch/source.cpp index 560476963a..855672ffa8 100644 --- a/config.tests/unix/javascriptcore-jit/hwcap_test.cpp +++ b/config.tests/common/pch/source.cpp @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2016 The Qt Company. ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the documentation of the Qt Toolkit. +** This file is part of the configuration of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -36,9 +36,9 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include <asm/hwcap.h> -int main (int argc, char **argv) -{ - return 0; -} +#ifndef HEADER_H +#error no go +#endif + +int main() { return 0; } diff --git a/config.tests/qpa/eglfs-brcm/eglfs-brcm.cpp b/config.tests/qpa/eglfs-brcm/eglfs-brcm.cpp index 8a46ec9fff..e6ba06f89b 100644 --- a/config.tests/qpa/eglfs-brcm/eglfs-brcm.cpp +++ b/config.tests/qpa/eglfs-brcm/eglfs-brcm.cpp @@ -38,7 +38,6 @@ ****************************************************************************/ #include <EGL/egl.h> -#include <GLES2/gl2.h> #include <bcm_host.h> int main(int, char **) diff --git a/config.tests/qpa/eglfs-viv/eglfs-viv.cpp b/config.tests/qpa/eglfs-viv/eglfs-viv.cpp index 96935a2aa0..e6e17919dc 100644 --- a/config.tests/qpa/eglfs-viv/eglfs-viv.cpp +++ b/config.tests/qpa/eglfs-viv/eglfs-viv.cpp @@ -39,7 +39,6 @@ #include <EGL/egl.h> #include <EGL/eglvivante.h> -#include <GLES2/gl2.h> int main(int, char **) { diff --git a/config.tests/qpa/eglfs-viv/eglfs-viv.pro b/config.tests/qpa/eglfs-viv/eglfs-viv.pro index 3b36dc533f..1617ee38ad 100644 --- a/config.tests/qpa/eglfs-viv/eglfs-viv.pro +++ b/config.tests/qpa/eglfs-viv/eglfs-viv.pro @@ -6,9 +6,7 @@ integrity { } CONFIG -= qt -LIBS += -lEGL -lGLESv2 -lGAL - -for(p, QMAKE_LIBDIR_OPENGL_ES2) { +for(p, QMAKE_LIBDIR_OPENGL_EGL) { exists($$p):LIBS += -L$$p } diff --git a/config.tests/qpa/xcb-syslibs/xcb.cpp b/config.tests/qpa/xcb-syslibs/xcb.cpp index 0e1bd76e6c..00d0da1b6c 100644 --- a/config.tests/qpa/xcb-syslibs/xcb.cpp +++ b/config.tests/qpa/xcb-syslibs/xcb.cpp @@ -57,8 +57,5 @@ int main(int, char **) xcb_connection_t *connection = xcb_connect("", &primaryScreen); - // This won't compile unless libxcb >= 1.5 which defines XCB_ATOM_PRIMARY. - int xcbAtomPrimary = XCB_ATOM_PRIMARY; - return 0; } diff --git a/config.tests/qpa/xcb-xkb/xcb-xkb.cpp b/config.tests/qpa/xcb-xkb/xcb-xkb.cpp index 6a88944aee..9685649633 100644 --- a/config.tests/qpa/xcb-xkb/xcb-xkb.cpp +++ b/config.tests/qpa/xcb-xkb/xcb-xkb.cpp @@ -51,6 +51,9 @@ int main(int, char **) xcb_connection_t *connection = xcb_connect("", &primaryScreen); + // This takes more arguments in xcb-xkb < 1.10. + xcb_xkb_get_kbd_by_name_unchecked(NULL, 0, 0, 0, 0); + // This won't compile unless libxcb >= 1.5 which defines XCB_ATOM_PRIMARY. int xcbAtomPrimary = XCB_ATOM_PRIMARY; diff --git a/config.tests/qpa/xcb/xcb.cpp b/config.tests/qpa/xcb/xcb.cpp index a5b419e695..efb4f0ca2e 100644 --- a/config.tests/qpa/xcb/xcb.cpp +++ b/config.tests/qpa/xcb/xcb.cpp @@ -43,5 +43,9 @@ int main(int, char **) { int primaryScreen = 0; xcb_connection_t *t = xcb_connect("", &primaryScreen); + + // This won't compile unless libxcb >= 1.5 which defines XCB_ATOM_PRIMARY. + int xcbAtomPrimary = XCB_ATOM_PRIMARY; + return 0; } diff --git a/config.tests/unix/arch.test b/config.tests/unix/arch.test deleted file mode 100755 index cfb47def4f..0000000000 --- a/config.tests/unix/arch.test +++ /dev/null @@ -1,77 +0,0 @@ -#!/bin/sh - -QMKSPEC=$1 -VERBOSE=$2 -SRCDIR=$3 -OUTDIR=$4 -RESULTFILE=$5 -TARGET=$6 -QMAKE=$7 -QTCONF=$8 -shift 8 - -if [ "$TARGET" = "host" ]; then - VARPREFIX="CFG_HOST" - PROSUFFIX="_host" -else - VARPREFIX="CFG" - PROSUFFIX="" -fi - -LFLAGS="$SYSROOT_FLAG" -CXXFLAGS="$SYSROOT_FLAG" - -while [ "$#" -gt 0 ]; do - PARAM=$1 - case $PARAM in - -L*|-l*) - LFLAGS="$LFLAGS \"$PARAM\"" - ;; - -I*) - INC=`echo $PARAM | sed -e 's/^-I//'` - INCLUDEPATH="$INCLUDEPATH \"$INC\"" - ;; - -D*) - CXXFLAGS="$CXXFLAGS \"$PARAM\"" - ;; - *) ;; - esac - shift -done - -# debuggery -[ "$VERBOSE" = "yes" ] && echo "Determining architecture... ($*)" - -# build a test program but don't run it -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 "$QMAKE" -qtconf "$QTCONF" -nocache -spec "$QMKSPEC" "LIBS+=$LFLAGS" "QMAKE_CXXFLAGS+=$CXXFLAGS" "INCLUDEPATH+=$INCLUDEPATH" "CONFIG-=app_bundle" "$SRCDIR/config.tests/arch/arch$PROSUFFIX.pro" >/dev/null 2>&1 || echo "qmake is broken" >&2 - - -ARCH="" -[ "$VERBOSE" = "yes" ] && $MAKE || $MAKE >/dev/null 2>&1 - -if [ -f ./arch.exe ]; then - binary=./arch.exe -elif [ -f ./arch ]; then - binary=./arch -elif [ -f ./libarch.so ]; then - binary=./libarch.so -else - [ "$VERBOSE" = "yes" ] && echo "Unable to determine architecture!" - exit 2 -fi - -if strings - $binary 2>/dev/null | \ - awk -F: '/\=\=Qt\=magic\=Qt\=\= Architecture/ { print "'$VARPREFIX'_ARCH=\"" $2 "\"" } - /\=\=Qt\=magic\=Qt\=\= Sub-architecture/ { print "'$VARPREFIX'_CPUFEATURES=\"" $2 "\"" }' > "$RESULTFILE" -then - [ "$VERBOSE" = "yes" ] && echo " Found architecture in binary" && \ - cat "$RESULTFILE" -else - [ "$VERBOSE" = "yes" ] && echo "Unable to determine architecture!" - exit 2 -fi - -$MAKE distclean >/dev/null 2>&1 diff --git a/config.tests/unix/bsymbolic_functions.test b/config.tests/unix/bsymbolic_functions.test deleted file mode 100755 index 4d66ee6de0..0000000000 --- a/config.tests/unix/bsymbolic_functions.test +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh - -BSYMBOLIC_FUNCTIONS_SUPPORT=no -COMPILER=$1 -VERBOSE=$2 - - -cat >>bsymbolic_functions.c << EOF -#if !(defined(__i386) || defined(__i386__) || defined(__x86_64) || defined(__x86_64__) || defined(__amd64)) -#error "Symbolic function binding on this architecture may be broken, disabling it (see QTBUG-36129)." -#endif - -int main() { return 0; } -EOF - -if [ "$VERBOSE" = "yes" ] ; then - echo $COMPILER $SYSROOT_FLAG -o libtest.so -shared -Wl,-Bsymbolic-functions -fPIC bsymbolic_functions.c - $COMPILER $SYSROOT_FLAG -o libtest.so -shared -Wl,-Bsymbolic-functions -fPIC bsymbolic_functions.c && BSYMBOLIC_FUNCTIONS_SUPPORT=yes -else - $COMPILER $SYSROOT_FLAG -o libtest.so -shared -Wl,-Bsymbolic-functions -fPIC bsymbolic_functions.c >/dev/null 2>&1 && BSYMBOLIC_FUNCTIONS_SUPPORT=yes -fi -rm -f bsymbolic_functions.c libtest.so - -# done -if [ "$BSYMBOLIC_FUNCTIONS_SUPPORT" != "yes" ]; then - [ "$VERBOSE" = "yes" ] && echo "Symbolic function binding disabled." - exit 0 -else - [ "$VERBOSE" = "yes" ] && echo "Symbolic function binding enabled." - exit 1 -fi diff --git a/config.tests/unix/compile.test b/config.tests/unix/compile.test deleted file mode 100755 index f5db1847b8..0000000000 --- a/config.tests/unix/compile.test +++ /dev/null @@ -1,109 +0,0 @@ -#!/bin/sh - -SUCCESS=no -QMKSPEC=$1 -XPLATFORM=`basename "$1"` -QMAKE_CONFIG=$2 -VERBOSE=$3 -SRCDIR=$4 -OUTDIR=$5 -TEST=$6 -EXE=`basename "$6"` -DESCRIPTION=$7 -QMAKE=$8 -QTCONF=$9 -shift 9 -LFLAGS="$SYSROOT_FLAG" -INCLUDEPATH="" -CFLAGS="$SYSROOT_FLAG" -CXXFLAGS="$SYSROOT_FLAG" -MAC_ARCH_CXXFLAGS="" -MAC_ARCH_LFLAGS="" -QMAKE_ARGS= -while [ "$#" -gt 0 ]; do - PARAM=$1 - case $PARAM in - -config) - QMAKE_CONFIG="$QMAKE_CONFIG $2" - shift - ;; - -framework) - LFLAGS="$LFLAGS -framework \"$2\"" - shift - ;; - -arch) - MAC_ARCH_CFLAGS="$MAC_ARCH_CFLAGS -arch $2" - MAC_ARCH_CXXFLAGS="$MAC_ARCH_CXXFLAGS -arch $2" - MAC_ARCH_LFLAGS="$MAC_ARCH_LFLAGS -arch $2" - shift - ;; - -F*|-m*|-x*) - LFLAGS="$LFLAGS \"$PARAM\"" - CFLAGS="$CFLAGS \"$PARAM\"" - CXXFLAGS="$CXXFLAGS \"$PARAM\"" - ;; - -L*|-l*|-pthread) - LFLAGS="$LFLAGS \"$PARAM\"" - ;; - -I*) - INC=`echo $PARAM | sed -e 's/^-I//'` - INCLUDEPATH="$INCLUDEPATH \"$INC\"" - ;; - -f*|-D*) - CFLAGS="$CFLAGS \"$PARAM\"" - CXXFLAGS="$CXXFLAGS \"$PARAM\"" - ;; - -Qoption) - # Two-argument form for the Sun Compiler - CFLAGS="$CFLAGS $PARAM \"$2\"" - CXXFLAGS="$CXXFLAGS $PARAM \"$2\"" - shift - ;; - *) - QMAKE_ARGS="$QMAKE_ARGS $PARAM" - ;; - esac - shift -done - -test -d "$OUTDIR/$TEST" || mkdir -p "$OUTDIR/$TEST" - -cd "$OUTDIR/$TEST" - -test -r Makefile && $MAKE distclean >/dev/null 2>&1 -# Make sure output from possible previous tests is gone -rm -f "$EXE" "${EXE}.exe" - -set -- \ - "$QMAKE" \ - -qtconf "$QTCONF" \ - -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_CFLAGS*=$CFLAGS" \ - "QMAKE_CFLAGS+=$MAC_ARCH_CFLAGS" \ - "QMAKE_CXXFLAGS*=$CXXFLAGS" \ - "QMAKE_CXXFLAGS+=$MAC_ARCH_CXXFLAGS" \ - $QMAKE_ARGS \ - "$SRCDIR/$TEST/$EXE.pro" \ - -o "$OUTDIR/$TEST/Makefile" -if [ "$VERBOSE" = "yes" ]; then - echo - OUTDIR=$OUTDIR "$@" && $MAKE && SUCCESS=yes -else - OUTDIR=$OUTDIR "$@" >/dev/null 2>&1 && $MAKE >/dev/null 2>&1 && SUCCESS=yes -fi - -# done -if [ "$SUCCESS" != "yes" ]; then - [ "$VERBOSE" = "yes" ] && echo "$DESCRIPTION disabled." || echo " no." - exit 1 -else - [ "$VERBOSE" = "yes" ] && echo "$DESCRIPTION enabled." || echo " yes." - exit 0 -fi diff --git a/config.tests/unix/fvisibility.test b/config.tests/unix/fvisibility.test deleted file mode 100755 index 621af95e63..0000000000 --- a/config.tests/unix/fvisibility.test +++ /dev/null @@ -1,74 +0,0 @@ -#!/bin/sh - -FVISIBILITY_SUPPORT=no -COMPILER=$1 -VERBOSE=$2 - -CMDLINE= - - -RunCompileTest() { - cat >>fvisibility.c << EOF -#if defined(__GNUC__) -# if (__GNUC__ < 4) -# error "GCC3 with backported visibility patch is known to miscompile Qt" -# endif -__attribute((visibility("default"))) void blah(); -#elif defined(__SUNPRO_CC) -# if (__SUNPRO_CC < 0x0550) -# error "SunStudio 8 or later is required for ELF visibility" -# endif -__global void blah(); -#else -# error "GCC4+ or SunStudio 8+ are required to support ELF visibility" -#endif -EOF - - if [ "$VERBOSE" = "yes" ] ; then - echo $COMPILER -c $CMDLINE fvisibility.c - $COMPILER -c $CMDLINE fvisibility.c && FVISIBILITY_SUPPORT=yes - else - $COMPILER -c $CMDLINE fvisibility.c >/dev/null 2>&1 && FVISIBILITY_SUPPORT=yes - fi - rm -f fvisibility.c fvisibility.o -} - - -case "$COMPILER" in -*g++*|*c++*|*qcc*) - CMDLINE="-fvisibility=hidden" - RunCompileTest - ;; - -aCC*) - ;; - -icpc) - ICPC_VERSION=`icpc -dumpversion` - case "$ICPC_VERSION" in - 8.*|9.*|10.0) - # 8.x, 9.x, and 10.0 don't support symbol visibility - ;; - *) - # the compile test works for the intel compiler because it mimics gcc's behavior - CMDLINE="-fvisibility=hidden" - RunCompileTest - ;; - esac - ;; - -CC) - # This should be SunStudio. If not, it'll get caught. - CMDLINE="-xldscope=hidden" - RunCompileTest - ;; -esac - -# done -if [ "$FVISIBILITY_SUPPORT" != "yes" ]; then - [ "$VERBOSE" = "yes" ] && echo "Symbol visibility control disabled." - exit 0 -else - [ "$VERBOSE" = "yes" ] && echo "Symbol visibility control enabled." - exit 1 -fi diff --git a/config.tests/unix/javascriptcore-jit/javascriptcore-jit.pro b/config.tests/unix/javascriptcore-jit/javascriptcore-jit.pro deleted file mode 100644 index 0d5a20d7f3..0000000000 --- a/config.tests/unix/javascriptcore-jit/javascriptcore-jit.pro +++ /dev/null @@ -1,2 +0,0 @@ -SOURCES = hwcap_test.cpp -CONFIG -= qt dylib diff --git a/config.tests/unix/openvg/openvg.pro b/config.tests/unix/openvg/openvg.pro deleted file mode 100644 index 4bbde99230..0000000000 --- a/config.tests/unix/openvg/openvg.pro +++ /dev/null @@ -1,19 +0,0 @@ -SOURCES += openvg.cpp - -!isEmpty(QMAKE_INCDIR_OPENVG): INCLUDEPATH += $$QMAKE_INCDIR_OPENVG -!isEmpty(QMAKE_LIBDIR_OPENVG): LIBS += -L$$QMAKE_LIBDIR_OPENVG -!isEmpty(QMAKE_LIBS_OPENVG): LIBS += $$QMAKE_LIBS_OPENVG - -# Some OpenVG engines (e.g. ShivaVG) are implemented on top of OpenGL. -# Add the extra includes and libraries for that case. -openvg_on_opengl { - !isEmpty(QMAKE_INCDIR_OPENGL): INCLUDEPATH += $$QMAKE_INCDIR_OPENGL - !isEmpty(QMAKE_LIBDIR_OPENGL): LIBS += -L$$QMAKE_LIBDIR_OPENGL - !isEmpty(QMAKE_LIBS_OPENGL): LIBS += $$QMAKE_LIBS_OPENGL -} - -lower_case_includes { - DEFINES += QT_LOWER_CASE_VG_INCLUDES -} - -CONFIG -= qt diff --git a/config.tests/unix/precomp.test b/config.tests/unix/precomp.test deleted file mode 100755 index 0b8377b21a..0000000000 --- a/config.tests/unix/precomp.test +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/sh - -PRECOMP_SUPPORT=no -COMPILER=$1 -VERBOSE=$2 - -case "$COMPILER" in -*icpc) - cat >header.h <<EOF -#define HEADER_H - -EOF - >header.cpp - cat >source.cpp <<EOF -#ifndef HEADER_H -#error no go -#endif - -EOF - - rm -f header.pchi - $COMPILER -pch-create header.pchi -include header.h -c header.cpp -o header.o >/dev/null 2>&1 \ - && $COMPILER -pch-use header.pchi -include header.h -c source.cpp -o source.o >/dev/null 2>&1 \ - && PRECOMP_SUPPORT=yes - - rm -f header.h header.cpp source.cpp - rm -f header.pchi header.o source.o - ;; - -*g++*|c++|*qcc*) - case `"$COMPILER" -dumpversion 2>/dev/null` in - 3.*) - ;; - *) - - >precomp_header.h - if $COMPILER -x c-header precomp_header.h >/dev/null 2>&1; then - $COMPILER -x c++-header precomp_header.h && PRECOMP_SUPPORT=yes - fi - rm -f precomp_header.h precomp_header.h.gch - ;; - esac - ;; -esac - - -# done -if [ "$PRECOMP_SUPPORT" != "yes" ]; then - [ "$VERBOSE" = "yes" ] && echo "Precompiled-headers support disabled." - exit 0 -else - [ "$VERBOSE" = "yes" ] && echo "Precompiled-headers support enabled." - exit 1 -fi diff --git a/config.tests/unix/openvg/openvg.cpp b/config.tests/unix/reduce_exports/fvisibility.c index a322db4824..71af9d99a3 100644 --- a/config.tests/unix/openvg/openvg.cpp +++ b/config.tests/unix/reduce_exports/fvisibility.c @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2016 The Qt Company. ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the documentation of the Qt Toolkit. +** This file is part of the configuration of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -37,19 +37,16 @@ ** ****************************************************************************/ -// There is some variation in OpenVG engines as to what case -// the VG includes use. The Khronos reference implementation -// for OpenVG 1.1 uses upper case, so we treat that as canonical. -#if defined(QT_LOWER_CASE_VG_INCLUDES) -#include <vg/openvg.h> +#if defined(__GNUC__) +# if (__GNUC__ < 4) +# error "GCC3 with backported visibility patch is known to miscompile Qt" +# endif +__attribute((visibility("default"))) void blah(); +#elif defined(__SUNPRO_CC) +# if (__SUNPRO_CC < 0x0550) +# error "SunStudio 8 or later is required for ELF visibility" +# endif +__global void blah(); #else -#include <VG/openvg.h> +# error "GCC4+ or SunStudio 8+ are required to support ELF visibility" #endif - -int main(int, char **) -{ - VGint i; - i = 2; - vgFlush(); - return 0; -} diff --git a/config.tests/unix/reduce_exports/reduce_exports.pro b/config.tests/unix/reduce_exports/reduce_exports.pro new file mode 100644 index 0000000000..dc8adc2637 --- /dev/null +++ b/config.tests/unix/reduce_exports/reduce_exports.pro @@ -0,0 +1,5 @@ +TEMPLATE = lib +CONFIG += dll hide_symbols +SOURCES = fvisibility.c + +isEmpty(QMAKE_CFLAGS_HIDESYMS): error("Nope") diff --git a/config.tests/x11/xfixes/xfixes.cpp b/config.tests/unix/reduce_relocs/bsymbolic_functions.c index 12e402f175..36ff410c81 100644 --- a/config.tests/x11/xfixes/xfixes.cpp +++ b/config.tests/unix/reduce_relocs/bsymbolic_functions.c @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2016 The Qt Company. ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the config.tests of the Qt Toolkit. +** This file is part of the configuration of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -37,17 +37,8 @@ ** ****************************************************************************/ -#include <X11/Xlib.h> -#include <X11/extensions/Xfixes.h> - -#if XFIXES_MAJOR < 2 -# error "Required Xfixes version 2.0 not found." +#if !(defined(__i386) || defined(__i386__) || defined(__x86_64) || defined(__x86_64__) || defined(__amd64)) +# error Symbolic function binding on this architecture may be broken, disabling it (see QTBUG-36129). #endif -int main(int, char **) -{ - XFixesSelectionNotifyEvent event; - event.type = 0; - return 0; -} - +int main() { return 0; } diff --git a/config.tests/unix/reduce_relocs/reduce_relocs.pro b/config.tests/unix/reduce_relocs/reduce_relocs.pro new file mode 100644 index 0000000000..2f23465a3f --- /dev/null +++ b/config.tests/unix/reduce_relocs/reduce_relocs.pro @@ -0,0 +1,5 @@ +TEMPLATE = lib +CONFIG += dll bsymbolic_functions +SOURCES = bsymbolic_functions.c + +isEmpty(QMAKE_LFLAGS_BSYMBOLIC_FUNC): error("Nope") diff --git a/config.tests/x11/notype/notypetest.cpp b/config.tests/unix/sctp/sctp.cpp index 1faf4db056..61c33d5fc5 100644 --- a/config.tests/x11/notype/notypetest.cpp +++ b/config.tests/unix/sctp/sctp.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2016 Alex Trotsenko <alex1973tr@gmail.com> ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. @@ -37,14 +37,26 @@ ** ****************************************************************************/ -/* Sample program for configure to test for broken X11 headers that -confuse gcc 2.95 and better on target platforms such as Solaris. +/* + Sample program for configure to test for SCTP sockets support + on target platforms. */ -#include <X11/Xlib.h> -#include <X11/ICE/ICElib.h> +#include <sys/types.h> +#include <sys/socket.h> +#include <netinet/in.h> +#include <netinet/sctp.h> int main() { + int fd; + sctp_initmsg sctpInitMsg; + socklen_t sctpInitMsgSize = sizeof(sctpInitMsg); + + fd = socket(PF_INET, SOCK_STREAM, IPPROTO_SCTP); + if (fd == -1 || getsockopt(fd, SOL_SCTP, SCTP_INITMSG, &sctpInitMsg, + &sctpInitMsgSize) != 0) + return 1; + return 0; } diff --git a/config.tests/unix/sctp/sctp.pro b/config.tests/unix/sctp/sctp.pro new file mode 100644 index 0000000000..edcc0a444a --- /dev/null +++ b/config.tests/unix/sctp/sctp.pro @@ -0,0 +1,4 @@ +SOURCES = sctp.cpp +CONFIG -= qt +QT = +LIBS += $$QMAKE_LIBS_NETWORK diff --git a/config.tests/unix/shivavg/shivavg.cpp b/config.tests/unix/shivavg/shivavg.cpp deleted file mode 100644 index 33fb7d226d..0000000000 --- a/config.tests/unix/shivavg/shivavg.cpp +++ /dev/null @@ -1,49 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** 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 The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://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 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include <vg/openvg.h> - -int main(int, char **) -{ - VGint i; - i = 2; - vgFlush(); - vgDestroyContextSH(); - return 0; -} diff --git a/config.tests/unix/shivavg/shivavg.pro b/config.tests/unix/shivavg/shivavg.pro deleted file mode 100644 index 39d7bcc78a..0000000000 --- a/config.tests/unix/shivavg/shivavg.pro +++ /dev/null @@ -1,11 +0,0 @@ -SOURCES += shivavg.cpp - -!isEmpty(QMAKE_INCDIR_OPENVG): INCLUDEPATH += $$QMAKE_INCDIR_OPENVG -!isEmpty(QMAKE_LIBDIR_OPENVG): LIBS += -L$$QMAKE_LIBDIR_OPENVG -!isEmpty(QMAKE_LIBS_OPENVG): LIBS += $$QMAKE_LIBS_OPENVG - -!isEmpty(QMAKE_INCDIR_OPENGL): INCLUDEPATH += $$QMAKE_INCDIR_OPENGL -!isEmpty(QMAKE_LIBDIR_OPENGL): LIBS += -L$$QMAKE_LIBDIR_OPENGL -!isEmpty(QMAKE_LIBS_OPENGL): LIBS += $$QMAKE_LIBS_OPENGL - -CONFIG -= qt diff --git a/config.tests/unix/stdint/stdint.pro b/config.tests/unix/stdint/stdint.pro deleted file mode 100644 index 9975484889..0000000000 --- a/config.tests/unix/stdint/stdint.pro +++ /dev/null @@ -1,3 +0,0 @@ -SOURCES = main.cpp -CONFIG -= x11 qt - diff --git a/config.tests/x11/glxfbconfig/glxfbconfig.cpp b/config.tests/x11/glxfbconfig/glxfbconfig.cpp deleted file mode 100644 index 9a2a0f166c..0000000000 --- a/config.tests/x11/glxfbconfig/glxfbconfig.cpp +++ /dev/null @@ -1,49 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** 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 The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://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 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include <GL/gl.h> -#include <GL/glx.h> - -int main(int, char **) -{ - GLXFBConfig config; - config = 0; - - return 0; -} diff --git a/config.tests/x11/glxfbconfig/glxfbconfig.pro b/config.tests/x11/glxfbconfig/glxfbconfig.pro deleted file mode 100644 index 65f855a5f2..0000000000 --- a/config.tests/x11/glxfbconfig/glxfbconfig.pro +++ /dev/null @@ -1,10 +0,0 @@ -SOURCES = glxfbconfig.cpp -CONFIG += x11 -INCLUDEPATH += $$QMAKE_INCDIR_OPENGL - -for(p, QMAKE_LIBDIR_OPENGL) { - exists($$p):LIBS += -L$$p -} - -CONFIG -= qt -LIBS += -lGL diff --git a/config.tests/x11/mitshm/mitshm.cpp b/config.tests/x11/mitshm/mitshm.cpp deleted file mode 100644 index fcc25d6eb4..0000000000 --- a/config.tests/x11/mitshm/mitshm.cpp +++ /dev/null @@ -1,61 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** 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 The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://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 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifdef Q_OS_HPUX -#error "MITSHM not supported on HP-UX." -#else -#include <X11/Xlib.h> -#include <sys/ipc.h> -#include <sys/shm.h> -#include <X11/extensions/XShm.h> - -int main(int, char **) -{ - Display *dpy = 0; - int minor; - int major; - int pixmaps; - if (dpy && XShmQueryVersion(dpy, &major, &minor, &pixmaps)) { - minor = 0; - major = 0; - pixmaps = 0; - } - return 0; -} -#endif diff --git a/config.tests/x11/mitshm/mitshm.pro b/config.tests/x11/mitshm/mitshm.pro deleted file mode 100644 index 8a40317d97..0000000000 --- a/config.tests/x11/mitshm/mitshm.pro +++ /dev/null @@ -1,5 +0,0 @@ -SOURCES = mitshm.cpp -CONFIG += x11 -CONFIG -= qt -LIBS += -lXext -hpux*:DEFINES+=Q_OS_HPUX diff --git a/config.tests/x11/notype.test b/config.tests/x11/notype.test deleted file mode 100755 index 3a01d8f1d7..0000000000 --- a/config.tests/x11/notype.test +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/sh - -QMKSPEC=$1 -XPLATFORM=`basename $1` -VERBOSE=$2 -SRCDIR=$3 -OUTDIR=$4 - -# debuggery -[ "$VERBOSE" = "yes" ] && echo "Detecting broken X11 headers... ($*)" - -# Detect broken X11 headers when using GCC 2.95 or later -# Xsun on Solaris 2.5.1: -# Patches are available for Solaris 2.6, 7, and 8 but -# not for Solaris 2.5.1. -# HP-UX: -# Patches are available for HP-UX 10.20, 11.00, and 11.11. -# AIX 4.3.3 and AIX 5.1: -# Headers are clearly broken on all AIX versions, and we -# don't know of any patches. The strange thing is that we -# did not get any reports about this issue until very -# recently, long after gcc 3.0.x was released. It seems to -# work for us with gcc 2.95.2. -NOTYPE=no - -if [ $XPLATFORM = "solaris-g++" -o $XPLATFORM = "hpux-g++" -o $XPLATFORM = "aix-g++" -o $XPLATFORM = "aix-g++-64" ]; then - NOTYPE=yes - - test -d "$OUTDIR/config.tests/x11/notype" || mkdir -p "$OUTDIR/config.tests/x11/notype" - "$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "$SRCDIR/config.tests/x11/notype/notypetest.pro" -o "$OUTDIR/config.tests/x11/notype/Makefile" >/dev/null 2>&1 - cd "$OUTDIR/config.tests/x11/notype" - - if [ "$VERBOSE" = "yes" ]; then - $MAKE - else - $MAKE >/dev/null 2>&1 - fi - - [ -x notypetest ] && NOTYPE=no -fi - -# done -if [ "$NOTYPE" = "yes" ]; then - [ "$VERBOSE" = "yes" ] && echo "Broken X11 headers detected." - exit 0 -else - [ "$VERBOSE" = "yes" ] && echo "X11 headers look good." - exit 1 -fi diff --git a/config.tests/x11/notype/notypetest.pro b/config.tests/x11/notype/notypetest.pro deleted file mode 100644 index 6ce2c62619..0000000000 --- a/config.tests/x11/notype/notypetest.pro +++ /dev/null @@ -1,5 +0,0 @@ -TEMPLATE=app -TARGET=notypetest -CONFIG-=qt -CONFIG+=x11 -SOURCES=notypetest.cpp diff --git a/config.tests/x11/xcursor/xcursor.cpp b/config.tests/x11/xcursor/xcursor.cpp deleted file mode 100644 index 990534efea..0000000000 --- a/config.tests/x11/xcursor/xcursor.cpp +++ /dev/null @@ -1,64 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** 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 The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://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 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include <X11/Xlib.h> -#include <X11/Xcursor/Xcursor.h> - -#if !defined(XCURSOR_LIB_MAJOR) -# define XCURSOR_LIB_MAJOR XCURSOR_MAJOR -#endif -#if !defined(XCURSOR_LIB_MINOR) -# define XCURSOR_LIB_MINOR XCURSOR_MINOR -#endif - -#if XCURSOR_LIB_MAJOR == 1 && XCURSOR_LIB_MINOR >= 0 -# define XCURSOR_FOUND -#else -# define -# error "Required Xcursor version 1.0 not found." -#endif - -int main(int, char **) -{ - XcursorImage *image; - image = 0; - XcursorCursors *cursors; - cursors = 0; - return 0; -} diff --git a/config.tests/x11/xcursor/xcursor.pro b/config.tests/x11/xcursor/xcursor.pro deleted file mode 100644 index b1e69be29a..0000000000 --- a/config.tests/x11/xcursor/xcursor.pro +++ /dev/null @@ -1,4 +0,0 @@ -SOURCES = xcursor.cpp -CONFIG += x11 -CONFIG -= qt -LIBS += -lXcursor diff --git a/config.tests/x11/xfixes/xfixes.pro b/config.tests/x11/xfixes/xfixes.pro deleted file mode 100644 index cc94a11bc2..0000000000 --- a/config.tests/x11/xfixes/xfixes.pro +++ /dev/null @@ -1,3 +0,0 @@ -CONFIG += x11 -CONFIG -= qt -SOURCES = xfixes.cpp diff --git a/config.tests/x11/xkb/xkb.cpp b/config.tests/x11/xkb/xkb.cpp deleted file mode 100644 index 9876f67a71..0000000000 --- a/config.tests/x11/xkb/xkb.cpp +++ /dev/null @@ -1,69 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** 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 The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://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 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include <X11/Xlib.h> -#include <X11/XKBlib.h> - -int main(int, char **) -{ - Display *display = 0; - - int opcode = -1; - int xkbEventBase = -1; - int xkbErrorBase = -1; - int xkblibMajor = XkbMajorVersion; - int xkblibMinor = XkbMinorVersion; - XkbQueryExtension(display, &opcode, &xkbEventBase, &xkbErrorBase, &xkblibMajor, &xkblibMinor); - - int keycode = 0; - unsigned int state = 0; - KeySym keySym; - unsigned int consumedModifiers; - XkbLookupKeySym(display, keycode, state, &consumedModifiers, &keySym); - - XkbDescPtr xkbDesc = XkbGetMap(display, XkbAllClientInfoMask, XkbUseCoreKbd); - int w = XkbKeyGroupsWidth(xkbDesc, keycode); - keySym = XkbKeySym(xkbDesc, keycode, w-1); - XkbFreeClientMap(xkbDesc, XkbAllClientInfoMask, true); - - state = XkbPCF_GrabsUseXKBStateMask; - (void) XkbSetPerClientControls(display, state, &state); - - return 0; -} diff --git a/config.tests/x11/xkb/xkb.pro b/config.tests/x11/xkb/xkb.pro deleted file mode 100644 index d4ec2223df..0000000000 --- a/config.tests/x11/xkb/xkb.pro +++ /dev/null @@ -1,3 +0,0 @@ -SOURCES = xkb.cpp -CONFIG += x11 -CONFIG -= qt diff --git a/config.tests/x11/xrandr/xrandr.cpp b/config.tests/x11/xrandr/xrandr.cpp deleted file mode 100644 index 4fb8a1b94c..0000000000 --- a/config.tests/x11/xrandr/xrandr.cpp +++ /dev/null @@ -1,52 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** 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 The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://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 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include <X11/Xlib.h> -#include <X11/extensions/Xrandr.h> - -#if RANDR_MAJOR != 1 || RANDR_MINOR < 1 -# error "Requried Xrandr version 1.1 not found." -#endif - -int main(int, char **) -{ - XRRScreenSize *size; - size = 0; - return 0; -} diff --git a/config.tests/x11/xrandr/xrandr.pro b/config.tests/x11/xrandr/xrandr.pro deleted file mode 100644 index 3fb2910b5e..0000000000 --- a/config.tests/x11/xrandr/xrandr.pro +++ /dev/null @@ -1,4 +0,0 @@ -SOURCES = xrandr.cpp -CONFIG += x11 -CONFIG -= qt -LIBS += -lXrender -lXrandr diff --git a/config.tests/x11/xshape/xshape.cpp b/config.tests/x11/xshape/xshape.cpp deleted file mode 100644 index 804a9d044e..0000000000 --- a/config.tests/x11/xshape/xshape.cpp +++ /dev/null @@ -1,49 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** 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 The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://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 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include <X11/Xlib.h> -#include <X11/Xutil.h> -#include <X11/extensions/shape.h> - -int main(int, char **) -{ - XShapeEvent shapeevent; - shapeevent.type = 0; - return 0; -} diff --git a/config.tests/x11/xshape/xshape.pro b/config.tests/x11/xshape/xshape.pro deleted file mode 100644 index 611c048e39..0000000000 --- a/config.tests/x11/xshape/xshape.pro +++ /dev/null @@ -1,3 +0,0 @@ -CONFIG += x11 -CONFIG -= qt -SOURCES = xshape.cpp diff --git a/config.tests/x11/xsync/xsync.cpp b/config.tests/x11/xsync/xsync.cpp deleted file mode 100644 index 48feefdb4a..0000000000 --- a/config.tests/x11/xsync/xsync.cpp +++ /dev/null @@ -1,54 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** 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 The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://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 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include <X11/Xlib.h> -#include <X11/Xutil.h> -extern "C" { -#include <X11/extensions/sync.h> -} - -int main(int, char **) -{ - XSyncValue value; - (void*)&XSyncIntToValue; - (void*)&XSyncCreateCounter; - int a, b; - Status ret = XSyncInitialize(NULL, &a, &b); - return ret; -} diff --git a/config.tests/x11/xsync/xsync.pro b/config.tests/x11/xsync/xsync.pro deleted file mode 100644 index 58b82383ea..0000000000 --- a/config.tests/x11/xsync/xsync.pro +++ /dev/null @@ -1,3 +0,0 @@ -CONFIG += x11 -CONFIG -= qt -SOURCES = xsync.cpp |