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

Merge remote-tracking branch 'origin/9.0'

Browse Source 
Conflicts:
	src/libs/utils/pathchooser.cpp
	src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp

Change-Id: I7ae3f91618c4a4ccb088679caea72b2a81590960
This commit is contained in:
Eike Ziller
2023-01-13 09:16:25 +01:00
parent ccff024a66 1b6d434c9c
commit 2688a9629c
9 changed files with 224 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/coreplugin/manhattanstyle.cpp
View File

@@ -391,8 +391,10 @@ int ManhattanStyle::styleHint(StyleHint hint, const QStyleOption *option, const
ret = 0;
break;
case QStyle::SH_ComboBox_AllowWheelScrolling:
// Turn this off completely to prevent accidental current index change on a scroll view
ret = false;
// Turn this on only when simultaneously pressing Ctrl, to prevent accidental current
// index change, e.g. on a scroll view
ret = QGuiApplication::keyboardModifiers()
== (HostOsInfo::isMacHost() ? Qt::MetaModifier : Qt::ControlModifier);
break;
default:
break;