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

Remove trailing newlines from QML Puppet messages.

Browse Source 
Change-Id: Ibe184979568f5ba2d4635cf36c9206cf56d87bac
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
This commit is contained in:
Friedemann Kleint
2014-03-14 16:11:49 +01:00
parent 2c732970b8
commit 94b13cdd9f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -280,7 +280,7 @@ NodeInstanceServerProxy::NodeInstanceServerProxy(NodeInstanceView *nodeInstanceV
missingQmlPuppetErrorMessage(pathToQt, missingQmlPuppetErrorMessage(pathToQt,
tr("The executable of the QML Puppet process (%1) cannot be started. " tr("The executable of the QML Puppet process (%1) cannot be started. "
"Please check your installation. " "Please check your installation. "
"QML Puppet is a process which runs in the background to render the items.\n\n" "QML Puppet is a process which runs in the background to render the items."
).arg(applicationPath))); ).arg(applicationPath)));
QmlDesignerPlugin::instance()->switchToTextModeDeferred(); QmlDesignerPlugin::instance()->switchToTextModeDeferred();
@@ -292,7 +292,7 @@ NodeInstanceServerProxy::NodeInstanceServerProxy(NodeInstanceView *nodeInstanceV
QMessageBox::warning(Core::ICore::dialogParent(), QMessageBox::warning(Core::ICore::dialogParent(),
tr("Wrong QML Puppet Executable Version"), tr("Wrong QML Puppet Executable Version"),
missingQmlPuppetErrorMessage(pathToQt, missingQmlPuppetErrorMessage(pathToQt,
tr("The QML Puppet version is incompatible with the Qt Creator version.\n\n"))); tr("The QML Puppet version is incompatible with the Qt Creator version.")));
QmlDesignerPlugin::instance()->switchToTextModeDeferred(); QmlDesignerPlugin::instance()->switchToTextModeDeferred();
} }
} else { } else {