summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@qt.io>2022-09-22 15:13:32 +0300
committerMiikka Heikkinen <miikka.heikkinen@qt.io>2022-09-22 12:21:21 +0000
commit03714788363dd1594d367e73719fd28a65f81682 (patch)
treea2b52b7ea05dbc9aaac2ee004869a3e4b3202d9c
parentf50a6b04d80992db9990ac0ed258a8f63c2b1916 (diff)
downloadqt-creator-03714788363dd1594d367e73719fd28a65f81682.tar.gz
QmlDesigner: Fix bundle imported material's metainfo type
Fixes: QDS-7749 Change-Id: I50993304b3cae7452ff3fcb4d37af0f8663c0199 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
-rw-r--r--src/plugins/qmldesigner/components/materialbrowser/bundleimporter.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/qmldesigner/components/materialbrowser/bundleimporter.cpp b/src/plugins/qmldesigner/components/materialbrowser/bundleimporter.cpp
index 38aded7645..67559e0829 100644
--- a/src/plugins/qmldesigner/components/materialbrowser/bundleimporter.cpp
+++ b/src/plugins/qmldesigner/components/materialbrowser/bundleimporter.cpp
@@ -97,8 +97,9 @@ QString BundleImporter::importComponent(const QString &qmlFile,
FilePath qmlSourceFile = bundleImportPath.resolvePath(FilePath::fromString(qmlFile));
const bool qmlFileExists = qmlSourceFile.exists();
const QString qmlType = qmlSourceFile.baseName();
- m_pendingTypes.append(QStringLiteral("%1.%2")
- .arg(QLatin1String(Constants::COMPONENT_BUNDLES_FOLDER).mid(1), qmlType));
+ m_pendingTypes.append(QStringLiteral("%1.%2.%3")
+ .arg(QLatin1String(Constants::COMPONENT_BUNDLES_FOLDER).mid(1),
+ m_bundleId, qmlType));
if (!qmldirContent.contains(qmlFile)) {
qmldirContent.append(qmlType);
qmldirContent.append(" 1.0 ");