forked from qt-creator/qt-creator
Merge remote-tracking branch 'origin/4.9'
Conflicts: qbs/modules/qtc/qtc.qbs qtcreator.pri src/tools/clangpchmanagerbackend/source/taskscheduler.h Change-Id: I518adaf647df412887c2a372416634359f09ad2a
This commit is contained in:
@@ -376,6 +376,8 @@ QWidget *FontSettingsPage::widget()
|
||||
this, &FontSettingsPage::colorSchemeSelected);
|
||||
connect(d_ptr->m_ui->copyButton, &QPushButton::clicked,
|
||||
this, &FontSettingsPage::openCopyColorSchemeDialog);
|
||||
connect(d_ptr->m_ui->schemeEdit, &ColorSchemeEdit::copyScheme,
|
||||
this, &FontSettingsPage::openCopyColorSchemeDialog);
|
||||
connect(d_ptr->m_ui->deleteButton, &QPushButton::clicked,
|
||||
this, &FontSettingsPage::confirmDeleteColorScheme);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user