diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-06-28 14:32:39 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-06-28 14:35:07 +0200 |
| commit | 930dbd6c9f896ea1e5f040249cbfdeeb7f9334a8 (patch) | |
| tree | 2d1272fd8763acc5e401e569cb7927f63952a03e /src | |
| parent | faaf3186342205fa9175356a830c3f3677baf47b (diff) | |
| download | qt-creator-930dbd6c9f896ea1e5f040249cbfdeeb7f9334a8.tar.gz | |
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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp | 4 | ||||
| -rw-r--r-- | 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 75967a6eb4..65c5a1bfba 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 c233bc5b74..b99661a246 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> |