diff options
Diffstat (limited to 'configure.json')
| -rw-r--r-- | configure.json | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/configure.json b/configure.json index b4a87f5505..50ac5986ab 100644 --- a/configure.json +++ b/configure.json @@ -94,6 +94,7 @@ "mips_dspr2": "boolean", "mp": { "type": "boolean", "name": "msvc_mp" }, "nomake": { "type": "addString", "values": [ "examples", "tests", "tools" ] }, + "thread": "boolean", "opensource": { "type": "void", "name": "commercial", "value": "no" }, "optimize-debug": { "type": "boolean", "name": "optimize_debug" }, "optimize-size": { "type": "boolean", "name": "optimize_size" }, @@ -159,7 +160,8 @@ }, "sources": [ { "libs": "-lzdll", "condition": "config.msvc" }, - { "libs": "-lz", "condition": "!config.msvc" } + { "libs": "-lz", "condition": "!config.msvc && !config.emscripten" }, + { "libs": "-s USE_ZLIB=1", "condition": "config.emscripten" } ] }, "dbus": { @@ -571,7 +573,7 @@ }, "use_gold_linker": { "label": "Using gold linker", - "condition": "!config.win32 && !config.integrity && tests.use_gold_linker", + "condition": "!config.msvc && !config.integrity && !config.emscripten && tests.use_gold_linker", "output": [ "privateConfig", "useGoldLinker" ] }, "optimize_debug": { @@ -612,6 +614,15 @@ { "type": "publicQtConfig", "name": "private_tests" } ] }, + "thread": { + "label": "Using threads", + "condition": "!config.emscripten", + "output": [ + { "type": "define", "name": "QT_NO_THREAD", "negative": true }, + { "type": "publicFeature", "name": "thread", "negative": true }, + { "type": "publicQtConfig", "name": "thread", "negative": true } + ] + }, "debug": { "label": "Build for debugging", "autoDetect": "features.developer-build || config.win32 || config.darwin" @@ -680,7 +691,7 @@ }, "headersclean": { "label": "Check for clean headers", - "autoDetect": "features.developer-build", + "autoDetect": "features.developer-build && !config.emscripten", "output": [ "privateConfig" ] }, "framework": { @@ -1049,7 +1060,7 @@ }, "system-zlib": { "label": "Using system zlib", - "condition": "libs.zlib", + "condition": "libs.zlib && config.emscripten", "output": [ "privateFeature" ] }, "future": { @@ -1062,12 +1073,12 @@ "label": "Qt Concurrent", "purpose": "Provides a high-level multi-threading API.", "section": "Kernel", - "condition": "features.future", + "condition": "features.future && features.thread", "output": [ "publicFeature", "feature" ] }, "dbus": { "label": "Qt D-Bus", - "autoDetect": "!config.uikit && !config.android && !config.winrt", + "autoDetect": "!config.uikit && !config.android && !config.winrt && !config.emscripten && config.thread", "output": [ "privateFeature", "feature" ] }, "dbus-linked": { @@ -1351,7 +1362,8 @@ Configure with '-qreal float' to create a build that is binary-compatible with 5 "entries": [ "pkg-config", "libudev", - "system-zlib" + "system-zlib", + "thread" ] } ] |