diff options
| author | Robert Griebl <robert.griebl@qt.io> | 2022-05-19 18:39:32 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-05-30 20:54:13 +0000 |
| commit | 4c7186eda10666844e6bedca63eb31a7ebff1231 (patch) | |
| tree | 79fcb74596887fa46efc443438567b64e37e5a0c | |
| parent | de2e5c25eb874de9e7a579b049f5f2852fcbfaa1 (diff) | |
| download | qtapplicationmanager-4c7186eda10666844e6bedca63eb31a7ebff1231.tar.gz | |
Use real file names when creating the wrappers
We can't rely on the targets being set-up the way we expect them,
especially when cross-compiling against a tools-only host build.
Change-Id: I6f33be8697be9c0fa3734cc64ec171149623b026
Fixes: QTBUG-101508
Reviewed-by: Bernd Weimer <bernd.weimer@qt.io>
(cherry picked from commit 481846d7d81056c331f244a28c5eaf9a05e0ff89)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/main-lib/Qt6AppManMainPrivateMacros.cmake | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main-lib/Qt6AppManMainPrivateMacros.cmake b/src/main-lib/Qt6AppManMainPrivateMacros.cmake index 663fffca..69a88a8b 100644 --- a/src/main-lib/Qt6AppManMainPrivateMacros.cmake +++ b/src/main-lib/Qt6AppManMainPrivateMacros.cmake @@ -23,7 +23,7 @@ function(qt6_am_add_systemui_wrapper target) ) if (NOT ARG_EXECUTABLE) - set(ARG_EXECUTABLE "${QT_CMAKE_EXPORT_NAMESPACE}::appman") + set(ARG_EXECUTABLE "appman") endif() set(CMD_ARGS) @@ -79,7 +79,7 @@ function(qt6_am_add_systemui_wrapper target) SetLocal EnableDelayedExpansion (set \"PATH=${test_env_path};%PATH%\") (set \"QT_PLUGIN_PATH=${test_env_plugin_path}\") -$<SHELL_PATH:$<TARGET_FILE:${ARG_EXECUTABLE}>> ${CMD_ARGS_STR} ${CMD_EXTRA_ARGS_STR} ${ARG_MAIN_QML_FILE} %* +${ARG_EXECUTABLE}.exe ${CMD_ARGS_STR} ${CMD_EXTRA_ARGS_STR} ${ARG_MAIN_QML_FILE} %* EndLocal " ) @@ -90,7 +90,7 @@ EndLocal "#!/bin/sh export PATH=\"${test_env_path}:$PATH\" export QT_PLUGIN_PATH=\"${test_env_plugin_path}\" -exec $<TARGET_FILE_NAME:${ARG_EXECUTABLE}> ${CMD_ARGS_STR} ${CMD_EXTRA_ARGS_STR} ${ARG_MAIN_QML_FILE} \"$@\"; +exec ${ARG_EXECUTABLE} ${CMD_ARGS_STR} ${CMD_EXTRA_ARGS_STR} ${ARG_MAIN_QML_FILE} \"$@\"; " ) endif() @@ -212,7 +212,7 @@ function (qt_am_internal_add_qml_test target) endif() qt6_am_add_systemui_wrapper(${target}_${CONFIG_ARG_NAME} - EXECUTABLE ${QT_CMAKE_EXPORT_NAMESPACE}::appman-qmltestrunner + EXECUTABLE appman-qmltestrunner MAIN_QML_FILE ${ARG_TEST_FILE} NO_INSTALL ${EXTRA_FILES_ARG_STR} |