diff options
| -rw-r--r-- | configure.pri | 5 | ||||
| -rw-r--r-- | src/core/configure.json | 6 |
2 files changed, 1 insertions, 10 deletions
diff --git a/configure.pri b/configure.pri index 23f72c5c6..1e7e35178 100644 --- a/configure.pri +++ b/configure.pri @@ -294,8 +294,3 @@ defineTest(qtConfTest_hasThumbFlag) { # no flag assume mthumb return(true) } - -defineTest(qtConfTest_hasGcc6OrNewer) { - greaterThan(QMAKE_GCC_MAJOR_VERSION, 5):return(true) - return(false) -} diff --git a/src/core/configure.json b/src/core/configure.json index be686850b..cd3c5c661 100644 --- a/src/core/configure.json +++ b/src/core/configure.json @@ -334,10 +334,6 @@ "label": "thumb instruction set", "type": "hasThumbFlag" }, - "webengine-extensions-gcc-version" : { - "label": "GCC 6 or newer", - "type": "hasGcc6OrNewer" - }, "webengine-noexecstack" : { "label": "linker supports -z noexecstack", "type": "linkerSupportsFlag", @@ -566,7 +562,7 @@ "label": "Extensions", "purpose": "Enables Chromium extensions within certain limits. Currently used for enabling the pdf viewer.", "section": "WebEngine", - "condition": "features.webengine-printing-and-pdf && (tests.webengine-extensions-gcc-version || config.clang || !config.gcc)", + "condition": "features.webengine-printing-and-pdf", "autoDetect": "features.webengine-printing-and-pdf", "output": [ "publicFeature" ] }, |