From 4f70fc589f5e0f77e4e1115fd33ea83e4c1b3cda Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Date: Mon, 6 Dec 2010 17:40:12 +0100
Subject: [PATCH] QmlDesigner.propertyEditor: fix for webview
Handle different packages
---
.../qmldesigner/components/propertyeditor/propertyeditor.cpp | 2 ++
.../qmldesigner/components/propertyeditor/propertyeditor.h | 3 +++
2 files changed, 5 insertions(+)
diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp
index 45777358f9a..b92b71aa87f 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp
@@ -883,6 +883,8 @@ void PropertyEditor::reloadQml()
QString PropertyEditor::qmlFileName(const NodeMetaInfo &nodeInfo) const
{
+ if (nodeInfo.typeName().split('/').last() == "QDeclarativeItem")
+ return "Qt/ItemPane.qml";
return nodeInfo.typeName() + QLatin1String("Pane.qml");
}
diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.h b/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.h
index 788418f0a08..050623411cb 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.h
+++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.h
@@ -35,6 +35,7 @@
#include <QHash>
#include <QDeclarativePropertyMap>
#include <QStackedWidget>
+#include <QTimer>
#include "qmlanchorbindingproxy.h"
#include "designerpropertymap.h"
@@ -44,6 +45,7 @@
QT_BEGIN_NAMESPACE
class QShortcut;
class QStackedWidget;
+class QTimer;
QT_END_NAMESPACE
class PropertyEditorValue;
@@ -141,6 +143,7 @@ private: //variables
NodeType *m_currentType;
bool m_locked;
bool m_setupCompleted;
+ QTimer *m_singleShotTimer;
};
--
GitLab