1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make -qtlibinfix affect the names of plugins by default

Browse Source 
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>
This commit is contained in:
Joerg Bornemann 2020-07-07 09:41:28 +02:00
parent b91a5d053d
commit 79fda7a549
4 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config_help.txt
View File

@ -126,7 +126,6 @@ Build options:
-qtnamespace <name> .. Wrap all Qt library code in 'namespace <name> {...}'. -qtnamespace <name> .. Wrap all Qt library code in 'namespace <name> {...}'.
-qtlibinfix <infix> .. Rename all libQt5*.so to libQt5*<infix>.so. -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] -testcocoon .......... Instrument with the TestCocoon code coverage tool [no]
-gcov ................ Instrument with the GCov code coverage tool [no] -gcov ................ Instrument with the GCov code coverage tool [no]

6
configure.cmake
View File

@ -827,12 +827,6 @@ qt_feature("libudev" PRIVATE
LABEL "udev" LABEL "udev"
CONDITION Libudev_FOUND 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" qt_feature("compile_examples"
LABEL "Compile examples" LABEL "Compile examples"
AUTODETECT NOT WASM AUTODETECT NOT WASM

7
configure.json
View File

@ -109,7 +109,6 @@
"profile": "boolean", "profile": "boolean",
"qreal": "string", "qreal": "string",
"qtlibinfix": { "type": "string", "name": "qt_libinfix" }, "qtlibinfix": { "type": "string", "name": "qt_libinfix" },
"qtlibinfix-plugins": { "type": "boolean", "name": "qt_libinfix_plugins" },
"qtnamespace": { "type": "string", "name": "qt_namespace" }, "qtnamespace": { "type": "string", "name": "qt_namespace" },
"reduce-exports": { "type": "boolean", "name": "reduce_exports" }, "reduce-exports": { "type": "boolean", "name": "reduce_exports" },
"reduce-relocations": { "type": "boolean", "name": "reduce_relocations" }, "reduce-relocations": { "type": "boolean", "name": "reduce_relocations" },
@ -1365,12 +1364,6 @@
"condition": "libs.libudev", "condition": "libs.libudev",
"output": [ "privateFeature" ] "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": { "compile_examples": {
"label": "Compile examples", "label": "Compile examples",
"autoDetect": "!config.wasm", "autoDetect": "!config.wasm",

3
mkspecs/features/qt_plugin.prf
View File

@ -91,8 +91,7 @@ CONFIG(static, static|shared)|prefix_build {
target.path = $$[QT_INSTALL_PLUGINS]/$$PLUGIN_TYPE target.path = $$[QT_INSTALL_PLUGINS]/$$PLUGIN_TYPE
INSTALLS += target INSTALLS += target
qt_libinfix_plugins: TARGET = $$TARGET$$QT_LIBINFIX TARGET = $$qt5LibraryTarget($$TARGET$$QT_LIBINFIX, "plugins/$$PLUGIN_TYPE/")
TARGET = $$qt5LibraryTarget($$TARGET, "plugins/$$PLUGIN_TYPE/")
CONFIG += create_cmake CONFIG += create_cmake