diff options
| author | Janne Koskinen <janne.p.koskinen@digia.com> | 2010-02-04 11:40:27 (GMT) |
|---|---|---|
| committer | Janne Koskinen <janne.p.koskinen@digia.com> | 2010-02-04 11:40:27 (GMT) |
| commit | 7b46aa91709fd7df0ca791d63f68ee5a9436d50a (patch) | |
| tree | fd10fd74d729124d6ef4099f6fe933e3ad9fa9ab /src/corelib/io/qprocess_unix.cpp | |
| parent | 4cd8dd562ea149d5a6cdcc15533e4975682106f6 (diff) | |
| parent | 3569038ffec0c133ff29f80d506f334cc0f2ddb3 (diff) | |
| download | Qt-7b46aa91709fd7df0ca791d63f68ee5a9436d50a.zip Qt-7b46aa91709fd7df0ca791d63f68ee5a9436d50a.tar.gz Qt-7b46aa91709fd7df0ca791d63f68ee5a9436d50a.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6
Diffstat (limited to 'src/corelib/io/qprocess_unix.cpp')
| -rw-r--r-- | src/corelib/io/qprocess_unix.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/io/qprocess_unix.cpp b/src/corelib/io/qprocess_unix.cpp index 0bf7d3f..5119ec0 100644 --- a/src/corelib/io/qprocess_unix.cpp +++ b/src/corelib/io/qprocess_unix.cpp @@ -783,7 +783,7 @@ bool QProcessPrivate::processStarted() // did we read an error message? if (i > 0) - q_func()->setErrorString(QString::fromUtf16(buf, i / sizeof(QChar))); + q_func()->setErrorString(QString((const QChar *)buf, i / sizeof(QChar))); return i <= 0; } |