diff options
Diffstat (limited to 'src/libs/installer/qtpatch.cpp')
-rw-r--r-- | src/libs/installer/qtpatch.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/libs/installer/qtpatch.cpp b/src/libs/installer/qtpatch.cpp index 28c514fc4..17abe8a7b 100644 --- a/src/libs/installer/qtpatch.cpp +++ b/src/libs/installer/qtpatch.cpp @@ -90,8 +90,8 @@ QHash<QString, QByteArray> QtPatch::qmakeValues(const QString &qmakePath, QByteA if (process.exitStatus() == QProcess::CrashExit) { qWarning() << qmake.absoluteFilePath() << args << "crashed with exit code" << process.exitCode() - << "standard output: " << output - << "error output: " << process.readAllStandardError(); + << "standard output:" << output + << "error output:" << process.readAllStandardError(); return qmakeValueHash; } qmakeValueHash = readQmakeOutput(output); @@ -125,7 +125,7 @@ bool QtPatch::patchBinaryFile(const QString &fileName, openFileForPatching(&file); if (!file.isOpen()) { qDebug() << "qpatch: warning: file" << qPrintable(fileName) << "cannot open."; - qDebug() << qPrintable(file.errorString()); + qDebug().noquote() << file.errorString(); return false; } @@ -173,8 +173,7 @@ bool QtPatch::patchTextFile(const QString &fileName, QFile file(fileName); if (!file.open(QFile::ReadOnly)) { - qDebug() << QString::fromLatin1("qpatch: warning: Open the file '%1' stopped: %2").arg( - fileName, file.errorString()); + qDebug() << "Cannot open file" << fileName << "for patching:" << file.errorString(); return false; } @@ -188,7 +187,7 @@ bool QtPatch::patchTextFile(const QString &fileName, } if (!file.open(QFile::WriteOnly | QFile::Truncate)) { - qDebug() << QString::fromLatin1("qpatch: error: file '%1' not writable").arg(fileName); + qDebug() << "File" << fileName << "not writable."; return false; } @@ -208,7 +207,6 @@ bool QtPatch::openFileForPatching(QFile *file) } return file->openMode() == QFile::ReadWrite; } - qDebug() << QString::fromLatin1("qpatch: error: File '%1 is open, so it cannot be opened again.").arg( - file->fileName()); + qDebug() << "File" << file->fileName() << "is open, so it cannot be opened again."; return false; } |