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

CMakeProjectManager: Fix compile with Qt5.6 / gcc 4.8

Browse Source 
Broke with b3b6cfb5ef.

Change-Id: I0a105c16168a7b6652b8880c190dad309979ffff
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Christian Stenger
2016-10-04 06:52:56 +02:00
committed by Tim Jenssen
parent 137a34b9ca
commit d4024642fe
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -314,8 +314,8 @@ void CMakeGeneratorKitConfigWidget::changeGenerator()
auto *bb = new QDialogButtonBox(QDialogButtonBox::Ok|QDialogButtonBox::Cancel); auto *bb = new QDialogButtonBox(QDialogButtonBox::Ok|QDialogButtonBox::Cancel);
layout->addWidget(bb, row, 0, 1, 2); layout->addWidget(bb, row, 0, 1, 2);
connect(bb, &QDialogButtonBox::accepted, changeDialog, &QDialog::accept); connect(bb, &QDialogButtonBox::accepted, changeDialog.data(), &QDialog::accept);
connect(bb, &QDialogButtonBox::rejected, changeDialog, &QDialog::reject); connect(bb, &QDialogButtonBox::rejected, changeDialog.data(), &QDialog::reject);
cmakeLabel->setText(m_currentTool->cmakeExecutable().toUserOutput()); cmakeLabel->setText(m_currentTool->cmakeExecutable().toUserOutput());