Loader: Do not error out when encountering duplicate multiplex values

In qbs, values of list properties specified in a project file are merged
with those from the profile.
As of fb52fed84a1510a7de0172e643d6fd66a780e2e8, this is also true for
the special multiplexing properties ("qbs.architectures",
"qbs.buildVariants" etc). This means it can now happen that we end up
with duplicate entries in these lists implicitly. Therefore, it no longer
makes sense to throw an error when such duplicates are encountered, as
they were not necessarily specified verbatim. Instead, we simply ignore
the duplicate value and carry on normally.

Change-Id: Ie4fed2081bebd2b0dd62aa873cafed769b308e97
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>

1 files changed, 6 insertions, 12 deletions

diff --git a/src/lib/corelib/loader/productitemmultiplexer.cpp b/src/lib/corelib/loader/productitemmultiplexer.cpp
index aec0400d2..53937aa92 100644
--- a/src/lib/corelib/loader/productitemmultiplexer.cpp
+++ b/src/lib/corelib/loader/productitemmultiplexer.cpp
@@ -181,11 +181,8 @@ MultiplexInfo ProductItemMultiplexer::Private::extractMultiplexInfo(Item *produc
         if (mappedKey.isEmpty())
             throw ErrorInfo(Tr::tr("There is no entry for '%1' in 'qbs.multiplexMap'.").arg(key));
 
-        if (!uniqueMultiplexByQbsProperties.insert(mappedKey).second) {
-            throw ErrorInfo(Tr::tr("Duplicate entry '%1' in Product.%2.")
-                                .arg(mappedKey, StringConstants::multiplexByQbsPropertiesProperty()),
-                            productItem->location());
-        }
+        if (!uniqueMultiplexByQbsProperties.insert(mappedKey).second)
+            continue;
 
         const ScopedJsValue arr(ctx, evaluator.value(qbsModuleItem, key));
         if (JS_IsUndefined(arr))
@@ -198,23 +195,20 @@ MultiplexInfo ProductItemMultiplexer::Private::extractMultiplexInfo(Item *produc
             continue;
 
         MultiplexRow mprow;
-        mprow.resize(arrlen);
+        mprow.reserve(arrlen);
         QVariantList entriesForKey;
         for (quint32 i = 0; i < arrlen; ++i) {
             const ScopedJsValue sv(ctx, JS_GetPropertyUint32(ctx, arr, i));
             const QVariant value = getJsVariant(ctx, sv);
-            if (entriesForKey.contains(value)) {
-                throw ErrorInfo(Tr::tr("Duplicate entry '%1' in qbs.%2.")
-                                    .arg(value.toString(), key), productItem->location());
-            }
+            if (entriesForKey.contains(value))
+                continue;
             entriesForKey << value;
-            mprow[i] = VariantValue::create(value);
+            mprow.push_back(VariantValue::create(value));
         }
         multiplexInfo.table = combine(multiplexInfo.table, mprow);
         multiplexInfo.properties.push_back(mappedKey);
     }
     return multiplexInfo;
-
 }
 
 MultiplexTable ProductItemMultiplexer::Private::combine(const MultiplexTable &table,