diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-14 03:01:58 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-14 03:01:59 +0100 |
| commit | c42720a105324c82404ff5c58f3cab08fe20bef1 (patch) | |
| tree | 7ae6ed3bf501d9bf79468cf5f8136e2f84ec64a9 /src/shared | |
| parent | 1c39ee57d151d3b06d9c6fda9c99b02ebf9d94d5 (diff) | |
| parent | b74034a3bcedee3cb1489f17a028a7680bfc5d98 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: Iba365dc87ee3e96b2a44dad6bf4da436fd7b04f7
Diffstat (limited to 'src/shared')
| -rw-r--r-- | src/shared/winutils/utils.cpp | 2 | ||||
| -rw-r--r-- | src/shared/winutils/utils.h | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/shared/winutils/utils.cpp b/src/shared/winutils/utils.cpp index 9818d53f9..f32b9b76b 100644 --- a/src/shared/winutils/utils.cpp +++ b/src/shared/winutils/utils.cpp @@ -112,7 +112,7 @@ QStringList findSharedLibraries(const QDir &directory, Platform platform, QString nameFilter = prefix; if (nameFilter.isEmpty()) nameFilter += QLatin1Char('*'); - if (debugMatchMode == MatchDebug && (platform & WindowsBased)) + if (debugMatchMode == MatchDebug && platformHasDebugSuffix(platform)) nameFilter += QLatin1Char('d'); nameFilter += sharedLibrarySuffix(platform); QStringList result; diff --git a/src/shared/winutils/utils.h b/src/shared/winutils/utils.h index 5552a3665..7915f8e4e 100644 --- a/src/shared/winutils/utils.h +++ b/src/shared/winutils/utils.h @@ -61,6 +61,11 @@ enum Platform { UnknownPlatform }; +inline bool platformHasDebugSuffix(Platform p) // Uses 'd' debug suffix +{ + return (p & WindowsBased) != 0 && (p & MinGW) == 0; +} + enum ListOption { ListNone = 0, ListSource, |