Commit 26add38c authored by Friedemann Kleint's avatar Friedemann Kleint

MSVC Toolchain: Add an informative label displaying the .bat.

and the argument.

Change-Id: I3ff5e2a7719e19e43952c481b6dbdb31428c979a
Reviewed-on: http://codereview.qt.nokia.com/1580Reviewed-by: default avatarDaniel Teske <daniel.teske@nokia.com>
parent ec7525be
......@@ -563,10 +563,13 @@ void MsvcDebuggerConfigLabel::slotLinkActivated(const QString &link)
// --------------------------------------------------------------------------
MsvcToolChainConfigWidget::MsvcToolChainConfigWidget(ToolChain *tc) :
ToolChainConfigWidget(tc)
ToolChainConfigWidget(tc),
m_varsBatDisplayLabel(new QLabel(this))
{
QFormLayout *formLayout = new QFormLayout(this);
formLayout->addRow(new QLabel(tc->displayName()));
m_varsBatDisplayLabel->setTextInteractionFlags(Qt::TextBrowserInteraction);
formLayout->addRow(tr("Initialization:"), m_varsBatDisplayLabel);
formLayout->addRow(new MsvcDebuggerConfigLabel);
addDebuggerCommandControls(formLayout, QStringList(QLatin1String("-version")));
addDebuggerAutoDetection(this, SLOT(autoDetectDebugger()));
......@@ -585,6 +588,12 @@ void MsvcToolChainConfigWidget::setFromToolChain()
{
MsvcToolChain *tc = static_cast<MsvcToolChain *>(toolChain());
QTC_ASSERT(tc, return);
QString varsBatDisplay = tc->varsBat();
if (!tc->varsBatArg().isEmpty()) {
varsBatDisplay += QLatin1Char(' ');
varsBatDisplay += tc->varsBatArg();
}
m_varsBatDisplayLabel->setText(varsBatDisplay);
setDebuggerCommand(tc->debuggerCommand());
}
......
......@@ -81,6 +81,9 @@ public:
bool canClone() const;
ToolChain *clone() const;
QString varsBat() const { return m_varsBat; }
QString varsBatArg() const { return m_varsBatArg; }
static QString autoDetectCdbDebugger(QStringList *checkedDirectories = 0);
private:
......@@ -155,6 +158,8 @@ private slots:
private:
void setFromToolChain();
QLabel *m_varsBatDisplayLabel;
};
} // namespace Internal
......
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