forked from qt-creator/qt-creator
Merge remote-tracking branch 'origin/14.0'
Conflicts: cmake/QtCreatorIDEBranding.cmake qbs/modules/qtc/qtc.qbs src/libs/solutions/tasking/tasktree.cpp src/plugins/coreplugin/imode.cpp src/plugins/cppeditor/cpphighlighter.cpp Change-Id: I5114911d18e377076c5c07b27d6ca918774f34b9
This commit is contained in:
@@ -1827,6 +1827,7 @@ bool WatchModel::contextMenuEvent(const ItemViewEvent &ev)
|
||||
menu->addAction(s.settingsDialog.action());
|
||||
|
||||
// useDebuggingHelpers/useDynamicType have no auto-apply, but need to be persisted on triggered
|
||||
connect(this, &WatchModel::dataChanged, menu, &QMenu::close);
|
||||
connect(debugHelperAction, &QAction::triggered,
|
||||
&s.useDebuggingHelpers, &BoolAspect::writeSettings, Qt::UniqueConnection);
|
||||
connect(dynamicTypeAction, &QAction::triggered,
|
||||
|
||||
Reference in New Issue
Block a user