summaryrefslogtreecommitdiffstats
path: root/src/libs/installer/packagemanagercore_p.h
diff options
context:
space:
mode:
authorKatja Marttila <katja.marttila@qt.io>2021-01-22 14:50:16 +0200
committerKatja Marttila <katja.marttila@qt.io>2021-02-05 09:07:04 +0200
commit5aee36b74eb1d7613ea0108971e8a22f8dca8101 (patch)
tree30842cc3b88483c18facd2510ed7c5e3d0a0f138 /src/libs/installer/packagemanagercore_p.h
parenta7b0eead83379d9343429a37efa8e39f924e8525 (diff)
Try rerunning execute operation
Execute operation can have hard coded paths to program which is executed. In case the program is relocated, UNDO operation will fail as it will not find the program. Implemented new XXXX_OLD value which can be used for overwriting the hardcoded value. In case the program execution fails, program is tried to launch again with the replaced value. Task-number: QTIFW-2125 Change-Id: I446a4c423e53cc4ffc6e5e25617d2400945ac3d9 Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
Diffstat (limited to 'src/libs/installer/packagemanagercore_p.h')
-rw-r--r--src/libs/installer/packagemanagercore_p.h12
1 files changed, 3 insertions, 9 deletions
diff --git a/src/libs/installer/packagemanagercore_p.h b/src/libs/installer/packagemanagercore_p.h
index 8983a95c2..858baf9eb 100644
--- a/src/libs/installer/packagemanagercore_p.h
+++ b/src/libs/installer/packagemanagercore_p.h
@@ -1,6 +1,6 @@
/**************************************************************************
**
-** Copyright (C) 2020 The Qt Company Ltd.
+** Copyright (C) 2021 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the Qt Installer Framework.
@@ -67,12 +67,6 @@ class PackageManagerCorePrivate : public QObject
Q_DISABLE_COPY(PackageManagerCorePrivate)
public:
- enum OperationType {
- Backup,
- Perform,
- Undo
- };
-
explicit PackageManagerCorePrivate(PackageManagerCore *core);
explicit PackageManagerCorePrivate(PackageManagerCore *core, qint64 magicInstallerMaker,
const QList<OperationBlob> &performedOperations);
@@ -80,8 +74,8 @@ public:
static bool isProcessRunning(const QString &name, const QList<ProcessInfo> &processes);
- static bool performOperationThreaded(Operation *op, PackageManagerCorePrivate::OperationType type
- = PackageManagerCorePrivate::Perform);
+ static bool performOperationThreaded(Operation *op, UpdateOperation::OperationType type
+ = UpdateOperation::Perform);
void initialize(const QHash<QString, QString> &params);
bool isOfflineOnly() const;