diff options
| -rw-r--r-- | configure.pri | 10 | ||||
| -rw-r--r-- | src/buildtools/configure.json | 29 | ||||
| -rw-r--r-- | src/core/config/linux.pri | 5 |
3 files changed, 0 insertions, 44 deletions
diff --git a/configure.pri b/configure.pri index 519b1aa65..6c80a8cd6 100644 --- a/configure.pri +++ b/configure.pri @@ -169,16 +169,6 @@ defineTest(qtConfTest_detectNinja) { return(false) } -defineTest(qtConfTest_detectProtoc) { - protoc = $$qtConfFindInPath("protoc") - isEmpty(protoc) { - qtLog("Optional protoc could not be found.") - return(false) - } - qtLog("Found protoc from path: $$protoc") - return(true) -} - defineTest(qtConfTest_detectGn) { gn = $$qtConfFindInPath("gn$$EXE_SUFFIX") !isEmpty(gn) { diff --git a/src/buildtools/configure.json b/src/buildtools/configure.json index 58f3abb4d..812a91f9c 100644 --- a/src/buildtools/configure.json +++ b/src/buildtools/configure.json @@ -108,12 +108,6 @@ "-ljpeg" ] }, - "webengine-jsoncpp": { - "label": "jsoncpp", - "sources": [ - { "type": "pkgConfig", "args": "jsoncpp" } - ] - }, "webengine-libevent": { "label": "libevent", "sources": [ @@ -132,12 +126,6 @@ { "type": "pkgConfig", "args": "libpng >= 1.6.0" } ] }, - "webengine-protobuf": { - "label": "protobuf", - "sources": [ - { "type": "pkgConfig", "args": "protobuf" } - ] - }, "webengine-zlib": { "label": "zlib", "sources": [ @@ -327,10 +315,6 @@ "type": "detectJumboBuild", "log": "merge_limit" }, - "webengine-protoc": { - "label": "protoc", - "type": "detectProtoc" - }, "webengine-win-compiler64": { "label": "64bit compiler", "type": "isWindowsHostCompiler64" @@ -600,16 +584,6 @@ "condition": "config.unix && libs.webengine-libevent", "output": [ "privateFeature" ] }, - "webengine-system-jsoncpp" : { - "label": "jsoncpp", - "condition": "config.unix && libs.webengine-jsoncpp", - "output": [ "privateFeature" ] - }, - "webengine-system-protobuf" : { - "label": "protobuf", - "condition": "config.unix && libs.webengine-protobuf && tests.webengine-protoc", - "output": [ "privateFeature" ] - }, "webengine-system-png" : { "label": "png", "condition": "config.unix && features.system-png && libs.webengine-png", @@ -779,7 +753,6 @@ "section": "Qt WebEngine Build Tools", "entries": [ "webengine-system-ninja", - "webengine-system-gn", { "message": "Jumbo Build Merge Limit", "type": "jumboBuild" @@ -829,8 +802,6 @@ "webengine-system-zlib", "webengine-system-minizip", "webengine-system-libevent", - "webengine-system-jsoncpp", - "webengine-system-protobuf", "webengine-system-libxml2", "webengine-system-lcms2", "webengine-system-png", diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri index 26d0dcf7d..3e490a0d5 100644 --- a/src/core/config/linux.pri +++ b/src/core/config/linux.pri @@ -41,9 +41,4 @@ qtConfig(webengine-embedded-build) { qtConfig(webengine-system-ffmpeg): gn_args += use_system_ffmpeg=true qtConfig(webengine-system-re2): gn_args += use_system_re2=true qtConfig(webengine-system-lcms2): gn_args += use_system_lcms2=true - - # FIXME: - #qtConfig(webengine-system-protobuf): gn_args += use_system_protobuf=true - #qtConfig(webengine-system-jsoncpp): gn_args += use_system_jsoncpp=true - #qtConfig(webengine-system-libsrtp: gn_args += use_system_libsrtp=true } |