diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-12 07:31:50 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-12 08:33:08 +0200 |
| commit | 990969655c5fb4d03682e96df9b12101f5ee9815 (patch) | |
| tree | b8fb5c50285105c8bc5a938fb50f93ff9f24889d /config.tests/unix | |
| parent | a213011a53f12f101d08a04afc8fdacd2d54a232 (diff) | |
| parent | e64b2234e829cc47872225debcf80d6c06db18f0 (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
config_help.txt
configure
src/corelib/io/qprocess_wince.cpp
src/plugins/platforms/windows/qwindowstheme.cpp
src/plugins/platforms/xcb/qxcbbackingstore.cpp
tests/auto/corelib/tools/qtimezone/BLACKLIST
tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp
tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
Change-Id: I26644d1cb3b78412c8ff285e2a55bea1bd641c01
Diffstat (limited to 'config.tests/unix')
| -rwxr-xr-x | config.tests/unix/compile.test | 19 | ||||
| -rw-r--r-- | config.tests/unix/freetype/freetype.cpp | 2 |
2 files changed, 19 insertions, 2 deletions
diff --git a/config.tests/unix/compile.test b/config.tests/unix/compile.test index ab1bd00884..1228629aea 100755 --- a/config.tests/unix/compile.test +++ b/config.tests/unix/compile.test @@ -77,7 +77,24 @@ 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" +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 OUTDIR=$OUTDIR "$@" && $MAKE && SUCCESS=yes else diff --git a/config.tests/unix/freetype/freetype.cpp b/config.tests/unix/freetype/freetype.cpp index 29bbfd8c6d..c051600b02 100644 --- a/config.tests/unix/freetype/freetype.cpp +++ b/config.tests/unix/freetype/freetype.cpp @@ -40,7 +40,7 @@ #include <ft2build.h> #include FT_FREETYPE_H -#if ((FREETYPE_MAJOR*10000 + FREETYPE_MINOR*100 + FREETYPE_PATCH) < 20110) +#if ((FREETYPE_MAJOR*10000 + FREETYPE_MINOR*100 + FREETYPE_PATCH) < 20200) # error "This version of freetype is too old." #endif |