summaryrefslogtreecommitdiffstats
path: root/src/libs/installer/packagemanagercore_p.h
diff options
context:
space:
mode:
authorArttu Tarkiainen <arttu.tarkiainen@qt.io>2020-04-17 16:25:25 +0300
committerArttu Tarkiainen <arttu.tarkiainen@qt.io>2020-04-28 11:56:44 +0300
commit550186ed78a023374239c1f8494188db030f035d (patch)
tree2d96ab24f87535bf42e746970679217777571acc /src/libs/installer/packagemanagercore_p.h
parent4f5eace163eeb34504cb8044c42b147df03fafed (diff)
Add possibility to accept licenses from CLI
License agreements can be accepted automatically by using command line option --accept-licenses or interactively by answering queries with either "Accept", "Reject" or "Show" selections. Task-number: QTIFW-1742 Task-number: QTIFW-1745 Change-Id: Iff46b44f91faddb7f163b299994167ab16df68b3 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
Diffstat (limited to 'src/libs/installer/packagemanagercore_p.h')
-rw-r--r--src/libs/installer/packagemanagercore_p.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/libs/installer/packagemanagercore_p.h b/src/libs/installer/packagemanagercore_p.h
index dc5ad6af4..5bdba6a7d 100644
--- a/src/libs/installer/packagemanagercore_p.h
+++ b/src/libs/installer/packagemanagercore_p.h
@@ -207,6 +207,7 @@ public:
bool m_dependsOnLocalInstallerBinary;
QStringList m_allowedRunningProcesses;
+ bool m_autoAcceptLicenses;
private slots:
void infoMessage(Job *, const QString &message) {
@@ -244,6 +245,8 @@ private:
void findExecutablesRecursive(const QString &path, const QStringList &excludeFiles, QStringList *result);
QStringList runningInstallerProcesses(const QStringList &exludeFiles);
bool calculateComponentsAndRun();
+ bool acceptLicenseAgreements();
+ bool askUserAcceptLicense(const QString &name, const QString &content);
private:
PackageManagerCore *m_core;