feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Utils: Make Utils::is64BitWindowsBinary operate on FilePaths

Browse Source 
Change-Id: I8ef840219bc93f77f5a55e38013facf892de759d
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
hjk
2021-11-09 18:45:07 +01:00
parent a3ae60d729
commit aac740f127
7 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/libs/utils/winutils.cpp
View File

@@ -24,6 +24,8 @@
****************************************************************************/
#include "winutils.h"
#include "filepath.h"
#include "qtcassert.h"
#ifdef Q_OS_WIN
@@ -152,16 +154,16 @@ QTCREATOR_UTILS_EXPORT bool is64BitWindowsSystem()
#endif
}
QTCREATOR_UTILS_EXPORT bool is64BitWindowsBinary(const QString &binaryIn)
QTCREATOR_UTILS_EXPORT bool is64BitWindowsBinary(const FilePath &binaryIn)
{
QTC_ASSERT(!binaryIn.isEmpty(), return false);
QTC_ASSERT(!binaryIn.isEmpty() && !binaryIn.needsDevice(), return false);
#ifdef Q_OS_WIN32
# ifdef __GNUC__ // MinGW lacking some definitions/winbase.h
# define SCS_64BIT_BINARY 6
# endif
bool isAmd64 = false;
DWORD binaryType = 0;
const QString binary = QDir::toNativeSeparators(binaryIn);
const QString binary = binaryIn.deviceLocalPath();
bool success = GetBinaryTypeW(reinterpret_cast<const TCHAR*>(binary.utf16()), &binaryType) != 0;
if (success && binaryType == SCS_64BIT_BINARY)
isAmd64=true;