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

Merge remote-tracking branch 'origin/4.8'

Browse Source 
Conflicts:
	src/plugins/coreplugin/dialogs/externaltoolconfig.ui

Change-Id: Ie38e9028cee599578c59b22325d85c097335243e
This commit is contained in:
Eike Ziller
2019-01-07 13:24:12 +01:00
parent 9ee785a4ef bcafe202c9
commit 04a4bacbf9
39 changed files with 1074 additions and 880 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/coreplugin/dialogs/externaltoolconfig.cpp
View File

@@ -411,6 +411,8 @@ ExternalToolConfig::ExternalToolConfig(QWidget *parent) :
m_model(new ExternalToolModel(this))
{
ui->setupUi(this);
ui->scrollArea->viewport()->setAutoFillBackground(false);
ui->scrollAreaWidgetContents->setAutoFillBackground(false);
ui->toolTree->setModel(m_model);
ui->toolTree->setEditTriggers(QAbstractItemView::DoubleClicked | QAbstractItemView::EditKeyPressed);