From 685ae6bc55f8a0b5fb94c059daa1f414aa57e6eb Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Date: Mon, 4 Oct 2010 15:38:29 +0200
Subject: [PATCH] QmlDesigner.propertyEditor: cache QtQuick items instead of Qt
Fixes caching for Qt Quick items.
Also the emptyPane is found again.
Reviewed-by: Kai Koehne
---
.../components/propertyeditor/propertyeditor.cpp | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp
index 97273b7863c..24832155730 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp
@@ -716,10 +716,10 @@ void PropertyEditor::modelAttached(Model *model)
m_locked = true;
- setupPane("Qt/Rectangle");
- setupPane("Qt/Text");
- setupPane("Qt/TextInput");
- setupPane("Qt/TextEdit");
+ setupPane("QtQuick/Rectangle");
+ setupPane("QtQuick/Text");
+ setupPane("QtQuick/TextInput");
+ setupPane("QtQuick/TextEdit");
resetView();
m_locked = false;
@@ -895,7 +895,7 @@ QUrl PropertyEditor::qmlForNode(const ModelNode &modelNode, QString &className)
}
}
}
- return fileToUrl(QDir(m_qmlDir).filePath("Qt/emptyPane.qml"));
+ return fileToUrl(QDir(m_qmlDir).filePath("QtQuick/emptyPane.qml"));
}
QString PropertyEditor::locateQmlFile(const QString &relativePath) const
--
GitLab