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/winrt/winrtdevicefactory.cpp

Change-Id: I33b8697e2ebf2bea051d7f1144449e0743ee16a5
This commit is contained in:
Eike Ziller
2018-11-19 09:48:28 +01:00
parent 40ad7ec995 e164717108
commit 3d1d9aae2e
110 changed files with 2004 additions and 809 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -121,7 +121,7 @@ bool SourceFilesHandler::setData(const QModelIndex &idx, const QVariant &data, i
QModelIndex index = idx.sibling(idx.row(), 0);
QString name = index.data().toString();
auto addAction = [menu](const QString &display, bool on, const std::function<void()> &onTriggered) {
auto addAction = [this, menu](const QString &display, bool on, const std::function<void()> &onTriggered) {
QAction *act = menu->addAction(display);
act->setEnabled(on);
QObject::connect(act, &QAction::triggered, onTriggered);