Commit 63c2656d authored by Marco Bubke's avatar Marco Bubke

QmlDesigner: Start local socket later

Change-Id: I4f1324418b5519b2bdc0eedfcc84d89943b50f82
Reviewed-by: default avatarThomas Hartmann <Thomas.Hartmann@digia.com>
Reviewed-by: default avatarMarco Bubke <marco.bubke@digia.com>
parent a1c18d9e
...@@ -154,11 +154,6 @@ NodeInstanceServerProxy::NodeInstanceServerProxy(NodeInstanceView *nodeInstanceV ...@@ -154,11 +154,6 @@ NodeInstanceServerProxy::NodeInstanceServerProxy(NodeInstanceView *nodeInstanceV
m_runModus(runModus), m_runModus(runModus),
m_synchronizeId(-1) m_synchronizeId(-1)
{ {
QString socketToken(QUuid::createUuid().toString());
m_localServer->listen(socketToken);
m_localServer->setMaxPendingConnections(3);
QString applicationPath = pathToQt + QLatin1String("/bin"); QString applicationPath = pathToQt + QLatin1String("/bin");
if (runModus == TestModus) { if (runModus == TestModus) {
applicationPath = QCoreApplication::applicationDirPath() applicationPath = QCoreApplication::applicationDirPath()
...@@ -190,6 +185,10 @@ NodeInstanceServerProxy::NodeInstanceServerProxy(NodeInstanceView *nodeInstanceV ...@@ -190,6 +185,10 @@ NodeInstanceServerProxy::NodeInstanceServerProxy(NodeInstanceView *nodeInstanceV
if (QFileInfo(applicationPath).exists()) { if (QFileInfo(applicationPath).exists()) {
if (checkPuppetVersion(applicationPath)) { if (checkPuppetVersion(applicationPath)) {
QString socketToken(QUuid::createUuid().toString());
m_localServer->listen(socketToken);
m_localServer->setMaxPendingConnections(3);
m_qmlPuppetEditorProcess = new QProcess; m_qmlPuppetEditorProcess = new QProcess;
m_qmlPuppetEditorProcess->setProcessEnvironment(environment); m_qmlPuppetEditorProcess->setProcessEnvironment(environment);
m_qmlPuppetEditorProcess->setObjectName("EditorProcess"); m_qmlPuppetEditorProcess->setObjectName("EditorProcess");
...@@ -269,6 +268,7 @@ NodeInstanceServerProxy::NodeInstanceServerProxy(NodeInstanceView *nodeInstanceV ...@@ -269,6 +268,7 @@ NodeInstanceServerProxy::NodeInstanceServerProxy(NodeInstanceView *nodeInstanceV
} }
m_localServer->close(); m_localServer->close();
} else { } else {
QMessageBox::warning(0, tr("Wrong QML Puppet Executable Version"), tr("The QML Puppet version is incompatible with the Qt Creator version.")); QMessageBox::warning(0, tr("Wrong QML Puppet Executable Version"), tr("The QML Puppet version is incompatible with the Qt Creator version."));
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment