diff options
Diffstat (limited to 'src/libs/installer/init.cpp')
| -rw-r--r-- | src/libs/installer/init.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/libs/installer/init.cpp b/src/libs/installer/init.cpp index 40c396ab4..f5053d952 100644 --- a/src/libs/installer/init.cpp +++ b/src/libs/installer/init.cpp @@ -67,7 +67,7 @@ #include "setpluginpathonqtcoreoperation.h" #include "setimportspathonqtcoreoperation.h" #include "setpathonqtcoreoperation.h" -#include "registerqtvqnxoperation.h" +#include "registerqtincreatorqnxoperation.h" #include "setqtcreatorvalueoperation.h" #include "addqtcreatorarrayvalueoperation.h" #include "registertoolchainoperation.h" @@ -205,8 +205,9 @@ void messageHandler(QtMsgType type, const QMessageLogContext &context, const QSt { QByteArray ba = trimAndPrepend(type, msg.toLocal8Bit()); if (type != QtDebugMsg) { - ba += QByteArray(" (") + context.file + QByteArray(":").append(context.line) + QByteArray(", ") - + context.function + QByteArray(")"); + ba += QString(QStringLiteral(" (%1:%2, %3)")).arg( + QString::fromLatin1(context.file)).arg(context.line).arg( + QString::fromLatin1(context.function)).toLocal8Bit(); } #endif @@ -229,8 +230,8 @@ void messageHandler(QtMsgType type, const QMessageLogContext &context, const QSt void QInstaller::init() { -#if defined(QT_STATIC) ::initArchives(); +#if defined(QT_STATIC) ::initResources(); #endif |