feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Fix StyleMerger for custom types

Browse Source 
If the template uses custom types they are only found if
we register the correct fileUrl.

Change-Id: Ia358a39d5c5c5bbcaf403ae3c250495ddadfc326
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Thomas Hartmann
2022-09-28 16:56:31 +02:00
parent 3be3663bf7
commit ea13277c7a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp
View File

@@ -1514,7 +1514,7 @@ void styleMerge(const SelectionContext &selectionContext, const QString &templat
QScopedPointer<Model> templateModel(Model::create("QtQuick.Item", 2, 1, parentModel)); QScopedPointer<Model> templateModel(Model::create("QtQuick.Item", 2, 1, parentModel));
Q_ASSERT(templateModel.data()); Q_ASSERT(templateModel.data());
templateModel->setFileUrl(QUrl::fromLocalFile(templateFile)); templateModel->setFileUrl(selectionContext.view()->model()->fileUrl());
QPlainTextEdit textEditTemplate; QPlainTextEdit textEditTemplate;
Utils::FileReader reader; Utils::FileReader reader;
@@ -1540,7 +1540,7 @@ void styleMerge(const SelectionContext &selectionContext, const QString &templat
QScopedPointer<Model> styleModel(Model::create("QtQuick.Item", 2, 1, parentModel)); QScopedPointer<Model> styleModel(Model::create("QtQuick.Item", 2, 1, parentModel));
Q_ASSERT(styleModel.data()); Q_ASSERT(styleModel.data());
styleModel->setFileUrl(QUrl::fromLocalFile(templateFile)); styleModel->setFileUrl(selectionContext.view()->model()->fileUrl());
QPlainTextEdit textEditStyle; QPlainTextEdit textEditStyle;
RewriterView *parentRewriterView = selectionContext.view()->model()->rewriterView(); RewriterView *parentRewriterView = selectionContext.view()->model()->rewriterView();