diff --git a/src/plugins/qt4projectmanager/debugginghelperbuildtask.cpp b/src/plugins/qt4projectmanager/debugginghelperbuildtask.cpp index b8b1c125cfb48798e6d1fe7016654d1bc0fc5af8..727abce72b633eb80c80aec63509c061ad4ff2c9 100644 --- a/src/plugins/qt4projectmanager/debugginghelperbuildtask.cpp +++ b/src/plugins/qt4projectmanager/debugginghelperbuildtask.cpp @@ -35,8 +35,8 @@ #include "qmldumptool.h" #include "qmlobservertool.h" #include "qmldebugginglibrary.h" -#include "qt4projectmanager/qt4projectmanagerconstants.h" - +#include <qt4projectmanager/qt4projectmanagerconstants.h> +#include <qt4projectmanager/qtversionmanager.h> #include <projectexplorer/toolchainmanager.h> #include <projectexplorer/debugginghelper.h> @@ -47,7 +47,7 @@ using namespace Qt4ProjectManager::Internal; using ProjectExplorer::DebuggingHelperLibrary; -DebuggingHelperBuildTask::DebuggingHelperBuildTask(QtVersion *version, Tools tools) +DebuggingHelperBuildTask::DebuggingHelperBuildTask(const QtVersion *version, Tools tools) { if (!version || !version->isValid()) return; diff --git a/src/plugins/qt4projectmanager/debugginghelperbuildtask.h b/src/plugins/qt4projectmanager/debugginghelperbuildtask.h index 8caa14a281c92e6746cd3dd8cfaac6c32832831e..45094b0c3641d071eb773601c34e6755f3f2138e 100644 --- a/src/plugins/qt4projectmanager/debugginghelperbuildtask.h +++ b/src/plugins/qt4projectmanager/debugginghelperbuildtask.h @@ -34,14 +34,14 @@ #ifndef DEBUGGINGHELPERBUILDTASK_H #define DEBUGGINGHELPERBUILDTASK_H -#include "qtversionmanager.h" - #include <utils/environment.h> #include <QtCore/QObject> +#include <QtCore/QFutureInterface> #include <QtCore/QMetaType> namespace Qt4ProjectManager { +class QtVersion; namespace Internal { class DebuggingHelperBuildTask : public QObject { @@ -57,7 +57,7 @@ public: }; Q_DECLARE_FLAGS(Tools, DebuggingHelper) - explicit DebuggingHelperBuildTask(QtVersion *version, Tools tools = AllTools); + explicit DebuggingHelperBuildTask(const QtVersion *version, Tools tools = AllTools); virtual ~DebuggingHelperBuildTask(); void run(QFutureInterface<void> &future);