diff --git a/src/plugins/genericprojectmanager/genericmakestep.h b/src/plugins/genericprojectmanager/genericmakestep.h index 43664124e79d36c9888637785426c4f5e29fab03..afcb48ead0c0164cd2d8fd279321a0a3537a91b5 100644 --- a/src/plugins/genericprojectmanager/genericmakestep.h +++ b/src/plugins/genericprojectmanager/genericmakestep.h @@ -81,8 +81,8 @@ private slots: void makeLineEditTextEdited(); void makeArgumentsLineEditTextEdited(); void updateMakeOverrrideLabel(); -private: void updateDetails(); +private: QString m_buildConfiguration; Ui::GenericMakeStep *m_ui; GenericMakeStep *m_makeStep; diff --git a/src/plugins/genericprojectmanager/genericproject.cpp b/src/plugins/genericprojectmanager/genericproject.cpp index 258e941975e9a45879cf9d2af745edc755bd799a..03762dbc9537c85ad20a02ec60a3a93a77d0350f 100644 --- a/src/plugins/genericprojectmanager/genericproject.cpp +++ b/src/plugins/genericprojectmanager/genericproject.cpp @@ -325,8 +325,9 @@ void GenericProject::setIncludePaths(const QStringList &includePaths) QByteArray GenericProject::defines() const { return m_defines; } -void GenericProject::setToolChainId(ProjectExplorer::ToolChain::ToolChainType toolChainId) +void GenericProject::setToolChainId(int t) { + ProjectExplorer::ToolChain::ToolChainType toolChainId = ProjectExplorer::ToolChain::ToolChainType(t); using namespace ProjectExplorer; m_toolChainId = toolChainId; diff --git a/src/plugins/genericprojectmanager/genericproject.h b/src/plugins/genericprojectmanager/genericproject.h index 7790a9995442126c9a38f80840e74b61d393c02b..c775d804c661b2a408ebb04812787fe56152ef87 100644 --- a/src/plugins/genericprojectmanager/genericproject.h +++ b/src/plugins/genericprojectmanager/genericproject.h @@ -114,7 +114,7 @@ public: ProjectExplorer::ToolChain::ToolChainType toolChainId() const; public Q_SLOTS: - void setToolChainId(ProjectExplorer::ToolChain::ToolChainType); + void setToolChainId(int); protected: virtual void saveSettingsImpl(ProjectExplorer::PersistentSettingsWriter &writer);