diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-01-04 07:31:22 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-01-04 07:33:14 +0100 |
| commit | 03039979b5a643f9def38a73e19835bb69384202 (patch) | |
| tree | e8a9184d5963128f013247ac64ec768d1cbf6911 /configure.json | |
| parent | 9682d217e21a2e88b6de799d79b843bbe0039df1 (diff) | |
| parent | 4dc2bc323c985bdceb27f096dd6c8e7af657bb6b (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Also blacklist tst_QRawFont::unsupportedWritingSystem() and
tst_QGlyphRun::mixedScripts() on windows for now.
Conflicts:
qmake/generators/makefile.cpp
src/corelib/itemmodels/qstringlistmodel.cpp
src/platformsupport/fontdatabases/windows/qwindowsfontengine_p.h
tests/auto/corelib/itemmodels/qstringlistmodel/tst_qstringlistmodel.cpp
tests/auto/gui/text/qglyphrun/BLACKLIST
tests/auto/gui/text/qrawfont/BLACKLIST
Task-number: QTBUG-72836
Change-Id: I10fea1493f0ae1a5708e1e48d0a4d7d6b76258b9
Diffstat (limited to 'configure.json')
| -rw-r--r-- | configure.json | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/configure.json b/configure.json index a2cc39d760..f1a414fbf9 100644 --- a/configure.json +++ b/configure.json @@ -154,13 +154,13 @@ "zlib": { "label": "zlib", "test": { - "include": "zlib.h", "main": [ "z_streamp stream = 0;", "(void) zlibVersion();", "(void) compress2(0, 0, 0, 0, 1); // compress2 was added in zlib version 1.0.8" ] }, + "headers": "zlib.h", "sources": [ { "libs": "-lzdll", "condition": "config.msvc" }, { "libs": "-lzlib", "condition": "config.msvc" }, @@ -186,9 +186,9 @@ "dbus": { "label": "D-Bus >= 1.2", "test": { - "include": "dbus/dbus.h", "main": "(void) dbus_bus_get_private(DBUS_BUS_SYSTEM, (DBusError *)NULL);" }, + "headers": "dbus/dbus.h", "sources": [ { "type": "pkgConfig", "args": "dbus-1 >= 1.2" }, { @@ -213,9 +213,9 @@ "libudev": { "label": "udev", "test": { - "include": "libudev.h", "main": "udev_unref(udev_new());" }, + "headers": "libudev.h", "sources": [ { "type": "pkgConfig", "args": "libudev" }, "-ludev" @@ -341,7 +341,21 @@ "precompile_header": { "label": "precompiled header support", "type": "compile", - "test": "common/pch" + "test": { + "files": { + "header.h": "#define HEADER_H" + }, + "tail": [ + "#ifndef HEADER_H", + "#error no go", + "#endif" + ], + "qmake": [ + "CONFIG += precompile_header", + "PRECOMPILED_DIR = .pch", + "PRECOMPILED_HEADER = header.h" + ] + } }, "use_gold_linker": { "label": "gold linker", |