diff options
| author | Christian Kandeler <christian.kandeler@digia.com> | 2014-02-26 14:56:38 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2014-02-26 17:51:38 +0100 |
| commit | 78fa3cbf4ffdc1c7469e471e6b0349b3b5a14931 (patch) | |
| tree | 391d366e9b5ededa29cd20535f69c9f74b8c8b2c /src/lib/corelib/api/runenvironment.cpp | |
| parent | 3db9811427b737d7f116578ead054d18876c93db (diff) | |
Do not share product properties with artifacts.
Since products potentially share their property maps with their groups,
artifacts get product properties such as "name" and
"destinationDirectory". This is strange and can mess with change
tracking. Therefore we split up the product's property map in two: One
contains the module properties and is potentially shared with groups,
the other has the actual product properties and is not shared.
This patch also removes a workaround from an autotest that was required
until now to prevent a false positive in change tracking.
Change-Id: Ia1f1f0ce32669fd893a99f809753df526bf1442a
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'src/lib/corelib/api/runenvironment.cpp')
| -rw-r--r-- | src/lib/corelib/api/runenvironment.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/corelib/api/runenvironment.cpp b/src/lib/corelib/api/runenvironment.cpp index 25ec6ab46..b0be216f8 100644 --- a/src/lib/corelib/api/runenvironment.cpp +++ b/src/lib/corelib/api/runenvironment.cpp @@ -132,7 +132,7 @@ int RunEnvironment::runShell() int RunEnvironment::runTarget(const QString &targetBin, const QStringList &arguments) { const QStringList targetOS = PropertyFinder().propertyValue( - d->resolvedProduct->properties->value(), + d->resolvedProduct->moduleProperties->value(), QLatin1String("qbs"), QLatin1String("targetOS")).toStringList(); |