diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-10-30 15:45:50 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-10-30 16:17:37 +0100 |
| commit | 4cf520d67f0619330bbf53a743818924d476d95f (patch) | |
| tree | 58e13e6747affa06bf495c25c8dc7e272a428ba3 /src/core/configure.json | |
| parent | 21f10e777ee2faf41196d0263d4e5134d0ec216a (diff) | |
| parent | 91fc86bef3b9eb9467f6ac251d1953483da93185 (diff) | |
Merge branch '5.13' into 5.14
Change-Id: I6ab2e949cb2fa3b2db55a1654d42667db6257eab
Diffstat (limited to 'src/core/configure.json')
| -rw-r--r-- | src/core/configure.json | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/core/configure.json b/src/core/configure.json index 9ee66bf61..d7f5a92f1 100644 --- a/src/core/configure.json +++ b/src/core/configure.json @@ -94,10 +94,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", @@ -194,7 +190,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" ] }, |