feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Compile.

Browse Source 
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>
This commit is contained in:
Friedemann Kleint
2011-06-28 14:32:39 +02:00
parent faaf318634
commit 930dbd6c9f
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp
View File

@@ -768,7 +768,7 @@ CreateSceneCommand NodeInstanceView::createCreateSceneCommand()
foreach(const NodeInstance &instance, instanceList) { foreach(const NodeInstance &instance, instanceList) {
InstanceContainer::NodeSourceType nodeSourceType = static_cast<InstanceContainer::NodeSourceType>(instance.modelNode().nodeSourceType()); 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)) if (instance.modelNode().metaInfo().isSubclassOf("QtQuick.Item", -1, -1))
nodeMetaType = InstanceContainer::ItemMetaType; nodeMetaType = InstanceContainer::ItemMetaType;
@@ -870,7 +870,7 @@ CreateInstancesCommand NodeInstanceView::createCreateInstancesCommand(const QLis
foreach(const NodeInstance &instance, instanceList) { foreach(const NodeInstance &instance, instanceList) {
InstanceContainer::NodeSourceType nodeSourceType = static_cast<InstanceContainer::NodeSourceType>(instance.modelNode().nodeSourceType()); 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)) if (instance.modelNode().metaInfo().isSubclassOf("QtQuick.Item", -1, -1))
nodeMetaType = InstanceContainer::ItemMetaType; nodeMetaType = InstanceContainer::ItemMetaType;

1
src/plugins/qmlprofiler/qmlprofilerengine.cpp
View File

@@ -43,6 +43,7 @@
#include <analyzerbase/analyzerconstants.h> #include <analyzerbase/analyzerconstants.h>
#include <projectexplorer/applicationlauncher.h> #include <projectexplorer/applicationlauncher.h>
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
#include <coreplugin/helpmanager.h>
#include <qmljsdebugclient/qdeclarativedebugclient_p.h> #include <qmljsdebugclient/qdeclarativedebugclient_p.h>
#include <qt4projectmanager/qt-s60/s60devicerunconfiguration.h> #include <qt4projectmanager/qt-s60/s60devicerunconfiguration.h>