aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@theqtcompany.com>2014-12-19 15:09:01 +0100
committerChristian Kandeler <christian.kandeler@theqtcompany.com>2014-12-19 16:37:39 +0100
commit4dfb3c2008064881868a9f2498adceb988ccbbb0 (patch)
tree17580903209c5a07730b87df6ccd2a22a10cf68e
parentddd557d9230c795144f11285577a651b6fb15235 (diff)
Fix property look-up.
We must not stop searching for the property just because the respective module is present in the product; the property itself must have been found as well. Change-Id: Icc4fb019094909f1da26d649dcbe54d76a09f2d0 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com> (cherry picked from commit fdad8a2b0566847680da445f7ff920ad88da9171)
-rw-r--r--src/lib/corelib/tools/propertyfinder.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/corelib/tools/propertyfinder.cpp b/src/lib/corelib/tools/propertyfinder.cpp
index d691457d8..d21079aad 100644
--- a/src/lib/corelib/tools/propertyfinder.cpp
+++ b/src/lib/corelib/tools/propertyfinder.cpp
@@ -71,7 +71,7 @@ void PropertyFinder::findModuleValues(const QVariantMap &properties, bool search
moduleProperties.erase(modIt);
}
- if (!searchRecursively)
+ if (!m_values.isEmpty() && !searchRecursively)
return;
// These are the non-matching modules.