diff options
| author | Tobias Hunger <tobias.hunger@nokia.com> | 2012-02-07 17:22:05 +0100 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@nokia.com> | 2012-02-09 15:57:02 +0100 |
| commit | b4942447e8d5850bf3a47a12204d5377376f8178 (patch) | |
| tree | af4c568b1f2565ae0146cb8b48bbc8f32b99e3fc /src/plugins/projectexplorer/msvctoolchain.cpp | |
| parent | 73c325868339ff7717c4990f80361adaf2fb838d (diff) | |
| download | qt-creator-b4942447e8d5850bf3a47a12204d5377376f8178.tar.gz | |
Toolchain: Allow overriding of detected mkspec
Change-Id: I258a5a9dce400b256b7243fe9c5f3038822f1692
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Diffstat (limited to 'src/plugins/projectexplorer/msvctoolchain.cpp')
| -rw-r--r-- | src/plugins/projectexplorer/msvctoolchain.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/plugins/projectexplorer/msvctoolchain.cpp b/src/plugins/projectexplorer/msvctoolchain.cpp index 5874ca148b..bf3ba1b28b 100644 --- a/src/plugins/projectexplorer/msvctoolchain.cpp +++ b/src/plugins/projectexplorer/msvctoolchain.cpp @@ -328,7 +328,7 @@ QString MsvcToolChain::typeDisplayName() const return MsvcToolChainFactory::tr("MSVC"); } -Utils::FileName MsvcToolChain::mkspec() const +Utils::FileName MsvcToolChain::suggestedMkspec() const { if (m_abi.osFlavor() == Abi::WindowsMsvc2005Flavor) return Utils::FileName::fromString(QLatin1String("win32-msvc2005")); @@ -426,6 +426,7 @@ MsvcToolChainConfigWidget::MsvcToolChainConfigWidget(ToolChain *tc) : formLayout->addRow(new MsvcDebuggerConfigLabel); addDebuggerCommandControls(formLayout, QStringList(QLatin1String("-version"))); addDebuggerAutoDetection(this, SLOT(autoDetectDebugger())); + addMkspecControls(formLayout); addErrorLabel(formLayout); setFromToolChain(); } @@ -435,6 +436,7 @@ void MsvcToolChainConfigWidget::apply() MsvcToolChain *tc = static_cast<MsvcToolChain *>(toolChain()); QTC_ASSERT(tc, return; ); tc->setDebuggerCommand(debuggerCommand()); + tc->setMkspec(mkspec()); } void MsvcToolChainConfigWidget::setFromToolChain() @@ -448,13 +450,15 @@ void MsvcToolChainConfigWidget::setFromToolChain() } m_varsBatDisplayLabel->setText(varsBatDisplay); setDebuggerCommand(tc->debuggerCommand()); + setMkspec(tc->mkspec()); } bool MsvcToolChainConfigWidget::isDirty() const { MsvcToolChain *tc = static_cast<MsvcToolChain *>(toolChain()); QTC_ASSERT(tc, return false); - return debuggerCommand() != tc->debuggerCommand(); + return debuggerCommand() != tc->debuggerCommand() + || mkspec() != tc->mkspec(); } void MsvcToolChainConfigWidget::autoDetectDebugger() |