Loader: Restore candidates when switching preferred value

... on the final module properties merge.

Fixes: QBS-1763
Change-Id: Ie57f0e493ffb90a36cd0c6cd9c1bd48ccac0e42f
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>

1 files changed, 5 insertions, 0 deletions

diff --git a/src/lib/corelib/loader/modulepropertymerger.cpp b/src/lib/corelib/loader/modulepropertymerger.cpp
index abadd5b34..a789d1adc 100644
--- a/src/lib/corelib/loader/modulepropertymerger.cpp
+++ b/src/lib/corelib/loader/modulepropertymerger.cpp
@@ -287,6 +287,11 @@ bool ModulePropertyMerger::doFinalMerge(const PropertyDeclaration &propertyDecl,
 
         if (propertyValue == chosenValue)
             return false;
+        std::vector<ValuePtr> candidates = propertyValue->candidates();
+        candidates.erase(std::find(candidates.begin(), candidates.end(), chosenValue));
+        chosenValue->setCandidates(candidates);
+        chosenValue->addCandidate(propertyValue);
+        propertyValue->setCandidates({});
         propertyValue = chosenValue;
         return true;
     }