Fix the developmentMode flag not being set, if the installer was off

This was not a big problem until now, as only the installer itself was
using this flag.

Change-Id: I1b7a749c5066aa13959dd4d798bd545c3070bac7
Reviewed-by: Dominik Holland <dominik.holland@qt.io>

2 files changed, 7 insertions, 7 deletions

diff --git a/src/main-lib/main.cpp b/src/main-lib/main.cpp
index 14b287f4..a31a3b71 100644
--- a/src/main-lib/main.cpp
+++ b/src/main-lib/main.cpp
@@ -169,6 +169,7 @@ void Main::setup(const Configuration *cfg) Q_DECL_NOEXCEPT_EXPR(false)
 {
     // basics that are needed in multiple setup functions below
     m_noSecurity = cfg->noSecurity();
+    m_developmentMode = cfg->developmentMode();
     m_builtinAppsManifestDirs = cfg->builtinAppsManifestDirs();
     m_installationDir = cfg->installationDir();
     m_installationDirMountPoint = cfg->installationDirMountPoint();
@@ -211,7 +212,7 @@ void Main::setup(const Configuration *cfg) Q_DECL_NOEXCEPT_EXPR(false)
     if (m_installationDir.isEmpty() || cfg->disableInstaller()) {
         StartupTimer::instance()->checkpoint("skipping installer");
     } else {
-        setupInstaller(cfg->developmentMode(), cfg->allowUnsignedPackages(), cfg->caCertificates(),
+        setupInstaller(cfg->allowUnsignedPackages(), cfg->caCertificates(),
                        std::bind(&Configuration::applicationUserIdSeparation, cfg,
                                  std::placeholders::_1, std::placeholders::_2, std::placeholders::_3));
     }
@@ -443,6 +444,8 @@ void Main::setupSingletons(const QList<QPair<QString, QString>> &containerSelect
 
     if (m_noSecurity)
         m_applicationManager->setSecurityChecksEnabled(false);
+    if (m_developmentMode)
+        m_packageManager->setDevelopmentMode(true);
 
     m_applicationManager->setSystemProperties(m_systemProperties.at(SP_SystemUi));
     m_applicationManager->setContainerSelectionConfiguration(containerSelectionConfiguration);
@@ -460,7 +463,7 @@ void Main::setupSingletons(const QList<QPair<QString, QString>> &containerSelect
     }
 }
 
-void Main::setupInstaller(bool devMode, bool allowUnsigned, const QStringList &caCertificatePaths,
+void Main::setupInstaller(bool allowUnsigned, const QStringList &caCertificatePaths,
                           const std::function<bool(uint *, uint *, uint *)> &userIdSeparation) Q_DECL_NOEXCEPT_EXPR(false)
 {
 #if !defined(AM_DISABLE_INSTALLER)
@@ -507,9 +510,6 @@ void Main::setupInstaller(bool devMode, bool allowUnsigned, const QStringList &c
 
     m_applicationInstaller = ApplicationInstaller::createInstance(m_packageManager);
 
-    if (devMode)
-        m_packageManager->setDevelopmentMode(true);
-
     if (m_noSecurity || allowUnsigned)
         m_packageManager->setAllowInstallationOfUnsignedPackages(true);
 
@@ -542,7 +542,6 @@ void Main::setupInstaller(bool devMode, bool allowUnsigned, const QStringList &c
 
     StartupTimer::instance()->checkpoint("after installer setup");
 #else
-    Q_UNUSED(devMode)
     Q_UNUSED(allowUnsigned)
     Q_UNUSED(caCertificatePaths)
     Q_UNUSED(userIdSeparation)
diff --git a/src/main-lib/main.h b/src/main-lib/main.h
index b6f1459e..afdb9ff4 100644
--- a/src/main-lib/main.h
+++ b/src/main-lib/main.h
@@ -83,7 +83,7 @@ protected:
                       int replyFromApplicationTimeout, int replyFromSystemTimeout) Q_DECL_NOEXCEPT_EXPR(false);
     void setupSingletons(const QList<QPair<QString, QString>> &containerSelectionConfiguration,
                          int quickLaunchRuntimesPerContainer, qreal quickLaunchIdleLoad) Q_DECL_NOEXCEPT_EXPR(false);
-    void setupInstaller(bool devMode, bool allowUnsigned, const QStringList &caCertificatePaths,
+    void setupInstaller(bool allowUnsigned, const QStringList &caCertificatePaths,
                         const std::function<bool(uint *, uint *, uint *)> &userIdSeparation) Q_DECL_NOEXCEPT_EXPR(false);
     void registerPackages();
 
@@ -131,6 +131,7 @@ private:
     QVector<QVariantMap> m_systemProperties;
 
     bool m_noSecurity = false;
+    bool m_developmentMode = false;
     QStringList m_builtinAppsManifestDirs;
     QString m_installationDir;
     QString m_documentDir;