From a7eb44b33700aeb1fc8d7d8eaf6b76d4ccd6260f Mon Sep 17 00:00:00 2001 From: Ryan Foster Date: Mon, 23 Aug 2021 01:09:33 -0400 Subject: [PATCH] cmake: Copy correct file for Qt imageformat plugin During CMake configuration for 64-bit builds, CopyMSVCBins.cmake would copy plugins/imageformats/qsvg.dll from the Qt directory to additional_install_files/exec64r/imageformats/qsvg.dll (exec32r for 32-bit builds). However, it would copy plugins/iconengines/qsvgicond.dll to the corresponding debug imageformats files location, additional_install_files/exec64d/imageformats/qsvgicond.dll (or exec32d for 32-bit). This appears to have been a simple copy-paste mistake. Let's copy plugins/imageformats/qsvgd.dll instead. --- cmake/Modules/CopyMSVCBins.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/Modules/CopyMSVCBins.cmake b/cmake/Modules/CopyMSVCBins.cmake index 548f15f9e..24b40aae9 100644 --- a/cmake/Modules/CopyMSVCBins.cmake +++ b/cmake/Modules/CopyMSVCBins.cmake @@ -236,7 +236,7 @@ set(ALL_IMAGEFORMATS_BIN_FILES) set(ALL_IMAGEFORMATS_REL_BIN_FILES ${QT_IMAGEFORMATS_BIN_FILES}) set(ALL_IMAGEFORMATS_DBG_BIN_FILES - ${QT_DEBUG_ICONENGINE_BIN_FILES}) + ${QT_DEBUG_IMAGEFORMATS_BIN_FILES}) foreach(list ALL_BASE_BIN_FILES ALL_REL_BIN_FILES ALL_DBG_BIN_FILES