From cb7e924896f40aa046362ebe2716e3c95dc94dff Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Date: Fri, 24 Sep 2010 11:02:33 +0200
Subject: [PATCH] QmlDesigner: remove annoying warnings
---
.../components/stateseditor/stateseditorview.cpp | 2 ++
.../qmldesigner/designercore/instances/nodeinstance.cpp | 2 +-
.../designercore/metainfo/subcomponentmanager.cpp | 9 ++++++---
.../qmldesigner/designercore/model/texttomodelmerger.cpp | 1 +
4 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp b/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp
index 1b3cde6fd5a..2206ba8fa68 100644
--- a/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp
+++ b/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp
@@ -205,6 +205,8 @@ void StatesEditorView::modelAttached(Model *model)
insertModelState(i, state);
}
+ for (int i = 0; i < m_modelStates.count(); ++i)
+ m_editorModel->updateState(i); //refres all states
}
void StatesEditorView::modelAboutToBeDetached(Model *model)
diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
index c249a212c54..a1c97686fac 100644
--- a/src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
+++ b/src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
@@ -190,7 +190,7 @@ NodeInstance NodeInstance::create(NodeInstanceView *nodeInstanceView, const Mode
instance.setId(node.id());
- QObject::connect(instance.internalObject(), SIGNAL(destroyed(QObject*)), nodeInstanceView, SLOT(removeIdFromContext(QObject*)));
+ //QObject::connect(instance.internalObject(), SIGNAL(destroyed(QObject*)), nodeInstanceView, SLOT(removeIdFromContext(QObject*)));
foreach (const VariantProperty &property, node.variantProperties()) {
if (property.isDynamic())
diff --git a/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp b/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp
index 03bbde79983..f381e77df13 100644
--- a/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp
+++ b/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp
@@ -88,6 +88,7 @@ public:
public slots:
void parseDirectory(const QString &canonicalDirPath, bool addToLibrary = true, const QString& qualification = QString());
void parseFile(const QString &canonicalFilePath, bool addToLibrary, const QString&);
+ void parseFile(const QString &canonicalFilePath);
public:
QList<QFileInfo> watchedFiles(const QString &canonicalDirPath);
@@ -294,6 +295,11 @@ void SubComponentManagerPrivate::parseFile(const QString &canonicalFilePath, boo
}
}
+void SubComponentManagerPrivate::parseFile(const QString &canonicalFilePath)
+{
+ parseFile(canonicalFilePath, true, QString());
+}
+
// dirInfo must already contain a canonical path
QList<QFileInfo> SubComponentManagerPrivate::watchedFiles(const QString &canonicalDirPath)
{
@@ -369,9 +375,6 @@ void SubComponentManagerPrivate::registerQmlFile(const QFileInfo &fileInfo, cons
if (dynamicProperty.isDefaultProperty())
nodeInfo.setDefaultProperty(dynamicProperty.propertyName());
- if (dynamicProperty.isAlias())
- qDebug() << dynamicProperty.propertyName();
-
PropertyMetaInfo propertyMetaInfo;
propertyMetaInfo.setName(dynamicProperty.propertyName());
propertyMetaInfo.setType(dynamicProperty.propertyTypeName());
diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
index 6ec6ce851f5..49c990d04b6 100644
--- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
+++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
@@ -554,6 +554,7 @@ bool TextToModelMerger::load(const QString &data, DifferenceHandler &differenceH
{ // Have the QML engine check if the document is valid:
QDeclarativeEngine engine;
+ engine.setOutputWarningsToStandardError(false);
foreach (const QString &importPath, importPaths)
engine.addImportPath(importPath);
QDeclarativeComponent comp(&engine);
--
GitLab