1 files changed, 12 insertions, 2 deletions

diff --git a/src/lib/corelib/language/language.h b/src/lib/corelib/language/language.h
index daf88d4fb..86f0f86fe 100644
--- a/src/lib/corelib/language/language.h
+++ b/src/lib/corelib/language/language.h
@@ -116,10 +116,11 @@ public:
                                 const QString &configureScript,
                                 const QVariantMap &properties,
                                 const QVariantMap &initialProperties,
+                                const QMap<QString, VariantValuePtr> &values,
                                 const std::vector<QString> &importedFilesUsed)
     {
         return ProbeConstPtr(new Probe(globalId, location, condition, configureScript, properties,
-                                       initialProperties, importedFilesUsed));
+                                       initialProperties, values, importedFilesUsed));
     }
 
     const QString &globalId() const { return m_globalId; }
@@ -128,6 +129,7 @@ public:
     const QString &configureScript() const { return m_configureScript; }
     const QVariantMap &properties() const { return m_properties; }
     const QVariantMap &initialProperties() const { return m_initialProperties; }
+    const QMap<QString, VariantValuePtr> &values() const { return m_values; }
     const std::vector<QString> &importedFilesUsed() const { return m_importedFilesUsed; }
     bool needsReconfigure(const FileTime &referenceTime) const;
 
@@ -135,6 +137,8 @@ public:
     {
         pool.serializationOp<opType>(m_globalId, m_location, m_condition, m_configureScript,
                                      m_properties, m_initialProperties, m_importedFilesUsed);
+        if constexpr (opType == PersistentPool::OpType::Load)
+            restoreValues();
     }
 
 private:
@@ -145,21 +149,27 @@ private:
           QString configureScript,
           QVariantMap properties,
           QVariantMap initialProperties,
+          QMap<QString, VariantValuePtr> values,
           std::vector<QString> importedFilesUsed)
         : m_globalId(std::move(globalId))
         , m_location(location)
         , m_configureScript(std::move(configureScript))
         , m_properties(std::move(properties))
         , m_initialProperties(std::move(initialProperties))
+        , m_values(std::move(values))
         , m_importedFilesUsed(std::move(importedFilesUsed))
         , m_condition(condition)
-    {}
+    {
+    }
+
+    void restoreValues();
 
     QString m_globalId;
     CodeLocation m_location;
     QString m_configureScript;
     QVariantMap m_properties;
     QVariantMap m_initialProperties;
+    QMap<QString, VariantValuePtr> m_values;
     std::vector<QString> m_importedFilesUsed;
     bool m_condition = false;
 };