From e6e650f8bdb077b6223aff24a380da514a86e7c0 Mon Sep 17 00:00:00 2001
From: Katja Marttila <katja.marttila@qt.io>
Date: Tue, 10 Nov 2020 17:24:02 +0200
Subject: 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>
---
 src/libs/kdtools/updateoperation.cpp | 4 ++++
 1 file changed, 4 insertions(+)

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;
-- 
cgit v1.2.3