mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-28 09:19:02 +08:00
26254b9a59
- Fix control of cups dependency - Fix binary and directory name collision in dynamic builds by not deploy plugins into tools/Qt6/bin (wasn't necessary in the first place due to qt.conf working as expected) (closes #28340) - (New) Fix deploy script on windows (closes #38936) - Fix dbus linkage as described here https://github.com/microsoft/vcpkg/pull/38682#issuecomment-2106308954 - Fix qtwebengine resource location to be in line what is stated in the generated `qt.conf`. There is probably a variable to control the installation location but moving was simpler then trying to find that variable. You will only notice it if you actually try to run a program using QtWebEngineProcess with the same `qt.conf`
22 lines
893 B
Diff
22 lines
893 B
Diff
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,13 +2977,15 @@ function(_qt_internal_setup_deploy_support)
|
|
if(CMAKE_HOST_WIN32)
|
|
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 "${QT6_INSTALL_PREFIX}/${QT6_INSTALL_BINS}/qtpaths${qt_paths_ext}")
|
|
+ set(target_qtpaths_path "${QT6_INSTALL_PREFIX}/tools/Qt6/bin/qtpaths${qt_paths_ext}")
|
|
|
|
file(GENERATE OUTPUT "${QT_DEPLOY_SUPPORT}" CONTENT
|
|
"cmake_minimum_required(VERSION 3.16...3.21)
|