diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-20 01:00:07 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-20 01:00:07 +0100 |
| commit | 87d9234d71122f0332c37c81ca0338ddcda7eeba (patch) | |
| tree | 3b92ae44963945225ec7d95284c4bda5bb1afeff /src/qml | |
| parent | add46fd9055088e6aa458f21558234e267eb60ca (diff) | |
| parent | 9b5bd48fc652a7dd47c545db8338a580592f7f35 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I024445b3401a57040d7d67780ea32d2f8b02f41a
Diffstat (limited to 'src/qml')
| -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 3a06e98b6b..2a6a77a2fc 100644 --- a/src/qml/qml/qqmlimport.cpp +++ b/src/qml/qml/qqmlimport.cpp @@ -1994,8 +1994,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"); |