feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

toolchainoptionpage: make name editable next to other fields

Browse Source 
Change-Id: I35bc69c9c26a0cf4a8ed4e1e6044428d24cdb003
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
hjk
2012-08-16 15:59:10 +02:00
parent 6f32b8e257
commit 9589651999
16 changed files with 118 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/plugins/android/androidtoolchain.cpp
View File

@@ -44,6 +44,7 @@
#include <utils/environment.h>
#include <QDir>
#include <QFormLayout>
#include <QLabel>
#include <QVBoxLayout>
@@ -204,25 +205,8 @@ QList<Abi> AndroidToolChain::detectSupportedAbis() const
AndroidToolChainConfigWidget::AndroidToolChainConfigWidget(AndroidToolChain *tc) :
ToolChainConfigWidget(tc)
{
QVBoxLayout *layout = new QVBoxLayout(this);
QLabel *label = new QLabel;
label->setText(tr("NDK Root: %1").arg(AndroidConfigurations::instance().config().ndkLocation.toUserOutput()));
layout->addWidget(label);
}
void AndroidToolChainConfigWidget::apply()
{
// nothing to do!
}
void AndroidToolChainConfigWidget::discard()
{
// nothing to do!
}
bool AndroidToolChainConfigWidget::isDirty() const
{
return false;
QLabel *label = new QLabel(AndroidConfigurations::instance().config().ndkLocation.toUserOutput());
m_mainLayout->addRow(tr("NDK Root:"), label);
}
// --------------------------------------------------------------------------

8
src/plugins/android/androidtoolchain.h
View File

@@ -80,9 +80,11 @@ class AndroidToolChainConfigWidget : public ProjectExplorer::ToolChainConfigWidg
public:
AndroidToolChainConfigWidget(AndroidToolChain *);
void apply();
void discard();
bool isDirty() const;
private:
void applyImpl() {}
void discardImpl() {}
bool isDirtyImpl() const { return false; }
void makeReadOnlyImpl() {}
};