blob: 2d2f46ff0cdf7c3f0b1e866643183e254275cd49 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
|
diff --git a/src/corelib/Qt6CoreMacros.cmake b/src/corelib/Qt6CoreMacros.cmake
index 8a0d07feac..0e6a720c20 100644
--- a/src/corelib/Qt6CoreMacros.cmake
+++ b/src/corelib/Qt6CoreMacros.cmake
@@ -2977,17 +2977,19 @@ function(_qt_internal_setup_deploy_support)
if(CMAKE_HOST_WIN32)
+ if(CMAKE_CROSSCOMPILING AND NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
- if(CMAKE_CROSSCOMPILING)
set(qt_paths_ext ".bat")
+ elseif(CMAKE_BUILD_TYPE STREQUAL "Debug")
+ set(qt_paths_ext ".debug.bat")
else()
set(qt_paths_ext ".exe")
endif()
else()
set(qt_paths_ext "")
endif()
set(target_qtpaths_path "")
- set(qtpaths_prefix "${QT6_INSTALL_PREFIX}/${QT6_INSTALL_BINS}")
+ set(qtpaths_prefix "${QT6_INSTALL_PREFIX}/tools/Qt6/bin")
get_property(qt_major_version TARGET "${target}" PROPERTY INTERFACE_QT_MAJOR_VERSION)
if(qt_major_version)
set(target_qtpaths_with_major_version_path
|
