From 930dbd6c9f896ea1e5f040249cbfdeeb7f9334a8 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint <Friedemann.Kleint@nokia.com> Date: Tue, 28 Jun 2011 14:32:39 +0200 Subject: [PATCH] Compile. Change-Id: I47930a90b122c7b3863095e0ee4bfac61dba9cd8 Reviewed-on: http://codereview.qt.nokia.com/834 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> --- .../qmldesigner/designercore/instances/nodeinstanceview.cpp | 4 ++-- src/plugins/qmlprofiler/qmlprofilerengine.cpp | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp index 75967a6eb49..65c5a1bfba6 100644 --- a/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp +++ b/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp @@ -768,7 +768,7 @@ CreateSceneCommand NodeInstanceView::createCreateSceneCommand() foreach(const NodeInstance &instance, instanceList) { InstanceContainer::NodeSourceType nodeSourceType = static_cast<InstanceContainer::NodeSourceType>(instance.modelNode().nodeSourceType()); - InstanceContainer::NodeMetaType nodeMetaType = nodeMetaType = InstanceContainer::ObjectMetaType; + InstanceContainer::NodeMetaType nodeMetaType = InstanceContainer::ObjectMetaType; if (instance.modelNode().metaInfo().isSubclassOf("QtQuick.Item", -1, -1)) nodeMetaType = InstanceContainer::ItemMetaType; @@ -870,7 +870,7 @@ CreateInstancesCommand NodeInstanceView::createCreateInstancesCommand(const QLis foreach(const NodeInstance &instance, instanceList) { InstanceContainer::NodeSourceType nodeSourceType = static_cast<InstanceContainer::NodeSourceType>(instance.modelNode().nodeSourceType()); - InstanceContainer::NodeMetaType nodeMetaType = nodeMetaType = InstanceContainer::ObjectMetaType; + InstanceContainer::NodeMetaType nodeMetaType = InstanceContainer::ObjectMetaType; if (instance.modelNode().metaInfo().isSubclassOf("QtQuick.Item", -1, -1)) nodeMetaType = InstanceContainer::ItemMetaType; diff --git a/src/plugins/qmlprofiler/qmlprofilerengine.cpp b/src/plugins/qmlprofiler/qmlprofilerengine.cpp index c233bc5b744..b99661a2460 100644 --- a/src/plugins/qmlprofiler/qmlprofilerengine.cpp +++ b/src/plugins/qmlprofiler/qmlprofilerengine.cpp @@ -43,6 +43,7 @@ #include <analyzerbase/analyzerconstants.h> #include <projectexplorer/applicationlauncher.h> #include <coreplugin/icore.h> +#include <coreplugin/helpmanager.h> #include <qmljsdebugclient/qdeclarativedebugclient_p.h> #include <qt4projectmanager/qt-s60/s60devicerunconfiguration.h> -- GitLab