aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/qbsprojectmanager/qbsrunconfiguration.h
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@theqtcompany.com>2015-08-20 18:02:07 +0200
committerChristian Kandeler <christian.kandeler@theqtcompany.com>2015-08-24 12:42:42 +0000
commit5f3b9dd89c6739024f4f3551d4f9354bd9a3985d (patch)
tree0344f6ab6f8430c887d9689d410ce37c78bd2a39 /src/plugins/qbsprojectmanager/qbsrunconfiguration.h
parentd0655e5cf241a9aa2f4fe0bb5a14e6f022daff8a (diff)
QbsProjectManager: Fix working directory handling.
Commit 2dbc5b1032 introduced usage of WorkingDirectoryAspect into the qbs run configurations for Desktop targets. However, the design of that class was not suitable for the way our working directory logic works: There typically is a user-provided value and, as a fallback if the user does not provide anything, a default value managed by (build system specific) code. The WorkingDirectoryAspect class could not differentiate between these two values and so the value stayed forever at the initial default if the user did not override it, instead of adapting to the location of the executable. This patch makes the necessary changes to the WorkingDirectoryAspect class so that it matches the actual use case. Task-number: QTCREATORBUG-14891 Change-Id: I7555d0a9cb4b04b75c9215a988278db32eb1ca10 Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Diffstat (limited to 'src/plugins/qbsprojectmanager/qbsrunconfiguration.h')
-rw-r--r--src/plugins/qbsprojectmanager/qbsrunconfiguration.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/plugins/qbsprojectmanager/qbsrunconfiguration.h b/src/plugins/qbsprojectmanager/qbsrunconfiguration.h
index d6e2be2f23..5d04c9da35 100644
--- a/src/plugins/qbsprojectmanager/qbsrunconfiguration.h
+++ b/src/plugins/qbsprojectmanager/qbsrunconfiguration.h
@@ -92,7 +92,6 @@ public:
bool isConsoleApplication() const;
signals:
- void baseWorkingDirectoryChanged(const QString&);
void targetInformationChanged();
void usingDyldImageSuffixChanged(bool);
@@ -104,7 +103,6 @@ private slots:
void installStepToBeRemoved(int pos);
private:
- void setBaseWorkingDirectory(const QString &workingDirectory);
QString baseWorkingDirectory() const;
QString defaultDisplayName();
qbs::InstallOptions installOptions() const;