Commit b5800a8d authored by Alvin Wong's avatar Alvin Wong

Add ext_qt hack to allow windepolyqt to package build with debug info

Upstream bug: https://bugreports.qt.io/browse/QTBUG-62103
parent e83e8779
......@@ -60,6 +60,7 @@ if (WIN32)
set(ext_qt_PATCH_COMMAND ${ext_qt_PATCH_COMMAND}
COMMAND ${PATCH_COMMAND} -p1 -d qtbase -i ${CMAKE_CURRENT_SOURCE_DIR}/set-has-border-in-full-screen-default.patch
COMMAND ${PATCH_COMMAND} -p1 -d qtbase -i ${CMAKE_CURRENT_SOURCE_DIR}/remove-fullscreen-border-hack.patch
COMMAND ${PATCH_COMMAND} -p1 -d qttools -i ${CMAKE_CURRENT_SOURCE_DIR}/windeployqt-force-allow-debug-info.patch
)
ExternalProject_Add(
......
diff --git a/src/shared/winutils/utils.cpp b/src/shared/winutils/utils.cpp
index 00a20543..6467dee8 100644
--- a/src/shared/winutils/utils.cpp
+++ b/src/shared/winutils/utils.cpp
@@ -126,6 +126,7 @@ QStringList findSharedLibraries(const QDir &directory, Platform platform,
if (readPeExecutable(dllPath, &errorMessage, 0, 0, &debugDll,
(platform == WindowsDesktopMinGW))) {
matches = debugDll == (debugMatchMode == MatchDebug);
+ matches = true;
} else {
std::wcerr << "Warning: Unable to read " << QDir::toNativeSeparators(dllPath)
<< ": " << errorMessage;
@@ -826,6 +827,7 @@ inline void determineDebugAndDependentLibs(const ImageNtHeader *nth, const void
if (isMinGW) {
// Use logic that's used e.g. in objdump / pfd library
*isDebugIn = !(nth->FileHeader.Characteristics & IMAGE_FILE_DEBUG_STRIPPED);
+ *isDebugIn = false;
} else {
// When an MSVC debug entry is present, check whether the debug runtime
// is actually used to detect -release / -force-debug-info builds.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment