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

QmlDesigner: Fix the exit for qml puppet

Browse Source 
Change-Id: I228e91711f6976e0e6d7b298d73f61cd8c25be23
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
This commit is contained in:
Marco Bubke
2013-07-16 15:56:47 +02:00
parent aa08da4143
commit 8f22b84016
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
share/qtcreator/qml/qmlpuppet/instances/nodeinstanceclientproxy.cpp
View File

@@ -102,7 +102,7 @@ void NodeInstanceClientProxy::initializeCapturedStream(const QString &fileName)
bool inputStreamCanBeOpened = m_inputIoDevice->open(QIODevice::ReadOnly);
if (!inputStreamCanBeOpened) {
qDebug() << "Input stream file cannot be opened: " << fileName;
QCoreApplication::exit(-1);
exit(-1);
}
if (QCoreApplication::arguments().count() == 3) {
@@ -111,14 +111,14 @@ void NodeInstanceClientProxy::initializeCapturedStream(const QString &fileName)
bool outputStreamCanBeOpened = m_outputIoDevice->open(QIODevice::WriteOnly);
if (!outputStreamCanBeOpened) {
qDebug() << "Output stream file cannot be opened";
QCoreApplication::exit(-1);
exit(-1);
}
} else if (QCoreApplication::arguments().count() == 4) {
m_controlStream.setFileName(QCoreApplication::arguments().at(3));
bool controlStreamCanBeOpened = m_controlStream.open(QIODevice::ReadOnly);
if (!controlStreamCanBeOpened) {
qDebug() << "Control stream file cannot be opened";
QCoreApplication::exit(-1);
exit(-1);
}
}
@@ -170,7 +170,7 @@ void NodeInstanceClientProxy::writeCommand(const QVariant &command)
if (!compareCommands(command, controlCommand)) {
qDebug() << "Commands differ!";
QCoreApplication::exit(-1);
exit(-1);
}
} else if (m_outputIoDevice) {
QByteArray block;

5
share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppetmain.cpp
View File

@@ -109,5 +109,8 @@ int main(int argc, char *argv[])
SetErrorMode(SEM_NOGPFAULTERRORBOX); //We do not want to see any message boxes
#endif
return application.exec();
if (application.arguments().at(1) == "--readcapturedstream")
return 0;
return application.exec();;
}