diff options
author | dt <qtc-committer@nokia.com> | 2009-08-17 18:19:16 +0200 |
---|---|---|
committer | dt <qtc-committer@nokia.com> | 2009-08-18 13:54:41 +0200 |
commit | ffe74d4447d674352c85dce7ef90e9bf0d3f100e (patch) | |
tree | 1706b5ad3f0f29c66c1f8193ca479354654ae3c4 | |
parent | 7e0b2081efc1d829f068453502f2d902827fab68 (diff) |
Fix slot connections in the generic project manager.
-rw-r--r-- | src/plugins/genericprojectmanager/genericmakestep.h | 2 | ||||
-rw-r--r-- | src/plugins/genericprojectmanager/genericproject.cpp | 3 | ||||
-rw-r--r-- | src/plugins/genericprojectmanager/genericproject.h | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/plugins/genericprojectmanager/genericmakestep.h b/src/plugins/genericprojectmanager/genericmakestep.h index 43664124e79..afcb48ead0c 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 258e941975e..03762dbc953 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 7790a999544..c775d804c66 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); |