Commit d15b7fff authored by hjk's avatar hjk
Browse files

Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline

parents f5cd469d f6712bd6
......@@ -37,6 +37,7 @@
#include <QtNetwork/QLocalServer>
#include <QtNetwork/QLocalSocket>
#include <QtCore/QCoreApplication>
#else
......@@ -143,7 +144,7 @@ QString OutputCollector::errorString() const
QString OutputCollector::serverName() const
{
#ifdef Q_OS_WIN
return m_server->fullServerPath();
return m_server->fullServerName();
#else
return m_serverPath;
#endif
......
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