diff options
author | Katja Marttila <katja.marttila@qt.io> | 2021-01-22 14:50:16 +0200 |
---|---|---|
committer | Katja Marttila <katja.marttila@qt.io> | 2021-02-05 09:07:04 +0200 |
commit | 5aee36b74eb1d7613ea0108971e8a22f8dca8101 (patch) | |
tree | 30842cc3b88483c18facd2510ed7c5e3d0a0f138 /src/libs/installer/extractarchiveoperation.cpp | |
parent | a7b0eead83379d9343429a37efa8e39f924e8525 (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/extractarchiveoperation.cpp')
-rw-r--r-- | src/libs/installer/extractarchiveoperation.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libs/installer/extractarchiveoperation.cpp b/src/libs/installer/extractarchiveoperation.cpp index 5b13b1f25..c2d541929 100644 --- a/src/libs/installer/extractarchiveoperation.cpp +++ b/src/libs/installer/extractarchiveoperation.cpp @@ -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. @@ -163,7 +163,7 @@ bool ExtractArchiveOperation::performOperation() // TODO: Use backups for rollback, too? Doesn't work for uninstallation though. // delete all backups we can delete right now, remember the rest - foreach (const Backup &i, callback.backupFiles()) + foreach (const QInstaller::Backup &i, callback.backupFiles()) deleteFileNowOrLater(i.second); if (!receiver.success()) { |