Merge branch 'master' into refactor

Conflicts:
	installerbuilder/installerbase/tabcontroller.cpp
	installerbuilder/libinstaller/qinstaller.cpp

1 files changed, 9 insertions, 4 deletions

diff --git a/installerbuilder/libinstaller/qinstallercomponent.cpp b/installerbuilder/libinstaller/qinstallercomponent.cpp
index 2eea34bbe..07411da8d 100644
--- a/installerbuilder/libinstaller/qinstallercomponent.cpp
+++ b/installerbuilder/libinstaller/qinstallercomponent.cpp
@@ -262,9 +262,10 @@ void Component::loadDataFromPackageInfo(const KDUpdater::PackageInfo &packageInf
         dependstr.chop(1);
     setValue(QLatin1String("Dependencies"), dependstr);
 
-    if (packageInfo.forcedInstallation)
+    if (packageInfo.forcedInstallation) {
         setValue(QLatin1String("ForcedInstallation"),
-        packageInfo.forcedInstallation ? QLatin1String ("true") : QLatin1String ("false"));
+            packageInfo.forcedInstallation ? QLatin1String ("true") : QLatin1String ("false"));
+    }
 }
 
 //update means it is the packageinfo from server
@@ -299,8 +300,12 @@ void Component::loadDataFromUpdate(KDUpdater::Update* update)
         update->data(QLatin1String("AutoSelectOn")).toString());
     setValue(QLatin1String("Important"),
         update->data(QLatin1String("Important")).toString());
-    setValue(QLatin1String("ForcedInstallation"),
-        update->data(QLatin1String("ForcedInstallation")).toString());
+
+    QString forced = update->data(QLatin1String("ForcedInstallation")).toString();
+    if (qApp->arguments().contains(QLatin1String("--no-force-installations")))
+        forced = QLatin1String("false");
+    setValue(QLatin1String("ForcedInstallation"), forced);
+
     setValue(QLatin1String("UpdateText"),
         update->data(QLatin1String("UpdateText")).toString());
     setValue(QLatin1String("RequiresAdminRights"),