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>
This commit is contained in:
parent
fd590b9482
commit
3c6b0a07da
@ -3260,11 +3260,12 @@ def write_example(
|
|||||||
|
|
||||||
def write_plugin(cm_fh, scope, *, indent: int = 0) -> str:
|
def write_plugin(cm_fh, scope, *, indent: int = 0) -> str:
|
||||||
extra = []
|
extra = []
|
||||||
|
is_qml_plugin = any("qml_plugin" == s for s in scope.get("_LOADED"))
|
||||||
qmake_target_name = scope.TARGET
|
qmake_target_name = scope.TARGET
|
||||||
|
|
||||||
# Forward the original Qt5 plugin target name, to correctly name the
|
# Forward the original Qt5 plugin target name, to correctly name the
|
||||||
# final library file name, and also for .prl generation.
|
# 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}")
|
extra.append(f"OUTPUT_NAME {qmake_target_name}")
|
||||||
|
|
||||||
# In Qt 6 CMake, the CMake target name for a plugin should be the
|
# 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
|
qmldir = None
|
||||||
plugin_type = scope.get_string("PLUGIN_TYPE")
|
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")
|
plugin_function_name = get_cmake_api_call("qt_add_plugin")
|
||||||
if plugin_type:
|
if plugin_type:
|
||||||
extra.append(f"TYPE {plugin_type}")
|
extra.append(f"TYPE {plugin_type}")
|
||||||
|
Loading…
x
Reference in New Issue
Block a user