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

Merge remote-tracking branch 'origin/4.11'

Browse Source 
Conflicts:
	src/plugins/designer/codemodelhelpers.cpp

Change-Id: I78906f2fbbfd27d254589a272ebca423b0b80699
This commit is contained in:
Eike Ziller
2019-11-28 08:24:10 +01:00
parent 2059cb31f0 6b1d54421e
commit 6fc85b49fa
125 changed files with 2380 additions and 881 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/cmakeprojectmanager/cmakekitinformation.cpp
View File

@@ -318,7 +318,7 @@ class CMakeGeneratorKitAspectWidget : public KitAspectWidget
public:
CMakeGeneratorKitAspectWidget(Kit *kit, const ::KitAspect *ki)
: KitAspectWidget(kit, ki),
m_label(new QLabel),
m_label(new Utils::ElidingLabel),
m_changeButton(new QPushButton)
{
m_label->setToolTip(ki->description());
@@ -459,7 +459,7 @@ private:
}
bool m_ignoreChange = false;
QLabel *m_label;
Utils::ElidingLabel *m_label;
QPushButton *m_changeButton;
CMakeTool *m_currentTool = nullptr;
};