diff options
Diffstat (limited to 'configure.json')
| -rw-r--r-- | configure.json | 92 |
1 files changed, 81 insertions, 11 deletions
diff --git a/configure.json b/configure.json index 2dc79137e8..3d78039a9f 100644 --- a/configure.json +++ b/configure.json @@ -11,6 +11,7 @@ "src/corelib", "src/network", "src/gui", + "src/sql", "src/xml", "src/widgets", "src/printsupport", @@ -79,6 +80,7 @@ "force-debug-info": { "type": "boolean", "name": "force_debug_info" }, "force-pkg-config": { "type": "void", "name": "pkg-config" }, "framework": "boolean", + "gc-binaries": { "type": "boolean", "name": "gc_binaries" }, "gdb-index": { "type": "boolean", "name": "gdb_index" }, "gcc-sysroot": "boolean", "gcov": "boolean", @@ -159,21 +161,16 @@ }, "sources": [ { "libs": "-lzdll", "condition": "config.msvc" }, - { "libs": "-lz", "condition": "!config.msvc" } + { "libs": "-lzlib", "condition": "config.msvc" }, + { "libs": "-lz", "condition": "!config.msvc" }, + { "libs": "-s USE_ZLIB=1", "condition": "config.wasm" } ] }, "dbus": { "label": "D-Bus >= 1.2", "test": { "include": "dbus/dbus.h", - "main": "(void) dbus_bus_get_private(DBUS_BUS_SYSTEM, (DBusError *)NULL);", - "qmake": [ - "CONFIG += build_all", - "CONFIG(debug, debug|release): \\", - " LIBS += $$LIBS_DEBUG", - "else: \\", - " LIBS += $$LIBS_RELEASE" - ] + "main": "(void) dbus_bus_get_private(DBUS_BUS_SYSTEM, (DBusError *)NULL);" }, "sources": [ { "type": "pkgConfig", "args": "dbus-1 >= 1.2" }, @@ -259,6 +256,36 @@ "type": "compile", "test": "stl" }, + "c99": { + "label": "C99 support", + "type": "compile", + "test": { + "head": [ + "#if __STDC_VERSION__ >= 199901L", + "// Compiler claims to support C99, trust it", + "#else", + "# error __STDC_VERSION__ must be >= 199901L", + "#endif" + ], + "lang": "c", + "qmake": "CONFIG += c99" + } + }, + "c11": { + "label": "C11 support", + "type": "compile", + "test": { + "head": [ + "#if __STDC_VERSION__ >= 201112L", + "// Compiler claims to support C11, trust it", + "#else", + "# error __STDC_VERSION__ must be >= 201112L", + "#endif" + ], + "lang": "c", + "qmake": "CONFIG += c11" + } + }, "c++14": { "label": "C++14 support", "type": "compile", @@ -372,6 +399,17 @@ ] } }, + "gc_binaries": { + "label": "support for split sections and linker garbage collection", + "type": "compile", + "test": { + "qmake": [ + "isEmpty(QMAKE_CFLAGS_SPLIT_SECTIONS): error(\"Nope\")", + "isEmpty(QMAKE_CXXFLAGS_SPLIT_SECTIONS): error(\"Nope\")", + "isEmpty(QMAKE_LFLAGS_GCSECTIONS): error(\"Nope\")" + ] + } + }, "sse2": { "label": "SSE2 instructions", "type": "x86Simd" @@ -568,6 +606,10 @@ "compiler-flags": { "output": [ "compilerFlags" ] }, + "gc_binaries": { + "condition": "!features.shared && tests.gc_binaries", + "output": [ "privateFeature" ] + }, "gcc-sysroot": { "output": [ "gccSysroot" ], "condition": "input.sysroot != ''" @@ -578,7 +620,7 @@ }, "use_gold_linker": { "label": "Using gold linker", - "condition": "!config.win32 && !config.integrity && tests.use_gold_linker", + "condition": "!config.win32 && !config.integrity && !config.wasm && tests.use_gold_linker", "output": [ "privateConfig", "useGoldLinker" ] }, "optimize_debug": { @@ -793,9 +835,22 @@ "condition": "features.c++14 && tests.c++1z", "output": [ "publicFeature", "publicQtConfig" ] }, + "c89": { + "label": "C89" + }, + "c99": { + "label": "C99", + "condition": "tests.c99", + "output": [ "publicFeature" ] + }, + "c11": { + "label": "C11", + "condition": "features.c99 && tests.c11", + "output": [ "publicFeature" ] + }, "precompile_header": { "label": "Using precompiled headers", - "condition": "config.msvc || tests.precompile_header", + "condition": "tests.precompile_header", "output": [ "privateConfig", { "type": "varRemove", "negative": true, "name": "CONFIG", "value": "'precompile_header'" } @@ -1059,10 +1114,17 @@ "condition": "libs.zlib", "output": [ "privateFeature" ] }, + "thread": { + "label": "Thread support", + "purpose": "Provides QThread and related classes.", + "section": "Kernel", + "output": [ "publicFeature" ] + }, "future": { "label": "QFuture", "purpose": "Provides QFuture and related classes.", "section": "Kernel", + "condition": "features.thread", "output": [ "publicFeature" ] }, "concurrent": { @@ -1075,6 +1137,7 @@ "dbus": { "label": "Qt D-Bus", "autoDetect": "!config.uikit && !config.android && !config.winrt", + "condition": "features.thread", "output": [ "privateFeature", "feature" ] }, "dbus-linked": { @@ -1106,10 +1169,12 @@ }, "network": { "label": "Qt Network", + "condition": "features.thread", "output": [ "privateFeature" ] }, "sql": { "label": "Qt Sql", + "condition": "features.thread", "output": [ "privateFeature" ] }, "testlib": { @@ -1254,6 +1319,11 @@ Configure with '-qreal float' to create a build that is binary-compatible with 5 }, "shared", { + "message": "Using C standard", + "type": "firstAvailableFeature", + "args": "c11 c99 c89" + }, + { "message": "Using C++ standard", "type": "firstAvailableFeature", "args": "c++1z c++14 c++11" |