summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKatja Marttila <katja.marttila@qt.io>2020-06-24 08:42:53 +0300
committerKatja Marttila <katja.marttila@qt.io>2020-06-25 11:56:27 +0300
commit7ab5e03c384f0a9364697743bd274486b1b6c2dd (patch)
treea8371ad63d3101196b7d2d6a34d991b7095b8174 /src
parentf546080906dda47adcb62ef30f118fb8a044e03f (diff)
Add function to get information if default install is performed
Task-number: QTIFW-1847 Change-Id: I737b9b527c25e089386f74038b57a83f3d7e2062 Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/libs/installer/packagemanagercore.cpp10
-rw-r--r--src/libs/installer/packagemanagercore.h1
-rw-r--r--src/libs/installer/packagemanagercore_p.cpp2
-rw-r--r--src/libs/installer/packagemanagercore_p.h1
4 files changed, 14 insertions, 0 deletions
diff --git a/src/libs/installer/packagemanagercore.cpp b/src/libs/installer/packagemanagercore.cpp
index 3462e7147..92e634601 100644
--- a/src/libs/installer/packagemanagercore.cpp
+++ b/src/libs/installer/packagemanagercore.cpp
@@ -2458,6 +2458,7 @@ bool PackageManagerCore::installSelectedComponentsSilently(const QStringList& co
*/
bool PackageManagerCore::installDefaultComponentsSilently()
{
+ d->m_defaultInstall = true;
ComponentModel *model = defaultComponentModel();
fetchRemotePackagesTree();
@@ -3257,6 +3258,15 @@ bool PackageManagerCore::isCommandLineInstance() const
}
/*!
+ Returns \c true if installation is performed with default components.
+
+ \sa {installer::isCommandLineDefaultInstall}{installer.isCommandLineDefaultInstall}
+*/
+bool PackageManagerCore::isCommandLineDefaultInstall() const
+{
+ return d->m_defaultInstall;
+}
+/*!
Returns \c true if it is a package manager or an updater.
*/
bool PackageManagerCore::isMaintainer() const
diff --git a/src/libs/installer/packagemanagercore.h b/src/libs/installer/packagemanagercore.h
index 66efb6539..f67caeb64 100644
--- a/src/libs/installer/packagemanagercore.h
+++ b/src/libs/installer/packagemanagercore.h
@@ -257,6 +257,7 @@ public:
void setCommandLineInstance(bool commandLineInstance);
Q_INVOKABLE bool isCommandLineInstance() const;
+ Q_INVOKABLE bool isCommandLineDefaultInstall() const;
bool isMaintainer() const;
diff --git a/src/libs/installer/packagemanagercore_p.cpp b/src/libs/installer/packagemanagercore_p.cpp
index 49df7958d..ad4935abb 100644
--- a/src/libs/installer/packagemanagercore_p.cpp
+++ b/src/libs/installer/packagemanagercore_p.cpp
@@ -217,6 +217,7 @@ PackageManagerCorePrivate::PackageManagerCorePrivate(PackageManagerCore *core)
, m_remoteFileEngineHandler(nullptr)
, m_foundEssentialUpdate(false)
, m_commandLineInstance(false)
+ , m_defaultInstall(false)
, m_userSetBinaryMarker(false)
, m_checkAvailableSpace(true)
, m_autoAcceptLicenses(false)
@@ -253,6 +254,7 @@ PackageManagerCorePrivate::PackageManagerCorePrivate(PackageManagerCore *core, q
, m_remoteFileEngineHandler(new RemoteFileEngineHandler)
, m_foundEssentialUpdate(false)
, m_commandLineInstance(false)
+ , m_defaultInstall(false)
, m_userSetBinaryMarker(false)
, m_checkAvailableSpace(true)
, m_autoAcceptLicenses(false)
diff --git a/src/libs/installer/packagemanagercore_p.h b/src/libs/installer/packagemanagercore_p.h
index 27baec1aa..0fe4ebd62 100644
--- a/src/libs/installer/packagemanagercore_p.h
+++ b/src/libs/installer/packagemanagercore_p.h
@@ -187,6 +187,7 @@ public:
bool m_testChecksum;
bool m_launchedAsRoot;
bool m_commandLineInstance;
+ bool m_defaultInstall;
bool m_userSetBinaryMarker;
bool m_checkAvailableSpace;
bool m_completeUninstall;