Merge remote-tracking branch 'origin/1.6'

Conflicts:
	dist/config/config.xml
	dist/packages/org.qtproject.ifw.binaries/meta/package.xml
	dist/packages/org.qtproject.ifw/meta/package.xml
	installerfw.pri

Change-Id: I32a2a17b8fd7dc0f1f9c12272fc5f814ea5d86cb

1 files changed, 4 insertions, 4 deletions

diff --git a/src/libs/installer/consumeoutputoperation.cpp b/src/libs/installer/consumeoutputoperation.cpp
index 95d143b4a..d3022fbf5 100644
--- a/src/libs/installer/consumeoutputoperation.cpp
+++ b/src/libs/installer/consumeoutputoperation.cpp
@@ -90,12 +90,12 @@ bool ConsumeOutputOperation::performOperation()
     }
 
     QString executablePath = arguments().at(1);
+    QFileInfo executable(executablePath);
 #ifdef Q_OS_WIN
-    if (!QFile::exists(executablePath))
-        executablePath = executablePath + QLatin1String(".exe");
+    if (!executable.exists() && executable.suffix().isEmpty())
+        executable = QFileInfo(executablePath + QLatin1String(".exe"));
 #endif
 
-    const QFileInfo executable(executablePath);
     if (!executable.exists() || !executable.isExecutable()) {
         setError(UserDefinedError);
         setErrorString(tr("File '%1' does not exist or is not an executable binary.").arg(
@@ -140,7 +140,7 @@ bool ConsumeOutputOperation::performOperation()
         qWarning() << QString::fromLatin1("Cannot get any query output from executable: '%1'").arg(
             executable.absoluteFilePath());
     }
-    core->setValue(installerKeyName, QString::fromLatin1(executableOutput));
+    core->setValue(installerKeyName, QString::fromLocal8Bit(executableOutput));
     return true;
 }