diff options
| author |   Joerg Bornemann <joerg.bornemann@qt.io> | 2019-05-14 09:40:54 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2019-05-16 06:22:25 +0000 |
| commit | 56416509930a9b9f2a53f6347037088165cc83ad (patch) | |
| tree | f1333c808133e871043be70117376f4ba9436b64 | |
| parent | Enable tst_QWidget_window::tst_resize_count on Ubuntu 18.04 (diff) | |
| download | qtbase-56416509930a9b9f2a53f6347037088165cc83ad.tar.xz qtbase-56416509930a9b9f2a53f6347037088165cc83ad.zip | |
Add -qtlibinfix-plugins for renaming Qt plugins according to QT_LIBINFIX
[ChangeLog][configure] Added the configure option -qtlibinfix-plugins
to rename plugins according to QT_LIBINFIX. This option is off by
default.
Fixes: QTBUG-15192
Change-Id: Id5b267e169ee143fc8f7abc6b27bc0ed5306406f
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| -rw-r--r-- | config_help.txt | 1 | ||||
| -rw-r--r-- | configure.json | 7 | ||||
| -rw-r--r-- | mkspecs/features/qt_plugin.prf | 1 |
3 files changed, 9 insertions, 0 deletions
diff --git a/config_help.txt b/config_help.txt index 1d37b322bd..3f31fd351f 100644 --- a/config_help.txt +++ b/config_help.txt @@ -122,6 +122,7 @@ 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.json b/configure.json index 7f3018ed23..2422f43dd0 100644 --- a/configure.json +++ b/configure.json @@ -110,6 +110,7 @@ "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" }, @@ -1301,6 +1302,12 @@ "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 40528a65e2..6e7388c352 100644 --- a/mkspecs/features/qt_plugin.prf +++ b/mkspecs/features/qt_plugin.prf @@ -91,6 +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) CONFIG += create_cmake |