Added an API to retrieve the current run/build environment

Needed in order to provide the correct run environment when starting a
product from within Qt Creator.

Change-Id: Iaa1356845daf485d7f4b361a76b559b0b7339ee7
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

2 files changed, 15 insertions, 0 deletions

diff --git a/src/lib/corelib/api/runenvironment.cpp b/src/lib/corelib/api/runenvironment.cpp
index 386a1769d..e8face23f 100644
--- a/src/lib/corelib/api/runenvironment.cpp
+++ b/src/lib/corelib/api/runenvironment.cpp
@@ -198,4 +198,16 @@ int RunEnvironment::runTarget(const QString &targetBin, const QStringList &argum
     return process.exitCode();
 }
 
+const QProcessEnvironment RunEnvironment::runEnvironment() const
+{
+    d->resolvedProduct->setupRunEnvironment(&d->engine, d->environment);
+    return d->resolvedProduct->runEnvironment;
+}
+
+const QProcessEnvironment RunEnvironment::buildEnvironment() const
+{
+    d->resolvedProduct->setupBuildEnvironment(&d->engine, d->environment);
+    return d->resolvedProduct->buildEnvironment;
+}
+
 } // namespace qbs
diff --git a/src/lib/corelib/api/runenvironment.h b/src/lib/corelib/api/runenvironment.h
index 18ca65aae..f20fedbfc 100644
--- a/src/lib/corelib/api/runenvironment.h
+++ b/src/lib/corelib/api/runenvironment.h
@@ -57,6 +57,9 @@ public:
     int runShell();
     int runTarget(const QString &targetBin, const QStringList &arguments);
 
+    const QProcessEnvironment runEnvironment() const;
+    const QProcessEnvironment buildEnvironment() const;
+
 private:
     RunEnvironment(const Internal::ResolvedProductPtr &product,
                    const QProcessEnvironment &environment, Settings *settings,