This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/shared/winutils/utils.cpp b/src/shared/winutils/utils.cpp | |
index 8f9cc198..c10ca61b 100644 | |
--- a/src/shared/winutils/utils.cpp | |
+++ b/src/shared/winutils/utils.cpp | |
@@ -840,7 +840,7 @@ inline void determineDebugAndDependentLibs(const ImageNtHeader *nth, const void | |
// and debug flags. | |
bool readPeExecutable(const QString &peExecutableFileName, QString *errorMessage, | |
QStringList *dependentLibrariesIn, unsigned *wordSizeIn, | |
- bool *isDebugIn, bool isMinGW) | |
+ bool *isDebugIn, bool isMinGW, unsigned *machineArchIn) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/shared/winutils/utils.cpp b/src/shared/winutils/utils.cpp | |
index 8f9cc198..a03984b4 100644 | |
--- a/src/shared/winutils/utils.cpp | |
+++ b/src/shared/winutils/utils.cpp | |
@@ -840,7 +840,7 @@ inline void determineDebugAndDependentLibs(const ImageNtHeader *nth, const void | |
// and debug flags. | |
bool readPeExecutable(const QString &peExecutableFileName, QString *errorMessage, | |
QStringList *dependentLibrariesIn, unsigned *wordSizeIn, | |
- bool *isDebugIn, bool isMinGW) | |
+ bool *isDebugIn, bool isMinGW, unsigned *machineArchIn) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule qtbase contains modified content | |
Submodule qtbase 519fcb38a2..705dee9621: | |
diff --git a/qtbase/mkspecs/common/msvc-desktop.conf b/qtbase/mkspecs/common/msvc-desktop.conf | |
index b7d2eecc82..755d92149c 100644 | |
--- a/qtbase/mkspecs/common/msvc-desktop.conf | |
+++ b/qtbase/mkspecs/common/msvc-desktop.conf | |
@@ -22,6 +22,10 @@ contains(QMAKE_TARGET.arch, x86_64) { | |
DEFINES += WIN64 | |
QMAKE_COMPILER_DEFINES += _WIN64 | |
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule qtbase 519fcb38a2..705dee9621: | |
diff --git a/qtbase/mkspecs/common/msvc-desktop.conf b/qtbase/mkspecs/common/msvc-desktop.conf | |
index b7d2eecc82..755d92149c 100644 | |
--- a/qtbase/mkspecs/common/msvc-desktop.conf | |
+++ b/qtbase/mkspecs/common/msvc-desktop.conf | |
@@ -22,6 +22,10 @@ contains(QMAKE_TARGET.arch, x86_64) { | |
DEFINES += WIN64 | |
QMAKE_COMPILER_DEFINES += _WIN64 | |
} | |
+contains(QMAKE_TARGET.arch, arm64) { |