diff options
author | Kai Koehne <kai.koehne@nokia.com> | 2011-07-21 16:46:10 +0200 |
---|---|---|
committer | Daniel Teske <daniel.teske@nokia.com> | 2011-07-22 12:07:50 +0200 |
commit | d943015c761011b2df111403abdeba454ad040ae (patch) | |
tree | 4ba6308d56d8095f4bc5cd1bcfdc0324a7c87ac0 /src/plugins/qtsupport/debugginghelperbuildtask.h | |
parent | 8d5b3677ea439266acb041c66f00a8d924cc1105 (diff) | |
download | qt-creator-d943015c761011b2df111403abdeba454ad040ae.tar.gz |
DebuggingHelper: Use right toolchain
Don't just use an arbitrary toolchain, which might break esp. for Symbian.
Instead, retrieve the toolchain from the project, or in the case of the Qt Options
page let the user choose.
Change-Id: I6d271c485420e609d223d8cece754ef84e573745
Reviewed-on: http://codereview.qt.nokia.com/1978
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Diffstat (limited to 'src/plugins/qtsupport/debugginghelperbuildtask.h')
-rw-r--r-- | src/plugins/qtsupport/debugginghelperbuildtask.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/plugins/qtsupport/debugginghelperbuildtask.h b/src/plugins/qtsupport/debugginghelperbuildtask.h index 9a0a7fceeb..464c7f53b4 100644 --- a/src/plugins/qtsupport/debugginghelperbuildtask.h +++ b/src/plugins/qtsupport/debugginghelperbuildtask.h @@ -35,6 +35,7 @@ #include "qtsupport_global.h" #include <utils/environment.h> +#include <projectexplorer/toolchain.h> #include <QtCore/QObject> #include <QtCore/QFutureInterface> @@ -56,7 +57,9 @@ public: }; Q_DECLARE_FLAGS(Tools, DebuggingHelper) - explicit DebuggingHelperBuildTask(const BaseQtVersion *version, Tools tools = AllTools); + explicit DebuggingHelperBuildTask(const BaseQtVersion *version, + ProjectExplorer::ToolChain *toolChain, + Tools tools = AllTools); virtual ~DebuggingHelperBuildTask(); void showOutputOnError(bool show); |