From 1fc539a0d29a83392949d2e343a209ceb1d8dc2e Mon Sep 17 00:00:00 2001 From: Katja Marttila Date: Wed, 29 Apr 2020 10:32:55 +0300 Subject: Initialize productkeycheck at later state Productkeycheck can set temporary repositoes etc., initialize it after other command line options have been handled so it won't overwrite values and can utilize the core values set from command line. Change-Id: Iacab5be4efa0d4133a089004a04ecb937f093b2d Reviewed-by: Arttu Tarkiainen --- src/sdk/sdkapp.h | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/sdk/sdkapp.h b/src/sdk/sdkapp.h index 863058df2..90a4b7334 100644 --- a/src/sdk/sdkapp.h +++ b/src/sdk/sdkapp.h @@ -163,6 +163,7 @@ public: QLoggingCategory::setFilterRules(loggingRules); SDKApp::registerMetaResources(manager.collectionByName("QResources")); + QInstaller::BinaryFormatEngineHandler::instance()->registerResources(manager.collections()); const QHash userArgs = userArguments(); if (m_parser.isSet(CommandLineOptions::scStartClientLong)) { @@ -179,13 +180,6 @@ public: QInstaller::Protocol::Mode::Production, userArgs, isCommandLineInterface); } - { - using namespace QInstaller; - ProductKeyCheck::instance()->init(m_core); - ProductKeyCheck::instance()->addPackagesFromXml(QLatin1String(":/metadata/Updates.xml")); - BinaryFormatEngineHandler::instance()->registerResources(manager.collections()); - } - // From Qt5.8 onwards system proxy is used by default. If Qt is built with // QT_USE_SYSTEM_PROXIES false then system proxies are not used by default. if (m_parser.isSet(CommandLineOptions::scNoProxyLong)) { @@ -298,6 +292,10 @@ public: if (m_parser.isSet(CommandLineOptions::scMessageDefaultAnswer)) { m_core->acceptMessageBoxDefaultButton(); } + + ProductKeyCheck::instance()->init(m_core); + ProductKeyCheck::instance()->addPackagesFromXml(QLatin1String(":/metadata/Updates.xml")); + return true; } -- cgit v1.2.3