diff options
| author | Jake Petroules <jake.petroules@petroules.com> | 2014-08-22 06:32:43 -0400 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2014-08-28 15:21:53 +0200 |
| commit | 58f3c809ec0c7e9a9ddc87a6baf926738513bbd0 (patch) | |
| tree | 8fefe0a0663445b6b02cde68819d40605f18dc8f /src/lib/corelib/tools/installoptions.h | |
| parent | 0182ef8978c2a5dd3845630f6213e76cca3fc0d9 (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/tools/installoptions.h')
| -rw-r--r-- | src/lib/corelib/tools/installoptions.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/lib/corelib/tools/installoptions.h b/src/lib/corelib/tools/installoptions.h index 2b6194fb0..ef0ac4253 100644 --- a/src/lib/corelib/tools/installoptions.h +++ b/src/lib/corelib/tools/installoptions.h @@ -35,7 +35,12 @@ #include <QString> namespace qbs { -namespace Internal { class InstallOptionsPrivate; } +class InstallOptions; +namespace Internal { +class InstallOptionsPrivate; +class TopLevelProject; +QString effectiveInstallRoot(const InstallOptions &options, const TopLevelProject *project); +} class QBS_EXPORT InstallOptions { |