diff options
Diffstat (limited to 'src/plugins/projectexplorer/gcctoolchain.cpp')
| -rw-r--r-- | src/plugins/projectexplorer/gcctoolchain.cpp | 34 |
1 files changed, 20 insertions, 14 deletions
diff --git a/src/plugins/projectexplorer/gcctoolchain.cpp b/src/plugins/projectexplorer/gcctoolchain.cpp index 318868dbd0..84058b072a 100644 --- a/src/plugins/projectexplorer/gcctoolchain.cpp +++ b/src/plugins/projectexplorer/gcctoolchain.cpp @@ -4,28 +4,27 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: Nokia Corporation (info@qt.nokia.com) ** -** No Commercial Usage -** -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. ** ** GNU Lesser General Public License Usage ** -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this file. +** Please review the following information to ensure the GNU Lesser General +** Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** +** Other Usage +** +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. +** ** If you have questions regarding the use of this file, please contact ** Nokia at qt-info@nokia.com. ** @@ -598,6 +597,7 @@ void Internal::GccToolChainConfigWidget::apply() tc->setTargetAbi(m_abiList.at(m_abiComboBox->currentIndex())); tc->setDisplayName(displayName); // reset display name tc->setDebuggerCommand(debuggerCommand()); + m_autoDebuggerCommand = QLatin1String("<manually set>"); } void Internal::GccToolChainConfigWidget::populateAbiList(const QList<Abi> &list) @@ -616,6 +616,7 @@ void Internal::GccToolChainConfigWidget::populateAbiList(const QList<Abi> &list) if (m_abiList.at(i) == currentAbi) m_abiComboBox->setCurrentIndex(i); } + handleAbiChange(); } void Internal::GccToolChainConfigWidget::setFromToolchain() @@ -654,6 +655,11 @@ void Internal::GccToolChainConfigWidget::handlePathChange() void Internal::GccToolChainConfigWidget::handleAbiChange() { + if (m_autoDebuggerCommand == debuggerCommand() && m_abiComboBox->currentIndex() >= 0) { + ProjectExplorer::Abi abi = m_abiList.at(m_abiComboBox->currentIndex()); + m_autoDebuggerCommand = ToolChainManager::instance()->defaultDebugger(abi); + setDebuggerCommand(m_autoDebuggerCommand); + } emit dirty(toolChain()); } |