feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix slot connections in the generic project manager.

Browse Source
This commit is contained in:
dt
2009-08-17 18:19:16 +02:00
parent 7e0b2081ef
commit ffe74d4447
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/genericprojectmanager/genericmakestep.h
View File

@@ -81,8 +81,8 @@ private slots:
void makeLineEditTextEdited(); void makeLineEditTextEdited();
void makeArgumentsLineEditTextEdited(); void makeArgumentsLineEditTextEdited();
void updateMakeOverrrideLabel(); void updateMakeOverrrideLabel();
private:
void updateDetails(); void updateDetails();
private:
QString m_buildConfiguration; QString m_buildConfiguration;
Ui::GenericMakeStep *m_ui; Ui::GenericMakeStep *m_ui;
GenericMakeStep *m_makeStep; GenericMakeStep *m_makeStep;

3
src/plugins/genericprojectmanager/genericproject.cpp
View File

@@ -325,8 +325,9 @@ void GenericProject::setIncludePaths(const QStringList &includePaths)
QByteArray GenericProject::defines() const QByteArray GenericProject::defines() const
{ return m_defines; } { 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; using namespace ProjectExplorer;
m_toolChainId = toolChainId; m_toolChainId = toolChainId;

2
src/plugins/genericprojectmanager/genericproject.h
View File

@@ -114,7 +114,7 @@ public:
ProjectExplorer::ToolChain::ToolChainType toolChainId() const; ProjectExplorer::ToolChain::ToolChainType toolChainId() const;
public Q_SLOTS: public Q_SLOTS:
void setToolChainId(ProjectExplorer::ToolChain::ToolChainType); void setToolChainId(int);
protected: protected:
virtual void saveSettingsImpl(ProjectExplorer::PersistentSettingsWriter &writer); virtual void saveSettingsImpl(ProjectExplorer::PersistentSettingsWriter &writer);