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
5641650993 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>

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]

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

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",

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