Merge remote-tracking branch 'origin/1.3'

Conflicts:
	src/libs/installer/lib7z_facade.h

Change-Id: I045ca5e4a2a76e5e651bbedc613f086bd60d563d

1 files changed, 2 insertions, 2 deletions

diff --git a/src/sdk/installerbase_p.cpp b/src/sdk/installerbase_p.cpp
index dc4d82d10..0d59e541e 100644
--- a/src/sdk/installerbase_p.cpp
+++ b/src/sdk/installerbase_p.cpp
@@ -260,11 +260,11 @@ int InstallerBase::replaceMaintenanceToolBinary(QStringList arguments)
             try {
                 Lib7z::extractArchive(&archive, QDir::tempPath());
                 if (!archive.remove()) {
-                    qDebug() << QString::fromLatin1("Could not delete file %1: %2.").arg(
+                    qDebug() << QString::fromLatin1("Could not delete file %1: %2").arg(
                         target, archive.errorString());
                 }
             } catch (const Lib7z::SevenZipException& e) {
-                qDebug() << QString::fromLatin1("Error while extracting %1: %2.").arg(target, e.message());
+                qDebug() << QString::fromLatin1("Error while extracting '%1': %2").arg(target, e.message());
                 return EXIT_FAILURE;
             } catch (...) {
                 qDebug() << QString::fromLatin1("Unknown exception caught while extracting %1.").arg(target);