Commit 841a86ad authored by con's avatar con
Browse files

Add a little combo box for tool chain selection.

Doesn't do anything else than showing the tool chains yet.
parent a3a7c27d
...@@ -271,5 +271,40 @@ void Qt4ProjectConfigWidget::qtVersionComboBoxCurrentIndexChanged(const QString ...@@ -271,5 +271,40 @@ void Qt4ProjectConfigWidget::qtVersionComboBoxCurrentIndexChanged(const QString
if (newQtVersion != m_pro->qtVersionId(m_buildConfiguration)) { if (newQtVersion != m_pro->qtVersionId(m_buildConfiguration)) {
m_pro->setQtVersion(m_buildConfiguration, newQtVersion); m_pro->setQtVersion(m_buildConfiguration, newQtVersion);
m_pro->update(); m_pro->update();
updateToolChainCombo();
} }
} }
void Qt4ProjectConfigWidget::updateToolChainCombo()
{
m_ui->toolChainComboBox->clear();
QList<ProjectExplorer::ToolChain::ToolChainType> toolchains = m_pro->qtVersion(m_buildConfiguration)->possibleToolChainTypes();
foreach (ProjectExplorer::ToolChain::ToolChainType toolchain, toolchains) {
switch (toolchain) {
case ProjectExplorer::ToolChain::GCC:
m_ui->toolChainComboBox->addItem(tr("gcc"), ProjectExplorer::ToolChain::GCC);
break;
case ProjectExplorer::ToolChain::LinuxICC:
m_ui->toolChainComboBox->addItem(tr("icc"), ProjectExplorer::ToolChain::LinuxICC);
break;
case ProjectExplorer::ToolChain::MinGW:
m_ui->toolChainComboBox->addItem(tr("mingw"), ProjectExplorer::ToolChain::MinGW);
break;
case ProjectExplorer::ToolChain::MSVC:
m_ui->toolChainComboBox->addItem(tr("msvc"), ProjectExplorer::ToolChain::MSVC);
break;
case ProjectExplorer::ToolChain::WINCE:
m_ui->toolChainComboBox->addItem(tr("wince"), ProjectExplorer::ToolChain::WINCE);
break;
#ifdef QTCREATOR_WITH_S60
case ProjectExplorer::ToolChain::WINSCW:
m_ui->toolChainComboBox->addItem(tr("winscw"), ProjectExplorer::ToolChain::WINSCW);
break;
case ProjectExplorer::ToolChain::GCCE:
m_ui->toolChainComboBox->addItem(tr("gcce"), ProjectExplorer::ToolChain::GCCE);
break;
#endif
}
}
m_ui->toolChainComboBox->setEnabled(toolchains.size() > 1);
}
...@@ -63,6 +63,7 @@ private slots: ...@@ -63,6 +63,7 @@ private slots:
void manageQtVersions(); void manageQtVersions();
private: private:
void updateToolChainCombo();
void updateImportLabel(); void updateImportLabel();
Ui::Qt4ProjectConfigWidget *m_ui; Ui::Qt4ProjectConfigWidget *m_ui;
Qt4Project *m_pro; Qt4Project *m_pro;
......
...@@ -87,21 +87,21 @@ ...@@ -87,21 +87,21 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="2" column="0"> <item row="3" column="0">
<widget class="QLabel" name="label"> <widget class="QLabel" name="label">
<property name="text"> <property name="text">
<string>Shadow Build:</string> <string>Shadow Build:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1"> <item row="3" column="1">
<widget class="QCheckBox" name="shadowBuildCheckBox"> <widget class="QCheckBox" name="shadowBuildCheckBox">
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="0"> <item row="4" column="0">
<widget class="QLabel" name="buildDirLabel"> <widget class="QLabel" name="buildDirLabel">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
...@@ -114,7 +114,7 @@ ...@@ -114,7 +114,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="1"> <item row="5" column="1">
<widget class="QLabel" name="importLabel"> <widget class="QLabel" name="importLabel">
<property name="text"> <property name="text">
<string>&lt;a href=&quot;import&quot;&gt;Import existing build&lt;/a&gt;</string> <string>&lt;a href=&quot;import&quot;&gt;Import existing build&lt;/a&gt;</string>
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="1"> <item row="4" column="1">
<widget class="Core::Utils::PathChooser" name="shadowBuildDirEdit" native="true"> <widget class="Core::Utils::PathChooser" name="shadowBuildDirEdit" native="true">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred"> <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
...@@ -134,6 +134,16 @@ ...@@ -134,6 +134,16 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1">
<widget class="QComboBox" name="toolChainComboBox"/>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Tool Chain:</string>
</property>
</widget>
</item>
</layout> </layout>
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment