diff options
| author | Kai Koehne <kai.koehne@qt.io> | 2020-02-14 17:13:30 +0100 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@qt.io> | 2020-02-15 12:12:51 +0100 |
| commit | fa8cb43a7e90d1bf54c0dcc76ab41c537afc6e88 (patch) | |
| tree | a386127981db093c3f8c7726e5f8d36ebc9ed472 | |
| parent | ac0ce38dcfeeded87db0c1dd5d348f5ed6fc1af3 (diff) | |
Windows: Do look for <plugin>d.dll as a fallback
Do look for d.dll as name of the library, even if Qt was built in
release mode. This mitigates the change we did in Qt 5.14.0, where
we switched the way our MinGW builds are configured from
-debug-and-release to -debug -force-debug-info. But it is also
more consisten in how we handle the release build, and macOS
dylib loading.
Fixes: QTBUG-81021
Change-Id: I73cd11941d86a732b92a3479d47b6e83a839994f
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| -rw-r--r-- | src/qml/qml/qqmlimport.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlimport.cpp b/src/qml/qml/qqmlimport.cpp index 3bf8d807a9..a01b07c75c 100644 --- a/src/qml/qml/qqmlimport.cpp +++ b/src/qml/qml/qqmlimport.cpp @@ -1859,8 +1859,11 @@ QString QQmlImportDatabase::resolvePlugin(QQmlTypeLoader *typeLoader, static const QStringList suffixes = { # ifdef QT_DEBUG QLatin1String("d.dll"), // try a qmake-style debug build first -# endif QLatin1String(".dll") +#else + QLatin1String(".dll"), + QLatin1String("d.dll") // try a qmake-style debug build after +# endif }; #elif defined(Q_OS_DARWIN) static const QString prefix = QLatin1String("lib"); |