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

2009-01-15 15:52:27 +01:00
parent f5cd469d18 f6712bd67f
commit d15b7fffb5
1 changed files with 2 additions and 1 deletions
--- a/src/plugins/debugger/outputcollector.cpp
+++ b/src/plugins/debugger/outputcollector.cpp
@@ -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