diff options
Diffstat (limited to 'src/lib/corelib/language/modulemerger.cpp')
-rw-r--r-- | src/lib/corelib/language/modulemerger.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/lib/corelib/language/modulemerger.cpp b/src/lib/corelib/language/modulemerger.cpp index ea79d6562..9dc066bf1 100644 --- a/src/lib/corelib/language/modulemerger.cpp +++ b/src/lib/corelib/language/modulemerger.cpp @@ -223,11 +223,8 @@ void ModuleMerger::insertProperties(Item::PropertyMap *dst, Item *srcItem, Prope for (Item::PropertyMap::const_iterator it = srcItem->properties().constBegin(); it != srcItem->properties().constEnd(); ++it) { const ValuePtr &srcVal = it.value(); - if (srcVal->type() == Value::ItemValueType - || it.key() == QLatin1String("_qbs_sourceDir")) { + if (srcVal->type() != Value::JSSourceValueType) continue; - } - const PropertyDeclaration srcDecl = srcItem->propertyDeclaration(it.key()); if (!srcDecl.isValid() || srcDecl.isScalar() != (type == ScalarProperties)) continue; |