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

compile fix for qml2puppet

Browse Source 
Change-Id: Iad3c36e66e70c4ba1c885ffc10c4ea3f888aa820
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
This commit is contained in:
Thomas Hartmann
2012-11-21 15:26:27 +01:00
parent 1600f55f62
commit 091d1116a2
3 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp
+6
View File
@@ -1150,6 +1150,12 @@ void NodeInstanceServer::loadDummyDataContext(const QString& directory)
} }
} }
void NodeInstanceServer::sendDebugOutput(DebugOutputCommand::Type type, const QString &message)
{
DebugOutputCommand command(message, type);
nodeInstanceClient()->debugOutput(command);
}
QStringList NodeInstanceServer::dummyDataDirectories(const QString& directoryPath) QStringList NodeInstanceServer::dummyDataDirectories(const QString& directoryPath)
{ {
QStringList dummyDataDirectoryList; QStringList dummyDataDirectoryList;
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.h
+3
View File
@@ -38,6 +38,7 @@
#include <nodeinstanceserverinterface.h> #include <nodeinstanceserverinterface.h>
#include "servernodeinstance.h" #include "servernodeinstance.h"
#include "debugoutputcommand.h"
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class QFileSystemWatcher; class QFileSystemWatcher;
@@ -125,6 +126,8 @@ public:
virtual QQmlView *declarativeView() const = 0; virtual QQmlView *declarativeView() const = 0;
virtual QQuickView *quickView() const = 0; virtual QQuickView *quickView() const = 0;
void sendDebugOutput(DebugOutputCommand::Type type, const QString &message);
public slots: public slots:
void refreshLocalFileProperty(const QString &path); void refreshLocalFileProperty(const QString &path);
void refreshDummyData(const QString &path); void refreshDummyData(const QString &path);
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/servernodeinstance.cpp
+1 -1
View File
@@ -212,7 +212,7 @@ ServerNodeInstance ServerNodeInstance::create(NodeInstanceServer *nodeInstanceSe
} else if (!instanceContainer.componentPath().isEmpty()) { } else if (!instanceContainer.componentPath().isEmpty()) {
object = Internal::ObjectNodeInstance::createComponent(instanceContainer.componentPath(), nodeInstanceServer->context()); object = Internal::ObjectNodeInstance::createComponent(instanceContainer.componentPath(), nodeInstanceServer->context());
if (object == 0) if (object == 0)
nodeInstanceServer->sendDebugOutput(DebugOutputCommand::ErrorType, QString("Component with path %1 could not be created.").arg(InstanceContainer.componentPath())); nodeInstanceServer->sendDebugOutput(DebugOutputCommand::ErrorType, QString("Component with path %1 could not be created.").arg(instanceContainer.componentPath()));
} else { } else {
object = Internal::ObjectNodeInstance::createPrimitive(instanceContainer.type(), instanceContainer.majorNumber(), instanceContainer.minorNumber(), nodeInstanceServer->context()); object = Internal::ObjectNodeInstance::createPrimitive(instanceContainer.type(), instanceContainer.majorNumber(), instanceContainer.minorNumber(), nodeInstanceServer->context());
if (object == 0) if (object == 0)