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

Move KitAspectWidget definitions alongside their KitAspects

Browse Source 
A KitAspectWidget class is tightly coupled with the respective
KitAspect, and no one else ever needs to see any KitAspectWidget
subclass at build time.

Change-Id: I1883af3b054c225e1ff5dd913118715bfdbaacfc
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Kandeler
2019-02-06 15:04:17 +01:00
parent c129b8cfe2
commit ce19540b77
36 changed files with 1235 additions and 787 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/plugins/qmakeprojectmanager/qmakekitinformation.cpp
View File

@@ -25,7 +25,6 @@
#include "qmakekitinformation.h"
#include "qmakekitconfigwidget.h"
#include "qmakeprojectmanagerconstants.h"
#include <projectexplorer/projectexplorerconstants.h>
@@ -37,10 +36,57 @@
#include <utils/algorithm.h>
#include <utils/qtcassert.h>
#include <QLineEdit>
using namespace ProjectExplorer;
using namespace Utils;
namespace QmakeProjectManager {
namespace Internal {
class QmakeKitAspectWidget : public KitAspectWidget
{
Q_DECLARE_TR_FUNCTIONS(QmakeProjectManager::Internal::QmakeKitAspect)
public:
QmakeKitAspectWidget(Kit *k, const KitAspect *ki)
: KitAspectWidget(k, ki), m_lineEdit(new QLineEdit)
{
refresh(); // set up everything according to kit
m_lineEdit->setToolTip(toolTip());
connect(m_lineEdit, &QLineEdit::textEdited, this, &QmakeKitAspectWidget::mkspecWasChanged);
}
~QmakeKitAspectWidget() override { delete m_lineEdit; }
private:
QWidget *mainWidget() const override { return m_lineEdit; }
QString displayName() const override { return tr("Qt mkspec"); }
void makeReadOnly() override { m_lineEdit->setEnabled(false); }
QString toolTip() const override
{
return tr("The mkspec to use when building the project with qmake.<br>"
"This setting is ignored when using other build systems.");
}
void refresh() override
{
if (!m_ignoreChange)
m_lineEdit->setText(QmakeKitAspect::mkspec(m_kit).toUserOutput());
}
void mkspecWasChanged(const QString &text)
{
m_ignoreChange = true;
QmakeKitAspect::setMkspec(m_kit, Utils::FileName::fromString(text));
m_ignoreChange = false;
}
QLineEdit *m_lineEdit = nullptr;
bool m_ignoreChange = false;
};
QmakeKitAspect::QmakeKitAspect()
{
@@ -171,4 +217,5 @@ FileName QmakeKitAspect::defaultMkspec(const Kit *k)
ProjectExplorer::Constants::CXX_LANGUAGE_ID));
}
} // namespace Internal
} // namespace QmakeProjectManager