diff options
| author | Oliver Wolff <oliver.wolff@qt.io> | 2018-03-21 12:52:13 +0100 |
|---|---|---|
| committer | Sami Nurmenniemi <sami.nurmenniemi@qt.io> | 2018-04-06 13:21:17 +0000 |
| commit | 70ac977a7293833fd5a4a467e217e64fd42b1a17 (patch) | |
| tree | 0290149db5459ea39e0376a6b8f43430bc6c5443 /src/shared | |
| parent | e02d2e9061a2fd884590c0ebfba6406dbf17cabe (diff) | |
Rename Windows(MinGW) to WindowsDesktop(MinGW) in Platform enum
When used in connection with a winrt related header (roerrorapi.h) having
an enum value Windows will lead to a symbol redefinition error, because
Windows is used as a namespace name in there.
Change-Id: Ie102b0d7a72ffb01c3a97f5f5f51b1645d46342b
Reviewed-by: Andre de la Rocha <andre.rocha@qt.io>
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/shared')
| -rw-r--r-- | src/shared/winutils/utils.cpp | 2 | ||||
| -rw-r--r-- | src/shared/winutils/utils.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/shared/winutils/utils.cpp b/src/shared/winutils/utils.cpp index 4824a588a..0e0c4e4cc 100644 --- a/src/shared/winutils/utils.cpp +++ b/src/shared/winutils/utils.cpp @@ -124,7 +124,7 @@ QStringList findSharedLibraries(const QDir &directory, Platform platform, if (debugMatchMode != MatchDebugOrRelease && (platform & WindowsBased)) { bool debugDll; if (readPeExecutable(dllPath, &errorMessage, 0, 0, &debugDll, - (platform == WindowsMinGW))) { + (platform == WindowsDesktopMinGW))) { matches = debugDll == (debugMatchMode == MatchDebug); } else { std::wcerr << "Warning: Unable to read " << QDir::toNativeSeparators(dllPath) diff --git a/src/shared/winutils/utils.h b/src/shared/winutils/utils.h index cadcb93b7..e25a5630b 100644 --- a/src/shared/winutils/utils.h +++ b/src/shared/winutils/utils.h @@ -51,8 +51,8 @@ enum PlatformFlag { }; enum Platform { - Windows = WindowsBased + IntelBased, - WindowsMinGW = WindowsBased + IntelBased + MinGW, + WindowsDesktop = WindowsBased + IntelBased, + WindowsDesktopMinGW = WindowsBased + IntelBased + MinGW, WinRtIntel = WindowsBased + IntelBased + 1, WinRtArm = WindowsBased + ArmBased + 2, WinCEIntel = WindowsBased + IntelBased + 5, @@ -196,7 +196,7 @@ inline bool readExecutable(const QString &executableFileName, Platform platform, return platform == Unix ? readElfExecutable(executableFileName, errorMessage, dependentLibraries, wordSize, isDebug) : readPeExecutable(executableFileName, errorMessage, dependentLibraries, wordSize, isDebug, - (platform == WindowsMinGW)); + (platform == WindowsDesktopMinGW)); } // Return dependent modules of executable files. |