summaryrefslogtreecommitdiffstats
path: root/configure.json
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2020-07-07 09:41:28 +0200
committerJoerg Bornemann <joerg.bornemann@qt.io>2020-07-13 20:30:18 +0200
commit79fda7a549724dfa517797aea9e2f0d3527e531d (patch)
treebba2205e840ba621a780b8a38bc69c68658e0186 /configure.json
parentb91a5d053d48b90a2cf56429d432cdfcb1098efd (diff)
Make -qtlibinfix affect the names of plugins by default
In Qt5, the -qtlibinfix option did not affect the naming of plugins, unless -qtlibinfix-plugins was set. This option was added in 56416509930 to offer a way to have -qtlibinfix affect the plugin names without changing the default behavior. We now remove the -qtlibinfix-plugins option, as the old behavior is not desirable. [ChangeLog][configure] The -qtlibinfix option now affects the names of plugins. The -qtlibinfix-plugins configure option was removed. Task-number: QTBUG-15192 Fixes: QTBUG-85439 Change-Id: I96f5c2577b76274929c431621967df0e9b4631b7 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'configure.json')
-rw-r--r--configure.json7
1 files changed, 0 insertions, 7 deletions
diff --git a/configure.json b/configure.json
index fee86ede81..21b9b29fdf 100644
--- a/configure.json
+++ b/configure.json
@@ -109,7 +109,6 @@
"profile": "boolean",
"qreal": "string",
"qtlibinfix": { "type": "string", "name": "qt_libinfix" },
- "qtlibinfix-plugins": { "type": "boolean", "name": "qt_libinfix_plugins" },
"qtnamespace": { "type": "string", "name": "qt_namespace" },
"reduce-exports": { "type": "boolean", "name": "reduce_exports" },
"reduce-relocations": { "type": "boolean", "name": "reduce_relocations" },
@@ -1365,12 +1364,6 @@
"condition": "libs.libudev",
"output": [ "privateFeature" ]
},
- "qt_libinfix_plugins": {
- "label": "Use QT_LIBINFIX for Plugins",
- "autoDetect": false,
- "enable": "input.qt_libinfix != '' && input.qt_libinfix_plugins == 'yes'",
- "output": [ "privateConfig" ]
- },
"compile_examples": {
"label": "Compile examples",
"autoDetect": "!config.wasm",