3 files changed, 35 insertions, 0 deletions
diff --git a/src/libs/kdtools/localpackagehub.cpp b/src/libs/kdtools/localpackagehub.cpp
index bd6d879e3..c7b627c51 100644
--- a/src/libs/kdtools/localpackagehub.cpp
+++ b/src/libs/kdtools/localpackagehub.cpp
@@ -313,6 +313,7 @@ void LocalPackageHub::refresh()
     \a title,
     \a treeName,
     \a description,
+    \a sortingPriority,
     \a dependencies,
     \a autoDependencies,
     \a forcedInstallation,
diff --git a/src/libs/kdtools/updateoperation.cpp b/src/libs/kdtools/updateoperation.cpp
index 35629809e..b35751096 100644
--- a/src/libs/kdtools/updateoperation.cpp
+++ b/src/libs/kdtools/updateoperation.cpp
@@ -321,6 +321,39 @@ void UpdateOperation::setRequiresUnreplacedVariables(bool isRequired)
     m_requiresUnreplacedVariables = isRequired;
 }
 
+/*!
+    Replaces installer \c value \a variableValue with predefined variable.
+    If \c key is found for the \a variableValue and the \c key ends with string _OLD,
+    the initial \a variableValue is replaced  with the \c value having a key
+    without _OLD ending. This way we can replace the hard coded values defined for operations,
+    if the value has for some reason changed. For example if we set following variables
+    in install script:
+    \badcode
+        installer.setValue("MY_OWN_EXECUTABLE", "C:/Qt/NewLocation/Tools.exe")
+        installer.setValue("MY_OWN_EXECUTABLE_OLD", "C:/Qt/OldLocation/Tools.exe")
+    \endcode
+    and we have moved the Tools.exe from OldLocation to NewLocation, the operation
+    continues to work and use the Tools.exe from NewLocation although original
+    installation has been made with Tools.exe in OldLocation.
+    Returns \c true if \a variableValue is replaced.
+*/
+bool UpdateOperation::variableReplacement(QString *variableValue)
+{
+    bool variableValueChanged = false;
+    const QString valueNormalized = QDir::cleanPath(*variableValue);
+    QString key = m_core->key(valueNormalized);
+    if (key.endsWith(QLatin1String("_OLD"))) {
+        key.chop(4);
+        if (m_core->containsValue(key)) {
+            key.prepend(QLatin1String("@"));
+            key.append(QLatin1String("@"));
+            *variableValue = m_core->replaceVariables(key);
+            variableValueChanged = true;
+        }
+    }
+    return variableValueChanged;
+}
+
 struct StartsWith
 {
     explicit StartsWith(const QString &searchTerm)
diff --git a/src/libs/kdtools/updateoperation.h b/src/libs/kdtools/updateoperation.h
index a39c25747..4a431f107 100644
--- a/src/libs/kdtools/updateoperation.h
+++ b/src/libs/kdtools/updateoperation.h
@@ -114,6 +114,7 @@ protected:
     QStringList parsePerformOperationArguments();
     QStringList parseUndoOperationArguments();
     void setRequiresUnreplacedVariables(bool isRequired);
+    bool variableReplacement(QString *variableValue);
 
 private:
     QString m_name;