summaryrefslogtreecommitdiffstats
path: root/installerbuilder/libinstaller/setimportspathonqtcoreoperation.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'installerbuilder/libinstaller/setimportspathonqtcoreoperation.cpp')
-rw-r--r--installerbuilder/libinstaller/setimportspathonqtcoreoperation.cpp15
1 files changed, 7 insertions, 8 deletions
diff --git a/installerbuilder/libinstaller/setimportspathonqtcoreoperation.cpp b/installerbuilder/libinstaller/setimportspathonqtcoreoperation.cpp
index 284b6f65d..90337174f 100644
--- a/installerbuilder/libinstaller/setimportspathonqtcoreoperation.cpp
+++ b/installerbuilder/libinstaller/setimportspathonqtcoreoperation.cpp
@@ -32,11 +32,11 @@
**************************************************************************/
#include "setimportspathonqtcoreoperation.h"
-#include "common/utils.h"
#include "qtpatch.h"
#include <QtCore/QByteArrayMatcher>
#include <QtCore/QDir>
+#include <QtCore/QDebug>
using namespace QInstaller;
@@ -46,7 +46,7 @@ namespace {
QFileInfo fileInfo(binaryPath);
if (!fileInfo.exists()) {
- verbose() << "qpatch: warning: file `" << qPrintable(binaryPath) << "' not found" << std::endl;
+ qDebug() << QString::fromLatin1("qpatch: warning: file '%1' not found").arg(binaryPath);
return QByteArray();
}
@@ -59,9 +59,9 @@ namespace {
}
Q_ASSERT(file.isOpen());
if (!file.isOpen()) {
- verbose() << "qpatch: warning: file `" << qPrintable(binaryPath) << "' can not open as ReadOnly."
- << std::endl;
- verbose() << file.errorString() << std::endl;
+ qDebug() << QString::fromLatin1("qpatch: warning: file '%1' can not open as ReadOnly.").arg(
+ binaryPath);
+ qDebug() << file.errorString();
return QByteArray();
}
@@ -107,7 +107,7 @@ bool SetImportsPathOnQtCoreOperation::performOperation()
const QByteArray newValue = QDir::toNativeSeparators(args.at(1)).toUtf8();
if (255 < newValue.size()) {
- verbose() << "qpatch: error: newQtDir needs to be less than 255 characters." << std::endl;
+ qDebug() << "qpatch: error: newQtDir needs to be less than 255 characters.";
return false;
}
QStringList libraryFiles;
@@ -126,8 +126,7 @@ bool SetImportsPathOnQtCoreOperation::performOperation()
bool isPatched = QtPatch::patchBinaryFile(coreLibrary, oldValue, adjutedNewValue);
if (!isPatched) {
- QInstaller::verbose() << "qpatch: warning: could not patched the imports path in "
- << qPrintable(coreLibrary) << std::endl;
+ qDebug() << "qpatch: warning: could not patched the imports path in" << coreLibrary;
}
}
}