3 files changed, 7 insertions, 6 deletions
diff --git a/src/libs/installer/component.cpp b/src/libs/installer/component.cpp
index 5546cf230..d2a6751af 100644
--- a/src/libs/installer/component.cpp
+++ b/src/libs/installer/component.cpp
@@ -1095,7 +1095,7 @@ OperationList Component::operations(const Operation::OperationGroups &mask) cons
                 licenses.insert(values.at(i).value(scFile).toString(),
                         values.at(i).value(scContent));
             }
-            d->m_licenseOperation->setValue(scLicenses, licenses);
+            d->m_licenseOperation->setValue(scLicensesValue, licenses);
             d->m_operations.append(d->m_licenseOperation);
         }
     }
diff --git a/src/libs/installer/constants.h b/src/libs/installer/constants.h
index ecd85fe11..5cde15e2a 100644
--- a/src/libs/installer/constants.h
+++ b/src/libs/installer/constants.h
@@ -102,6 +102,7 @@ static const QLatin1String scInstallDate("InstallDate");
 static const QLatin1String scUserInterfaces("UserInterfaces");
 static const QLatin1String scTranslations("Translations");
 static const QLatin1String scLicenses("Licenses");
+static const QLatin1String scLicensesValue("licenses");
 static const QLatin1String scLicense("License");
 static const QLatin1String scOperations("Operations");
 static const QLatin1String scInstallScript("installScript");
diff --git a/src/libs/installer/licenseoperation.cpp b/src/libs/installer/licenseoperation.cpp
index 6cf0c8e3e..c87348351 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(scLicenses).toMap();
+    QVariantMap licenses = value(scLicensesValue).toMap();
     if (licenses.isEmpty()) {
         setError(UserDefinedError);
         setErrorString(tr("No license files found to copy."));
@@ -96,11 +97,10 @@ bool LicenseOperation::performOperation()
 
 bool LicenseOperation::undoOperation()
 {
-    const QVariantMap licenses = value(scLicenses).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);