summaryrefslogtreecommitdiff
path: root/src/libs/utils/consoleprocess_unix.cpp
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>2012-01-04 17:34:08 +0100
committerFriedemann Kleint <Friedemann.Kleint@nokia.com>2012-01-06 09:31:14 +0100
commitac54974b3269490eacbc1fbb865a7d14cdf055e8 (patch)
treed9c16f111c7064ecedb024fd1f9a27811b6be5f0 /src/libs/utils/consoleprocess_unix.cpp
parent5a31b0067df5dfd267edcb963e616ba28da06f0e (diff)
downloadqt-creator-ac54974b3269490eacbc1fbb865a7d14cdf055e8.tar.gz
Utils: Compile with QT_NO_CAST_FROM_ASCII.
Change-Id: I5cd5607fcd3311915217a1615b948587ef808cfa Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src/libs/utils/consoleprocess_unix.cpp')
-rw-r--r--src/libs/utils/consoleprocess_unix.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libs/utils/consoleprocess_unix.cpp b/src/libs/utils/consoleprocess_unix.cpp
index ab9c7b4da1..90faba1a27 100644
--- a/src/libs/utils/consoleprocess_unix.cpp
+++ b/src/libs/utils/consoleprocess_unix.cpp
@@ -190,7 +190,7 @@ QString ConsoleProcess::stubServerListen()
QTemporaryFile tf;
if (!tf.open())
return msgCannotCreateTempFile(tf.errorString());
- stubFifoDir = QFile::encodeName(tf.fileName());
+ stubFifoDir = tf.fileName();
}
// By now the temp file was deleted again
d->m_stubServerDir = QFile::encodeName(stubFifoDir);
@@ -199,7 +199,7 @@ QString ConsoleProcess::stubServerListen()
if (errno != EEXIST)
return msgCannotCreateTempDir(stubFifoDir, QString::fromLocal8Bit(strerror(errno)));
}
- const QString stubServer = stubFifoDir + "/stub-socket";
+ const QString stubServer = stubFifoDir + QLatin1String("/stub-socket");
if (!d->m_stubServer.listen(stubServer)) {
::rmdir(d->m_stubServerDir.constData());
return tr("Cannot create socket '%1': %2").arg(stubServer, d->m_stubServer.errorString());