aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@digia.com>2014-10-02 17:27:31 +0200
committerJoerg Bornemann <joerg.bornemann@digia.com>2014-10-02 18:13:24 +0200
commitb3321f0b83e2c13d48ed810ba5a28e9bfcfc881d (patch)
treef3f125e53e6535d836d11f2e7a4e5f6f4b88f975
parent05257e61f2af9abe663ee059db38f83e8b0777fe (diff)
Make the "sourceDirectory" property get inherited by sub-projects.
Change-Id: I3bfa722cdae4a68d779019bc3660aef289b8154e Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
-rw-r--r--src/lib/corelib/language/moduleloader.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/corelib/language/moduleloader.cpp b/src/lib/corelib/language/moduleloader.cpp
index 0070544d3..60f7d74a0 100644
--- a/src/lib/corelib/language/moduleloader.cpp
+++ b/src/lib/corelib/language/moduleloader.cpp
@@ -1174,7 +1174,8 @@ void ModuleLoader::copyProperties(const Item *sourceProject, Item *targetProject
// We must not inherit built-in properties such as "name",
// but there are exceptions.
if (it.key() == QLatin1String("qbsSearchPaths") || it.key() == QLatin1String("profile")
- || it.key() == QLatin1String("buildDirectory")) {
+ || it.key() == QLatin1String("buildDirectory")
+ || it.key() == QLatin1String("sourceDirectory")) {
const JSSourceValueConstPtr &v
= targetProject->property(it.key()).dynamicCast<const JSSourceValue>();
QBS_ASSERT(v, continue);