From 394a02624105082c9ac440711c8a98bf75b830f3 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Thu, 14 Apr 2016 22:52:03 -0700 Subject: compile.text: Split huge line into multiple Makes it easier to add stuff to it. Change-Id: Id75834dab9ed466e94c7ffff1445727a2ed975cc Reviewed-by: Oswald Buddenhagen --- config.tests/unix/compile.test | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'config.tests') diff --git a/config.tests/unix/compile.test b/config.tests/unix/compile.test index b94e3d7ab0..598e2a2d4d 100755 --- a/config.tests/unix/compile.test +++ b/config.tests/unix/compile.test @@ -72,7 +72,22 @@ 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 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" "$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_CFLAGS*=$CFLAGS" \ + "QMAKE_CFLAGS+=$MAC_ARCH_CFLAGS" \ + "QMAKE_CXXFLAGS*=$CXXFLAGS" \ + "QMAKE_CXXFLAGS+=$MAC_ARCH_CXXFLAGS" \ + "$SRCDIR/$TEST/$EXE.pro" \ + -o "$OUTDIR/$TEST/Makefile" if [ "$VERBOSE" = "yes" ]; then OUTDIR=$OUTDIR "$@" && $MAKE && SUCCESS=yes else -- cgit v1.2.3 From 172f7e618e9f67bbf178f1fa8b93402a615326f8 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 25 Apr 2016 12:11:35 +0200 Subject: Windows/Configure tests: Test for DirectWrite2 more extensively. Previously, the test succeeded for MinGW 64 5.3, which is still missing IDWriteFontFace2. Amends change 33044b83c261c485faa0a6f367773138f9892f76. Task-number: QTBUG-52952 Change-Id: I959f604d6bb9aa0efc765f2e26ec58d852ab92de Reviewed-by: Eskil Abrahamsen Blomfeldt --- config.tests/win/directwrite2/directwrite2.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'config.tests') diff --git a/config.tests/win/directwrite2/directwrite2.cpp b/config.tests/win/directwrite2/directwrite2.cpp index 06becaff70..65fa9d44cd 100644 --- a/config.tests/win/directwrite2/directwrite2.cpp +++ b/config.tests/win/directwrite2/directwrite2.cpp @@ -43,6 +43,7 @@ int main(int, char**) { IUnknown *factory = 0; + const size_t dummy = size_t(DWRITE_E_NOCOLOR) + sizeof(IDWriteFontFace2); DWriteCreateFactory(DWRITE_FACTORY_TYPE_SHARED, __uuidof(IDWriteFactory2), &factory); -- cgit v1.2.3 From 347832d7593e2369f8597bbd06213b80b3087433 Mon Sep 17 00:00:00 2001 From: Jian Liang Date: Fri, 1 Apr 2016 22:03:15 +0800 Subject: Support color font rendering for freetype engine This patch mainly do two things: 1) Support color bitmap font for freetype fontengine. This partially based on Corentin Jabot's patch 2) Support ARGB opengl glyph cache when workaround_brokenFBOReadBack is true (It is always true under Android). Some code refactor has been done in QOpenGLTextureGlyphCache. This patch also bump the minimal required freetype version to 2.2 [ChangeLog][General][Freetype] Support color font rendering Task-number: QTBUG-35156 Change-Id: I35aae5f98ba9a27b70a48db3f2647fc070c39c33 Reviewed-by: Eskil Abrahamsen Blomfeldt --- config.tests/unix/freetype/freetype.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config.tests') 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 #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 -- cgit v1.2.3