diff options
author | Christian Kandeler <christian.kandeler@qt.io> | 2019-07-15 17:01:41 +0200 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@qt.io> | 2019-07-16 09:58:23 +0000 |
commit | cf641fc04f6a3ba1f467bcb36d8ab0fb90bdf8a9 (patch) | |
tree | 63970d48f374f14ea1d7e5d6297dc8f6d1449a00 /src | |
parent | 596d310d42c4e325c8de80a4c06b566f82f34d24 (diff) |
RemoteLinux: Suppress "-j" option in MakeInstallStep
Depending on the build system, the job count option as used in the
MakeStep class might not be available.
Task-number: QTCREATORBUG-22689
Change-Id: I8c6cf31bbd270816a527ab465a2125d7dfc1f7de
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Diffstat (limited to 'src')
-rw-r--r-- | src/plugins/projectexplorer/makestep.h | 2 | ||||
-rw-r--r-- | src/plugins/remotelinux/makeinstallstep.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/projectexplorer/makestep.h b/src/plugins/projectexplorer/makestep.h index e44b52851e..fffcb7e0d1 100644 --- a/src/plugins/projectexplorer/makestep.h +++ b/src/plugins/projectexplorer/makestep.h @@ -71,7 +71,7 @@ public: static QString msgNoMakeCommand(); static Task makeCommandMissingTask(); - bool isJobCountSupported() const; + virtual bool isJobCountSupported() const; int jobCount() const; void setJobCount(int count); bool jobCountOverridesMakeflags() const; diff --git a/src/plugins/remotelinux/makeinstallstep.h b/src/plugins/remotelinux/makeinstallstep.h index 5620c966b4..78f9029a9e 100644 --- a/src/plugins/remotelinux/makeinstallstep.h +++ b/src/plugins/remotelinux/makeinstallstep.h @@ -48,6 +48,7 @@ private: bool init() override; void finish(bool success) override; void stdError(const QString &line) override; + bool isJobCountSupported() const override { return false; } Utils::FilePath installRoot() const; bool cleanInstallRoot() const; |