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

Merge remote-tracking branch 'origin/4.8' into 4.9

Browse Source 
Change-Id: I8c11be2a6cb4301be4ef639ba25ee9735960db71
This commit is contained in:
Eike Ziller
2019-02-11 10:37:12 +01:00
parent 963dc84cc5 b71a6eec20
commit 1a37a2b6aa
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -406,6 +406,7 @@ ExternalToolConfig::ExternalToolConfig(QWidget *parent) :
m_model(new ExternalToolModel(this)) m_model(new ExternalToolModel(this))
{ {
ui->setupUi(this); ui->setupUi(this);
ui->executable->setExpectedKind(Utils::PathChooser::ExistingCommand);
ui->scrollArea->viewport()->setAutoFillBackground(false); ui->scrollArea->viewport()->setAutoFillBackground(false);
ui->scrollAreaWidgetContents->setAutoFillBackground(false); ui->scrollAreaWidgetContents->setAutoFillBackground(false);
ui->toolTree->setModel(m_model); ui->toolTree->setModel(m_model);

2
src/plugins/debugger/threadshandler.cpp
View File

@@ -409,7 +409,7 @@ void ThreadsHandler::setThreads(const GdbMi &data)
if (!m_currentThread && threads.childCount() > 0) if (!m_currentThread && threads.childCount() > 0)
m_currentThread = rootItem()->childAt(0); m_currentThread = rootItem()->childAt(0);
if (!m_currentThread) { if (m_currentThread) {
const QModelIndex currentThreadIndex = m_currentThread->index(); const QModelIndex currentThreadIndex = m_currentThread->index();
threadSwitcher()->setCurrentIndex(currentThreadIndex.row()); threadSwitcher()->setCurrentIndex(currentThreadIndex.row());
} }