diff options
author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-11-20 13:49:26 +0100 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-11-20 13:49:26 +0100 |
commit | 0bcff4da6a22acdc522e7c27607ad4d2a2ffe843 (patch) | |
tree | bb66a5ccc65c3094235230b301cc5bfb7e47af8d /configure.json | |
parent | f841341a22d5b460c81f8e7ee7fa9434500404c8 (diff) | |
parent | f1003c50652c1f5ef9ae0e16036b175fe3e8f215 (diff) |
Merge 5.10 into 5.10.0
Change-Id: I05f7952ea887536674045ed0779967e23388c5d1
Diffstat (limited to 'configure.json')
-rw-r--r-- | configure.json | 387 |
1 files changed, 203 insertions, 184 deletions
diff --git a/configure.json b/configure.json index ecf6e1132..d0d172835 100644 --- a/configure.json +++ b/configure.json @@ -8,115 +8,126 @@ "commandline": { "options": { - "alsa": "boolean", - "embedded": "boolean", - "webengine-icu": { "type": "enum", "name": "system-icu", "values": { "system": "yes", "qt": "no" } }, - "ffmpeg": { "type": "enum", "name": "system-ffmpeg", "values": { "system": "yes", "qt": "no" } }, - "opus": { "type": "enum", "name": "system-opus", "values": { "system": "yes", "qt": "no" } }, - "webp": { "type": "enum", "name": "system-libwebp", "values": { "system": "yes", "qt": "no" } }, - "pepper-plugins": "boolean", - "printing-and-pdf": "boolean", - "proprietary-codecs": "boolean", - "pulseaudio": "boolean", - "spellchecker": "boolean", - "native-spellchecker": "boolean", - "webrtc": "boolean", - "geolocation" : "boolean" + "webengine-alsa": "boolean", + "webengine-embedded-build": "boolean", + "webengine-icu": { "type": "enum", "name": "webengine-system-icu", "values": { "system": "yes", "qt": "no" } }, + "webengine-ffmpeg": { "type": "enum", "name": "webengine-system-ffmpeg", "values": { "system": "yes", "qt": "no" } }, + "webengine-opus": { "type": "enum", "name": "webengine-system-opus", "values": { "system": "yes", "qt": "no" } }, + "webengine-webp": { "type": "enum", "name": "webengine-system-libwebp", "values": { "system": "yes", "qt": "no" } }, + "webengine-pepper-plugins": "boolean", + "webengine-printing-and-pdf": "boolean", + "webengine-proprietary-codecs": "boolean", + "webengine-pulseaudio": "boolean", + "webengine-spellchecker": "boolean", + "webengine-native-spellchecker": "boolean", + "webengine-webrtc": "boolean", + "webengine-geolocation" : "boolean", + + "alsa": { "type": "boolean", "name": "webengine-alsa" }, + "pulseaudio": { "type": "boolean", "name": "webengine-pulseaudio" }, + "ffmpeg": { "type": "enum", "name": "webengine-system-ffmpeg", "values": { "system": "yes", "qt": "no" } }, + "opus": { "type": "enum", "name": "webengine-system-opus", "values": { "system": "yes", "qt": "no" } }, + "webp": { "type": "enum", "name": "webengine-system-libwebp", "values": { "system": "yes", "qt": "no" } }, + "pepper-plugins": { "type": "boolean", "name": "webengine-pepper-plugins" }, + "printing-and-pdf": { "type": "boolean", "name": "webengine-printing-and-pdf" }, + "proprietary-codecs": { "type": "boolean", "name": "webengine-proprietary-codecs" }, + "spellchecker": { "type": "boolean", "name": "webengine-spellchecker" }, + "webrtc": { "type": "boolean", "name": "webengine-webrtc" } } }, "libraries": { - "dbus": { + "webengine-dbus": { "label": "d-bus", "sources": [ { "type": "pkgConfig", "args": "dbus-1" } ] }, - "fontconfig": { + "webengine-fontconfig": { "label": "fontconfig", "sources": [ { "type": "pkgConfig", "args": "fontconfig" } ] }, - "libdrm": { + "webengine-libdrm": { "label": "libdrm", "sources": [ { "type": "pkgConfig", "args": "libdrm" } ] }, - "xcomposite": { + "webengine-xcomposite": { "label": "xcomposite", "sources": [ { "type": "pkgConfig", "args": "xcomposite" } ] }, - "xcursor": { + "webengine-xcursor": { "label": "xcursor", "sources": [ { "type": "pkgConfig", "args": "xcursor" } ] }, - "xi": { + "webengine-xi": { "label": "xi", "sources": [ { "type": "pkgConfig", "args": "xi" } ] }, - "xrandr": { + "webengine-xrandr": { "label": "xrandr", "sources": [ { "type": "pkgConfig", "args": "xrandr" } ] }, - "xtst": { + "webengine-xtst": { "label": "xtst", "sources": [ { "type": "pkgConfig", "args": "xtst" } ] }, - "harfbuzz": { + "webengine-harfbuzz": { "label": "harfbuzz >= 1.4.2", "sources": [ { "type": "pkgConfig", "args": "harfbuzz >= 1.4.2" } ] }, - "glib": { + "webengine-glib": { "label": "glib-2.0 >= 2.32.0", "sources": [ { "type": "pkgConfig", "args": "glib-2.0 >= 2.32.0" } ] }, - "zlib": { + "webengine-zlib": { "label": "zlib", "sources": [ { "type": "pkgConfig", "args": "zlib" } ] }, - "minizip": { + "webengine-minizip": { "label": "minizip", "sources": [ { "type": "pkgConfig", "args": "minizip" } ] }, - "libevent": { + "webengine-libevent": { "label": "libevent", "sources": [ { "type": "pkgConfig", "args": "libevent" } ] }, - "libxml2": { + "webengine-libxml2": { "label": "libxml2 and libxslt", "sources": [ { "type": "pkgConfig", "args": "libxml-2.0 libxslt" } ] }, - "jsoncpp": { + "webengine-jsoncpp": { "label": "jsoncpp", "sources": [ { "type": "pkgConfig", "args": "jsoncpp" } ] }, - "protobuf": { + "webengine-protobuf": { "label": "protobuf", "sources": [ { "type": "pkgConfig", "args": "protobuf" } @@ -128,41 +139,47 @@ { "type": "pkgConfig", "args": "libpulse >= 0.9.10 libpulse-mainloop-glib" } ] }, - "icu": { + "webengine-icu": { "label": "icu >= 53", "sources": [ { "type": "pkgConfig", "args": "icu-uc >= 53 icu-i18n >= 53" } ] }, - "ffmpeg": { + "webengine-ffmpeg": { "label": "libavcodec libavformat libavutil", "sources": [ { "type": "pkgConfig", "args": "libavcodec libavformat libavutil" } ] }, - "opus": { + "webengine-opus": { "label": "opus", "sources": [ { "type": "pkgConfig", "args": "opus" } ] }, - "webp": { + "webengine-webp": { "label": "libwebp, libwebpmux and libwebpdemux", "sources": [ { "type": "pkgConfig", "args": "libwebp libwebpmux libwebpdemux" } ] }, - "nss": { + "webengine-nss": { "label": "nss", "sources": [ { "type": "pkgConfig", "args": "nss" } ] }, - "png": { + "webengine-png": { "label": "libpng >= 1.6.0", "sources": [ { "type": "pkgConfig", "args": "libpng >= 1.6.0" } ] + }, + "webengine-lcms2": { + "label": "lcms2", + "sources": [ + { "type": "pkgConfig", "args": "lcms2" } + ] } }, @@ -172,352 +189,353 @@ "test": "alsa", "type": "compile" }, - "khr": { + "webengine-khr": { "label": "khr", "test": "khr", "type": "compile" }, - "libvpx": { + "webengine-libvpx": { "label": "libvpx", "test": "libvpx", "type": "compile" }, - "snappy": { + "webengine-snappy": { "label": "snappy", "test": "snappy", "type": "compile" }, - "srtp": { + "webengine-srtp": { "label": "srtp", "test": "srtp", "type": "compile" }, - "winversion": { + "webengine-winversion": { "label": "winversion", "test": "winversion", "type": "compile" }, - "protoc": { + "webengine-protoc": { "label": "protoc", "type": "detectProtoc" }, - "python2": { + "webengine-python2": { "label": "python2", "type": "detectPython2", "log": "location" }, - "gperf": { + "webengine-gperf": { "label": "gperf", "type": "detectGperf" }, - "bison": { + "webengine-bison": { "label": "bison", "type": "detectBison" }, - "flex": { + "webengine-flex": { "label": "flex", "type": "detectFlex" }, - "ninja": { + "webengine-ninja": { "label": "system ninja", "type": "detectNinja" }, - "gn": { + "webengine-gn": { "label": "system gn", "type": "detectGn" }, - "embedded": { + "webengine-embedded-build": { "label": "embedded", "type": "embedded" }, - "re2": { + "webengine-re2": { "label": "re2", "test": "re2", "type": "compile" }, - "glibc": { + "webengine-glibc": { "label": "glibc > 2.16", "type": "detectGlibc" }, - "icuuc": { + "webengine-icuuc": { "label" : "libxml2 configured with icuuc", "type": "detectIcuuc" }, - "sanitizer": { + "webengine-sanitizer": { "label" : "sanitizer support", "type": "isSanitizerSupported" } }, "features": { - "system-fontconfig": { + "webengine-system-fontconfig": { "label": "fontconfig", - "condition": "libs.fontconfig", + "condition": "libs.webengine-fontconfig", "output": [ "privateFeature" ] }, - "system-dbus": { + "webengine-system-dbus": { "label": "dbus", - "condition": "libs.dbus", + "condition": "libs.webengine-dbus", "output": [ "privateFeature" ] }, - "system-libdrm": { + "webengine-system-libdrm": { "label": "libdrm", - "condition": "libs.libdrm", + "condition": "libs.webengine-libdrm", "output": [ "privateFeature" ] }, - "system-xcomposite": { + "webengine-system-xcomposite": { "label": "xcomposite", - "condition": "libs.xcomposite", + "condition": "libs.webengine-xcomposite", "output": [ "privateFeature" ] }, - "system-xcursor": { + "webengine-system-xcursor": { "label": "xcursor", - "condition": "libs.xcursor", + "condition": "libs.webengine-xcursor", "output": [ "privateFeature" ] }, - "system-xi": { + "webengine-system-xi": { "label": "xi", - "condition": "libs.xi", + "condition": "libs.webengine-xi", "output": [ "privateFeature" ] }, - "system-xrandr": { + "webengine-system-xrandr": { "label": "xrandr", - "condition": "libs.xrandr", + "condition": "libs.webengine-xrandr", "output": [ "privateFeature" ] }, - "system-xtst": { + "webengine-system-xtst": { "label": "xtst", - "condition": "libs.xtst", + "condition": "libs.webengine-xtst", "output": [ "privateFeature" ] }, "webengine-system-harfbuzz": { "label": "harfbuzz", - "condition": "config.unix && features.system-harfbuzz && libs.harfbuzz", + "condition": "config.unix && features.system-harfbuzz && libs.webengine-harfbuzz", "output": [ "privateFeature" ] }, - "system-glib" : { + "webengine-system-glib" : { "label": "glib", - "condition": "config.unix && libs.glib", + "condition": "config.unix && libs.webengine-glib", "output": [ "privateFeature" ] }, - "system-minizip" : { + "webengine-system-minizip" : { "label": "minizip", - "condition": "config.unix && libs.minizip", + "condition": "config.unix && libs.webengine-minizip", "output": [ "privateFeature" ] }, "webengine-system-zlib" : { "label": "zlib", - "condition": "config.unix && features.system-zlib && libs.zlib", + "condition": "config.unix && features.system-zlib && libs.webengine-zlib", "output": [ "privateFeature" ] }, - "system-libevent" : { + "webengine-system-libevent" : { "label": "libevent", - "condition": "config.unix && libs.libevent", + "condition": "config.unix && libs.webengine-libevent", "output": [ "privateFeature" ] }, - "system-jsoncpp" : { + "webengine-system-jsoncpp" : { "label": "jsoncpp", - "condition": "config.unix && libs.jsoncpp", + "condition": "config.unix && libs.webengine-jsoncpp", "output": [ "privateFeature" ] }, - "system-protobuf" : { + "webengine-system-protobuf" : { "label": "protobuf", - "condition": "config.unix && libs.protobuf && tests.protoc", + "condition": "config.unix && libs.webengine-protobuf && tests.webengine-protoc", "output": [ "privateFeature" ] }, "webengine-system-png" : { "label": "png", - "condition": "config.unix && features.system-png && libs.png", + "condition": "config.unix && features.system-png && libs.webengine-png", "output": [ "privateFeature" ] }, - "python2": { + "webengine-python2": { "label": "python2", - "condition": "tests.python2", + "condition": "tests.webengine-python2", "output": [ "privateFeature", - { "type": "varAssign", "name": "QMAKE_PYTHON2", "value": "tests.python2.location" } + { "type": "varAssign", "name": "QMAKE_PYTHON2", "value": "tests.webengine-python2.location" } ] }, - "gperf": { + "webengine-gperf": { "label": "gperf", - "condition": "tests.gperf", + "condition": "tests.webengine-gperf", "output": [ "privateFeature" ] }, - "bison": { + "webengine-bison": { "label": "bison", - "condition": "tests.bison", + "condition": "tests.webengine-bison", "output": [ "privateFeature" ] }, - "flex": { + "webengine-flex": { "label": "flex", - "condition": "tests.flex", + "condition": "tests.webengine-flex", "output": [ "privateFeature" ] }, - "embedded": { + "webengine-embedded-build": { "label": "Embedded build", "purpose": "Enables the embedded build configuration.", "section": "WebEngine", "condition": "config.unix", - "autoDetect": "tests.embedded", + "autoDetect": "tests.webengine-embedded-build", "output": [ "privateFeature" ] }, - "alsa": { + "webengine-alsa": { "label": "Use ALSA", "condition": "config.unix && tests.alsa", "output": [ "privateFeature" ] }, - "system-khr" : { + "webengine-system-khr" : { "label": "khr", - "condition": "config.unix && tests.khr", + "condition": "config.unix && tests.webengine-khr", "output": [ "privateFeature" ] }, - "system-libvpx" : { + "webengine-system-libvpx" : { "label": "libvpx", - "condition": "config.unix && tests.libvpx", + "condition": "config.unix && tests.webengine-libvpx", "output": [ "privateFeature" ] }, - "system-snappy" : { + "webengine-system-snappy" : { "label": "snappy", - "condition": "config.unix && tests.snappy", + "condition": "config.unix && tests.webengine-snappy", "output": [ "privateFeature" ] }, - "system-libsrtp" : { + "webengine-system-libsrtp" : { "label": "libsrtp", - "condition": "config.unix && tests.srtp", + "condition": "config.unix && tests.webengine-srtp", "output": [ "privateFeature" ] }, - "system-libxml2" : { - "label": "libxml2", - "condition": "config.unix && tests.libxml2", - "output": [ "privateFeature" ] - }, - "winversion" : { + "webengine-winversion" : { "label": "winversion", - "condition": "config.win32 && tests.winversion", + "condition": "config.win32 && tests.webengine-winversion", "output": [ "privateFeature" ] }, - "geolocation": { + "webengine-geolocation": { "label": "Geolocation", "condition": "module.positioning", "output": [ "privateFeature" ] }, - "pulseaudio": { + "webengine-pulseaudio": { "label": "Use PulseAudio", "autoDetect": "config.unix", "condition": "libs.pulseaudio", "output": [ "privateFeature" ] }, - "pepper-plugins": { + "webengine-pepper-plugins": { "label": "Pepper Plugins", "purpose": "Enables use of Pepper Flash and Widevine plugins.", "section": "WebEngine", - "autoDetect": "!features.embedded", + "autoDetect": "!features.webengine-embedded-build", "output": [ "privateFeature" ] }, - "printing-and-pdf": { + "webengine-printing-and-pdf": { "label": "Printing and PDF", "purpose": "Provides printing and output to PDF.", "section": "WebEngine", "condition": "module.printsupport && features.printer", - "autoDetect": "!features.embedded", + "autoDetect": "!features.webengine-embedded-build", "output": [ "privateFeature" ] }, - "proprietary-codecs": { + "webengine-proprietary-codecs": { "label": "Proprietary Codecs", "purpose": "Enables the use of proprietary codecs such as h.264/h.265 and MP3.", "section": "WebEngine", "autoDetect": false, "output": [ "privateFeature" ] }, - "spellchecker": { + "webengine-spellchecker": { "label": "Spellchecker", "purpose": "Provides a spellchecker.", "section": "WebEngine", "output": [ "publicFeature" ] }, - "native-spellchecker": { + "webengine-native-spellchecker": { "label": "Native Spellchecker", "purpose": "Use the system's native spellchecking engine.", "section": "WebEngine", "autoDetect": false, - "condition": "config.macos && features.spellchecker", + "condition": "config.macos && features.webengine-spellchecker", "output": [ "publicFeature" ] }, - "ui-delegates": { + "webengine-ui-delegates": { "label": "UI Delegates", "output": [ "privateFeature" ] }, - "testsupport": { + "webengine-testsupport": { "label": "Test Support", "autoDetect": "features.private_tests || call.isTestsInBuildParts", "output": [ "privateFeature" ] }, - "webrtc": { + "webengine-webrtc": { "label": "WebRTC", "purpose": "Provides WebRTC support.", "section": "WebEngine", - "autoDetect": "!features.embedded", + "autoDetect": "!features.webengine-embedded-build", "output": [ "privateFeature" ] }, - "system-nss": { + "webengine-system-nss": { "label": "nss", - "condition": "config.unix && !config.darwin && libs.nss", + "condition": "config.unix && !config.darwin && libs.webengine-nss", "output": [ "privateFeature" ] }, - "system-libwebp": { + "webengine-system-libwebp": { "label": "libwebp, libwebpmux and libwebpdemux", "autoDetect": "config.unix", - "condition": "libs.webp", + "condition": "libs.webengine-webp", "output": [ "privateFeature" ] }, - "system-opus": { + "webengine-system-opus": { "label": "opus", "autoDetect": "config.unix", - "condition": "libs.opus", + "condition": "libs.webengine-opus", "output": [ "privateFeature" ] }, - "system-ffmpeg": { + "webengine-system-ffmpeg": { "label": "ffmpeg", "autoDetect": false, - "condition": "libs.ffmpeg && features.system-opus && features.system-libwebp", + "condition": "libs.webengine-ffmpeg && features.webengine-system-opus && features.webengine-system-libwebp", "output": [ "privateFeature" ] }, - "system-icu": { + "webengine-system-icu": { "label": "icu", "autoDetect": false, - "condition": "libs.icu", + "condition": "libs.webengine-icu", "output": [ "privateFeature" ] }, - "system-re2": { + "webengine-system-re2": { "label": "re2", "autoDetect": "config.unix", - "condition": "tests.re2", + "condition": "tests.webengine-re2", "output": [ "privateFeature" ] }, - "system-ninja": { + "webengine-system-ninja": { "label": "Use System Ninja", - "condition": "tests.ninja", + "condition": "tests.webengine-ninja", "output": [ "privateFeature" ] }, - "system-gn": { + "webengine-system-gn": { "label": "Use System Gn", "autoDetect": false, - "condition": "tests.gn", + "condition": "tests.webengine-gn", "output": [ "privateFeature" ] }, - "system-glibc": { + "webengine-system-glibc": { "label": "glibc", - "condition": "config.linux && tests.glibc", + "condition": "config.linux && tests.webengine-glibc", "output": [ "privateFeature" ] }, - "system-libxml2": { + "webengine-system-libxml2": { "label": "libxml2 and libxslt", - "condition": "config.unix && libs.libxml2 && tests.icuuc", + "condition": "config.unix && libs.webengine-libxml2 && tests.webengine-icuuc", + "output": [ "privateFeature" ] + }, + "webengine-system-lcms2" : { + "label": "lcms2", + "autoDetect": "libs.webengine-lcms2", + "condition": "config.unix && features.printing-and-pdf", "output": [ "privateFeature" ] }, "webengine-sanitizer" : { "label": "Sanitizer ", - "autoDetect": "config.sanitizer && tests.sanitizer", + "autoDetect": "config.sanitizer && tests.webengine-sanitizer", "condition": "config.sanitizer", "output": [ "privateFeature" ] } @@ -526,22 +544,22 @@ "report": [ { "type": "warning", - "condition": "!features.python2", + "condition": "!features.webengine-python2", "message": "Python version 2 (2.7.5 or later) is required to build QtWebEngine." }, { "type": "warning", - "condition": "!features.gperf", + "condition": "!features.webengine-gperf", "message": "gperf is required to build QtWebEngine." }, { "type": "warning", - "condition": "!features.bison", + "condition": "!features.webengine-bison", "message": "bison is required to build QtWebEngine." }, { "type": "warning", - "condition": "!features.flex", + "condition": "!features.webengine-flex", "message": "flex is required to build QtWebEngine." } ], @@ -550,44 +568,45 @@ { "section": "Qt WebEngine", "entries": [ - "embedded", - "pepper-plugins", - "printing-and-pdf", - "proprietary-codecs", - "spellchecker", - "native-spellchecker", - "webrtc", - "system-ninja", - "geolocation", + "webengine-embedded-build", + "webengine-pepper-plugins", + "webengine-printing-and-pdf", + "webengine-proprietary-codecs", + "webengine-spellchecker", + "webengine-native-spellchecker", + "webengine-webrtc", + "webengine-system-ninja", + "webengine-geolocation", { "type": "feature", - "args": "alsa", + "args": "webengine-alsa", "condition": "config.unix" }, { "type": "feature", - "args": "pulseaudio", + "args": "webengine-pulseaudio", "condition": "config.unix" }, { "section": "Optional system libraries used", "condition": "config.unix", "entries": [ - "system-re2", - "system-icu", - "system-libwebp", - "system-opus", - "system-ffmpeg", - "system-libvpx", - "system-snappy", - "system-libsrtp", - "system-glib", + "webengine-system-re2", + "webengine-system-icu", + "webengine-system-libwebp", + "webengine-system-opus", + "webengine-system-ffmpeg", + "webengine-system-libvpx", + "webengine-system-snappy", + "webengine-system-libsrtp", + "webengine-system-glib", "webengine-system-zlib", - "system-minizip", - "system-libevent", - "system-jsoncpp", - "system-protobuf", - "system-libxml2", + "webengine-system-minizip", + "webengine-system-libevent", + "webengine-system-jsoncpp", + "webengine-system-protobuf", + "webengine-system-libxml2", + "webengine-system-lcms2", "webengine-system-png", "webengine-system-harfbuzz" ] @@ -596,23 +615,23 @@ "section": "Required system libraries", "condition": "config.unix && !config.macos", "entries": [ - "system-fontconfig", - "system-dbus", - "system-nss", - "system-khr", - "system-glibc" + "webengine-system-fontconfig", + "webengine-system-dbus", + "webengine-system-nss", + "webengine-system-khr", + "webengine-system-glibc" ] }, { "section": "Required system libraries for qpa-xcb", "condition": "config.unix && !config.macos", "entries": [ - "system-libdrm", - "system-xcomposite", - "system-xcursor", - "system-xi", - "system-xrandr", - "system-xtst" + "webengine-system-libdrm", + "webengine-system-xcomposite", + "webengine-system-xcursor", + "webengine-system-xi", + "webengine-system-xrandr", + "webengine-system-xtst" ] } ] |