aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/corelib/buildgraph/productinstaller.cpp
diff options
context:
space:
mode:
authorJake Petroules <jake.petroules@petroules.com>2014-08-22 06:32:43 -0400
committerChristian Kandeler <christian.kandeler@digia.com>2014-08-28 15:21:53 +0200
commit58f3c809ec0c7e9a9ddc87a6baf926738513bbd0 (patch)
tree8fefe0a0663445b6b02cde68819d40605f18dc8f /src/lib/corelib/buildgraph/productinstaller.cpp
parent0182ef8978c2a5dd3845630f6213e76cca3fc0d9 (diff)
Fix run environment setup.
Now Darwin platforms get the same DYLD_* environment variables set as Xcode (plus Qt) so applications can be developed/tested without embedding bundles. This brings equivalent behavior to what already exists on Windows. This also fixes a regression introduced in 5877328c4dacb1283408083cb3538ea5bc46eae5 with the Node.js module, causing the working directory to be inappropriately changed by the run command. Change-Id: Ic2904f105378eb61d9236367329a2f9c8771a7d3 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Diffstat (limited to 'src/lib/corelib/buildgraph/productinstaller.cpp')
-rw-r--r--src/lib/corelib/buildgraph/productinstaller.cpp8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/lib/corelib/buildgraph/productinstaller.cpp b/src/lib/corelib/buildgraph/productinstaller.cpp
index c7df23d24..0acd515ae 100644
--- a/src/lib/corelib/buildgraph/productinstaller.cpp
+++ b/src/lib/corelib/buildgraph/productinstaller.cpp
@@ -123,13 +123,7 @@ void ProductInstaller::initInstallRoot(const TopLevelProject *project,
if (!options.installRoot().isEmpty())
return;
- if (options.installIntoSysroot()) {
- options.setInstallRoot(PropertyFinder().propertyValue(project->buildConfiguration(),
- QLatin1String("qbs"), QLatin1String("sysroot")).toString());
- } else {
- options.setInstallRoot(project->buildDirectory + QLatin1Char('/') +
- InstallOptions::defaultInstallRoot());
- }
+ options.setInstallRoot(effectiveInstallRoot(options, project));
}
void ProductInstaller::removeInstallRoot()