1 files changed, 10 insertions, 7 deletions
diff --git a/src/libs/installer/licenseoperation.cpp b/src/libs/installer/licenseoperation.cpp
index a5a61c71f..0d30ab514 100644
--- a/src/libs/installer/licenseoperation.cpp
+++ b/src/libs/installer/licenseoperation.cpp
@@ -31,6 +31,7 @@
 #include "packagemanagercore.h"
 #include "settings.h"
 #include "fileutils.h"
+#include "globals.h"
 
 #include <QtCore/QDir>
 #include <QtCore/QFile>
@@ -56,7 +57,7 @@ void LicenseOperation::backup()
 
 bool LicenseOperation::performOperation()
 {
-    QVariantMap licenses = value(QLatin1String("licenses")).toMap();
+    QVariantMap licenses = value(scLicensesValue).toMap();
     if (licenses.isEmpty()) {
         setError(UserDefinedError);
         setErrorString(tr("No license files found to copy."));
@@ -80,14 +81,17 @@ bool LicenseOperation::performOperation()
 
     for (QVariantMap::const_iterator it = licenses.constBegin(); it != licenses.constEnd(); ++it) {
         QFile file(targetDir + QLatin1Char('/') + it.key());
-        if (!file.open(QIODevice::WriteOnly | QIODevice::Truncate | QIODevice::Text)) {
+        if (!file.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
             setError(UserDefinedError);
             setErrorString(tr("Can not write license file \"%1\".").arg(QDir::toNativeSeparators(file.fileName())));
             return false;
         }
 
-        QTextStream stream(&file);
+        QString outString;
+        QTextStream stream(&outString);
         stream << it.value().toString();
+
+        file.write(outString.toUtf8());
     }
 
     return true;
@@ -95,11 +99,10 @@ bool LicenseOperation::performOperation()
 
 bool LicenseOperation::undoOperation()
 {
-    const QVariantMap licenses = value(QLatin1String("licenses")).toMap();
+    const QVariantMap licenses = value(scLicensesValue).toMap();
     if (licenses.isEmpty()) {
-        setError(UserDefinedError);
-        setErrorString(tr("No license files found to delete."));
-        return false;
+        qCWarning(QInstaller::lcInstallerInstallLog) << "No license files found to delete.";
+        return true;
     }
 
     QString targetDir = arguments().value(0);