diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-21 01:00:10 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-02-21 09:00:37 +0100 |
| commit | f6808f89a8c17e046f53b0bb5ff36cd9e24e9772 (patch) | |
| tree | 43df8901d99f1e134d7688bdf0d30d28c1679147 /src/qml/qml/qqmlimport.cpp | |
| parent | e33e250080dbbb01015daafc8a79b569806d9467 (diff) | |
| parent | 5054bb49a88a8ab76f586f79b6ef62a9142e6c83 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
tests/auto/quick/qquickmousearea/BLACKLIST
Change-Id: I3de2c6377d57f5f9204d2cfc688d50a7a0b4150c
Diffstat (limited to 'src/qml/qml/qqmlimport.cpp')
| -rw-r--r-- | src/qml/qml/qqmlimport.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlimport.cpp b/src/qml/qml/qqmlimport.cpp index 5ee27d4457..ee512a5137 100644 --- a/src/qml/qml/qqmlimport.cpp +++ b/src/qml/qml/qqmlimport.cpp @@ -727,6 +727,7 @@ bool QQmlImportInstance::resolveType(QQmlTypeLoader *typeLoader, const QHashedSt Q_ASSERT(ok); typePriv->extraData.id->url = QUrl(this->url); auto icType = QQmlType(typePriv); + typePriv->release(); return icType; }; if (containingType.isValid()) { @@ -902,6 +903,7 @@ bool QQmlImportsPrivate::resolveType(const QHashedStringRef& type, QTypeRevision int placeholderId = type_return->generatePlaceHolderICId(); icTypePriv->extraData.id->url.setFragment(QString::number(placeholderId)); auto icType = QQmlType(icTypePriv); + icTypePriv->release(); type_return->associateInlineComponent(icName, placeholderId, CompositeMetaTypeIds {}, icType); *type_return = icType; } @@ -938,6 +940,7 @@ bool QQmlImportsPrivate::resolveType(const QHashedStringRef& type, QTypeRevision int placeholderId = type_return->generatePlaceHolderICId(); icTypePriv->extraData.id->url.setFragment(QString::number(placeholderId)); auto icType = QQmlType(icTypePriv); + icTypePriv->release(); type_return->associateInlineComponent(icName, placeholderId, CompositeMetaTypeIds {}, icType); *type_return = icType; } @@ -1996,8 +1999,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"); |