diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-07-07 09:41:28 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-07-13 20:30:18 +0200 |
| commit | 79fda7a549724dfa517797aea9e2f0d3527e531d (patch) | |
| tree | bba2205e840ba621a780b8a38bc69c68658e0186 | |
| parent | b91a5d053d48b90a2cf56429d432cdfcb1098efd (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>
| -rw-r--r-- | config_help.txt | 1 | ||||
| -rw-r--r-- | configure.cmake | 6 | ||||
| -rw-r--r-- | configure.json | 7 | ||||
| -rw-r--r-- | mkspecs/features/qt_plugin.prf | 3 |
4 files changed, 1 insertions, 16 deletions
diff --git a/config_help.txt b/config_help.txt index db9587dd20..e981eba411 100644 --- a/config_help.txt +++ b/config_help.txt @@ -126,7 +126,6 @@ Build options: -qtnamespace <name> .. Wrap all Qt library code in 'namespace <name> {...}'. -qtlibinfix <infix> .. Rename all libQt5*.so to libQt5*<infix>.so. - -qtlibinfix-plugins .. Rename Qt plugins according to -qtlibinfix [no] -testcocoon .......... Instrument with the TestCocoon code coverage tool [no] -gcov ................ Instrument with the GCov code coverage tool [no] diff --git a/configure.cmake b/configure.cmake index ce527743d5..2f5d320f62 100644 --- a/configure.cmake +++ b/configure.cmake @@ -827,12 +827,6 @@ qt_feature("libudev" PRIVATE LABEL "udev" CONDITION Libudev_FOUND ) -qt_feature("qt_libinfix_plugins" - LABEL "Use QT_LIBINFIX for Plugins" - AUTODETECT OFF - ENABLE ( NOT INPUT_qt_libinfix STREQUAL '' ) AND INPUT_qt_libinfix_plugins STREQUAL 'yes' -) -qt_feature_config("qt_libinfix_plugins" QMAKE_PRIVATE_CONFIG) qt_feature("compile_examples" LABEL "Compile examples" AUTODETECT NOT WASM 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", diff --git a/mkspecs/features/qt_plugin.prf b/mkspecs/features/qt_plugin.prf index 573d717eea..78b210a00c 100644 --- a/mkspecs/features/qt_plugin.prf +++ b/mkspecs/features/qt_plugin.prf @@ -91,8 +91,7 @@ CONFIG(static, static|shared)|prefix_build { target.path = $$[QT_INSTALL_PLUGINS]/$$PLUGIN_TYPE INSTALLS += target -qt_libinfix_plugins: TARGET = $$TARGET$$QT_LIBINFIX -TARGET = $$qt5LibraryTarget($$TARGET, "plugins/$$PLUGIN_TYPE/") +TARGET = $$qt5LibraryTarget($$TARGET$$QT_LIBINFIX, "plugins/$$PLUGIN_TYPE/") CONFIG += create_cmake |