diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-14 11:27:58 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-02-14 12:51:24 +0100 |
| commit | 305dd1b61f657474d751cc3b24f58249ec21b61b (patch) | |
| tree | 5a90972ecf0f3e499625482d194903b474d9ece6 /src/gui/configure.json | |
| parent | 76010f4af8c9a59a20c489d70c7f99b802f9721f (diff) | |
| parent | dfffb5299bf83b87607f28f55afaf3c404910f9f (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.11
Conflicts:
.qmake.conf
src/corelib/animation/qvariantanimation.cpp
src/corelib/global/qglobal.cpp
src/corelib/global/qlogging.cpp
src/corelib/io/qprocess_win.cpp
src/corelib/json/qjsonarray.cpp
src/corelib/tools/qsimd_p.h
src/corelib/tools/qtimezoneprivate_p.h
src/corelib/xml/qxmlstream_p.h
src/gui/kernel/qsimpledrag.cpp
src/gui/kernel/qsimpledrag_p.h
src/plugins/generic/generic.pro
src/plugins/platforms/cocoa/qcocoamenu.mm
src/widgets/styles/qmacstyle_mac.mm
tests/auto/concurrent/qtconcurrentmap/BLACKLIST
tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp
tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
tests/auto/gui/kernel/qwindow/BLACKLIST
tests/auto/widgets/dialogs/qmessagebox/BLACKLIST
Change-Id: I508d686cf20f7f8cc6a7119b9bc7c3bbb505c58e
Diffstat (limited to 'src/gui/configure.json')
| -rw-r--r-- | src/gui/configure.json | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/gui/configure.json b/src/gui/configure.json index ccaf38e4b7..27e913877f 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -167,25 +167,20 @@ "label": "Fontconfig", "test": { "head": [ - "#include <ft2build.h>", - "#include FT_FREETYPE_H", "#include <fontconfig/fontconfig.h>", "#ifndef FC_RGBA_UNKNOWN", "# error This version of fontconfig is tool old, it is missing the FC_RGBA_UNKNOWN define", - "#endif", - "#if ((FREETYPE_MAJOR*10000 + FREETYPE_MINOR*100 + FREETYPE_PATCH) < 20110)", - "# error This version of freetype is too old.", "#endif" ], "main": [ - "FT_Face face = 0;", "FcPattern *pattern = 0;" ] }, "sources": [ - { "type": "pkgConfig", "args": "fontconfig freetype2" }, - { "type": "freetype", "libs": "-lfontconfig -lfreetype" } - ] + { "type": "pkgConfig", "args": "fontconfig" }, + { "type": "freetype", "libs": "-lfontconfig" } + ], + "use": "freetype" }, "gbm": { "label": "GBM", @@ -637,7 +632,13 @@ "angle_d3d11_qdtd": { "label": "D3D11_QUERY_DATA_TIMESTAMP_DISJOINT", "type": "compile", - "test": "win/angle_d3d11_qdtd" + "test": { + "include": "d3d11.h", + "main": [ + "D3D11_QUERY_DATA_TIMESTAMP_DISJOINT qdtd;", + "(void) qdtd;" + ] + } }, "directwrite2": { "label": "DirectWrite 2", |