diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-12-13 09:47:47 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-12-13 10:14:20 +0100 |
| commit | 4978a76b42964639401f9b63209f68dfcc85a51a (patch) | |
| tree | af69e2f521af2f335f51a451e304136c198e6769 /src/shared | |
| parent | a7ee1fc7a0516ba3639b4680149fa7adebb13a1f (diff) | |
windeployqt: Fix MinGW deployment
The platform no longer has a 'd' suffix for debug binaries
(see qtbase/4d289edb14aeb4976218cc306bfc514e37521b82).
Add a check.
Fixes: QTBUG-80763
Task-number: QTBUG-78445
Change-Id: I8d4617e2111167a546fa172cbca78a656d233ee5
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
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, |