diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-01-27 15:15:00 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-01-27 15:10:16 +0000 |
| commit | 3c6b0a07da2bc2f39d7355e90c37387fc29d5fd8 (patch) | |
| tree | 83e50455413feb9939286cfa9291ca123b4b08e6 /util | |
| parent | fd590b94823bce357d426360c06555c4c07259b9 (diff) | |
pro2cmake: Don't set OUTPUT_NAME for qml plugins
Amends f67d8ae2d4339c50cf0a4ca26f25c3afebc128ea
Change-Id: I288a9388d4ebd354199bfa0913eff34d93a58d75
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'util')
| -rwxr-xr-x | util/cmake/pro2cmake.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/util/cmake/pro2cmake.py b/util/cmake/pro2cmake.py index ed74a50b66..8c82a796b9 100755 --- a/util/cmake/pro2cmake.py +++ b/util/cmake/pro2cmake.py @@ -3260,11 +3260,12 @@ def write_example( def write_plugin(cm_fh, scope, *, indent: int = 0) -> str: extra = [] + is_qml_plugin = any("qml_plugin" == s for s in scope.get("_LOADED")) qmake_target_name = scope.TARGET # Forward the original Qt5 plugin target name, to correctly name the # final library file name, and also for .prl generation. - if qmake_target_name: + if qmake_target_name and not is_qml_plugin: extra.append(f"OUTPUT_NAME {qmake_target_name}") # In Qt 6 CMake, the CMake target name for a plugin should be the @@ -3286,7 +3287,6 @@ def write_plugin(cm_fh, scope, *, indent: int = 0) -> str: qmldir = None plugin_type = scope.get_string("PLUGIN_TYPE") - is_qml_plugin = any("qml_plugin" == s for s in scope.get("_LOADED")) plugin_function_name = get_cmake_api_call("qt_add_plugin") if plugin_type: extra.append(f"TYPE {plugin_type}") |