summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Hunger <tobias.hunger@nokia.com>2011-04-13 15:50:14 +0200
committercon <qtc-committer@nokia.com>2011-04-27 08:55:36 +0200
commitfc46f300201a98664f7dc403ac4a51e35e536e8d (patch)
tree241315350b942297deae64aa737468aa0f5da31b
parent30b7370f5b3612934a7b3d8131801eacd2e26a54 (diff)
downloadqt-creator-fc46f300201a98664f7dc403ac4a51e35e536e8d.tar.gz
Stop QTC_ASSERT from being triggered
Set up UI elements before they are used. No crash since the elements are guarded by QTC_ASSERTs, but annoying output. (cherry picked from commit 1df460426b2e409cccdb38254261f75fa686e924)
-rw-r--r--src/plugins/projectexplorer/gcctoolchain.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/projectexplorer/gcctoolchain.cpp b/src/plugins/projectexplorer/gcctoolchain.cpp
index 60916585ac..e7474de133 100644
--- a/src/plugins/projectexplorer/gcctoolchain.cpp
+++ b/src/plugins/projectexplorer/gcctoolchain.cpp
@@ -567,14 +567,14 @@ Internal::GccToolChainConfigWidget::GccToolChainConfigWidget(GccToolChain *tc) :
connect(m_compilerPath, SIGNAL(changed(QString)), this, SLOT(handlePathChange()));
layout->addRow(tr("&Compiler path:"), m_compilerPath);
+ addDebuggerCommandControls(layout, gnuVersionArgs);
+ addErrorLabel(layout);
+
populateAbiList(tc->supportedAbis());
layout->addRow(tr("&ABI:"), m_abiComboBox);
connect(m_abiComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(handleAbiChange()));
- addDebuggerCommandControls(layout, gnuVersionArgs);
- addErrorLabel(layout);
-
setFromToolchain();
}