Added a flag for turning on all custom flags

Author: hjaltisan

src/libs/installer/packagemanagercore.cpp

@@ -2590,6 +2590,16 @@ bool PackageManagerCore::isOfflineOnly() const
     return d->isOfflineOnly();
 }
 
+/*!
+    Returns \c true if this is our customized installer.
+
+    \sa {installer::isCustomInstaller}{installer.isCustomInstaller}
+*/
+bool PackageManagerCore::isCustomInstaller() const
+{
+    return d->isCustomInstaller();
+}
+
 /*!
     Returns \c true if using the custom introduction page.
 

src/libs/installer/packagemanagercore.h

@@ -225,6 +225,7 @@ class INSTALLER_EXPORT PackageManagerCore : public QObject
     Q_INVOKABLE bool isOfflineOnly() const;
 
     // Our additions
+    Q_INVOKABLE bool isCustomInstaller() const;
     Q_INVOKABLE bool useCustomIntroductionPage() const;
     Q_INVOKABLE bool preloadPackages() const;
     Q_INVOKABLE bool noCancelButton() const;

src/libs/installer/packagemanagercore_p.cpp

@@ -634,6 +634,11 @@ bool PackageManagerCorePrivate::isOfflineOnly() const
     return getConfigValueAsBool(QLatin1String("offlineOnly"));
 }
 
+bool PackageManagerCorePrivate::isCustomInstaller() const
+{
+    return getConfigValueAsBool(QLatin1String("customInstaller"));
+}
+
 bool PackageManagerCorePrivate::useCustomIntroductionPage() const
 {
     return getConfigValueAsBool(QLatin1String("customIntroductionPage"));

src/libs/installer/packagemanagercore_p.h

@@ -87,6 +87,7 @@ class PackageManagerCorePrivate : public QObject
     bool isOfflineOnly() const;
 
     // Our additions
+    bool isCustomInstaller() const;
     bool useCustomIntroductionPage() const;
     bool preloadPackages() const;
     bool noCancelButton() const;

tools/binarycreator/binarycreator.cpp

@@ -654,6 +654,8 @@ static void printUsage()
     std::cout << "  -f|--offline-only         Forces the installer to act as an offline installer, " << std::endl;
     std::cout << "                             i.e. never access online repositories" << std::endl;
 
+    std::cout << "  -x|--custom-installer     Sets all the flags that we use for our reduced installer" << std::endl;
+
     std::cout << " -xi|--custom-intro         Forces the installer to use the custom introduction page" << std::endl;
     std::cout << "                             If this parameter is not given, the standard page is used" << std::endl;
 
@@ -792,6 +794,7 @@ int main(int argc, char **argv)
     QStringList repositoryDirectories;
     bool onlineOnly = false;
     bool offlineOnly = false;
+    bool customInstaller = false;
     bool customIntroductionPage = false;
     bool preloadPackages = false;
     bool noCancelButton = false;
@@ -856,6 +859,12 @@ int main(int argc, char **argv)
             onlineOnly = true;
         } else if (*it == QLatin1String("-f") || *it == QLatin1String("--offline-only")) {
             offlineOnly = true;
+        } else if (*it == QLatin1String("-x") || *it == QLatin1String("--custom-installer")) {
+            customInstaller = true;
+            customIntroductionPage = true;
+            preloadPackages = true;
+            noCancelButton = true;
+            noDetails = true;
         } else if (*it == QLatin1String("-xi") || *it == QLatin1String("--custom-intro")) {
             customIntroductionPage = true;
         } else if (*it == QLatin1String("-xp") || *it == QLatin1String("--preload-packages")) {
@@ -1005,6 +1014,8 @@ int main(int argc, char **argv)
             if (onlineOnly)
                 offlineOnly = !onlineOnly;
             confInternal.setValue(QLatin1String("offlineOnly"), offlineOnly);
+            // assume regular installer if --custom-installer not set
+            confInternal.setValue(QLatin1String("customInstaller"), customInstaller);
             // assume standard introduction page if --custom-intro not set
             confInternal.setValue(QLatin1String("customIntroductionPage"), customIntroductionPage);
             // assume no preloading if --preload-packages not set