diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp index 34f516262d0b57d0be1e7496eedcbc5b4e3b3227..0617a3778fa5db39f757d010866e500e99cf7a95 100644 --- a/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp +++ b/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp @@ -35,7 +35,9 @@ #include #include #include +#include #include +#include #include "propertyabstractcontainer.h" #include "propertyvaluecontainer.h" @@ -305,19 +307,26 @@ NodeInstanceClientInterface *NodeInstanceServerProxy::nodeInstanceClient() const QString NodeInstanceServerProxy::missingQmlPuppetErrorMessage(const QString &applicationPath) const { - QString message = tr("The executable of the QML Puppet process (%1) cannot be found." - "Check your installation." - "QML Puppet is a process which runs in the background to render the items."). - arg(applicationPath); + QString message; + QTextStream str(&message); + str << "

" + << tr("The executable of the QML Puppet process (%1) cannot be found. " + "Check your installation. " + "QML Puppet is a process which runs in the background to render the items."). + arg(QDir::toNativeSeparators(applicationPath)) + << "

"; if (hasQtQuick2(m_nodeInstanceView.data())) { - message += tr("You can build qml2puppet yourself with Qt 5.0.1 or higher" - "The source can be found in %1/qml/qmlpuppet/qml2puppet/").arg(sharedDirPath()); - message += tr("The qml2puppet will get installed to the bin directory of your Qt." - "Qt Quick Designer will check the bin direcotry of the Qt currently active" - "for your project."); - + str << "

" + << tr("You can build qml2puppet yourself with Qt 5.0.1 or higher. " + "The source can be found in %1."). + arg(QDir::toNativeSeparators(sharedDirPath() + QLatin1String("/qml/qmlpuppet/qml2puppet/"))) + << "

" + << tr("qml2puppet will be installed to the bin directory of your Qt version. " + "Qt Quick Designer will check the bin directory of the currently active Qt version " + "of your project.") + << "

"; } - + str << "

"; return message; }