diff options
author | Katja Marttila <katja.marttila@qt.io> | 2020-11-10 17:24:02 +0200 |
---|---|---|
committer | Katja Marttila <katja.marttila@qt.io> | 2020-11-11 13:58:42 +0200 |
commit | e6e650f8bdb077b6223aff24a380da514a86e7c0 (patch) | |
tree | e46fd70735b921b4a6d1aa65242ccf35beb957cd | |
parent | 9c2b1b646fac445548cec6e915acc12371516601 (diff) |
Fix AppendFile undo
If Appendfile is done to a file in an install folder, the backup
file name folder name is saved as @RELOCATABLE_PATH@. Replace the
variable with actual folder when the value is read.
Task-number: QTIFW-2020
Change-Id: Ibe32f9afd53fd9698c0acc14de62a641d0dd89c4
Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
-rw-r--r-- | src/libs/kdtools/updateoperation.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/libs/kdtools/updateoperation.cpp b/src/libs/kdtools/updateoperation.cpp index 73e904da5..b884fa9fa 100644 --- a/src/libs/kdtools/updateoperation.cpp +++ b/src/libs/kdtools/updateoperation.cpp @@ -505,6 +505,10 @@ bool UpdateOperation::fromXml(const QDomDocument &doc) } var = QVariant::fromValue(list); } + } else if (t == QVariant::String) { + const QString str = QInstaller::replacePath(value, + QLatin1String(QInstaller::scRelocatable), target); + var = QVariant::fromValue(str); } m_values[name] = var; |