Merge remote-tracking branch 'origin/qds/dev'

Conflicts:
	doc/qtcreator/src/overview/creator-only/creator-keyboard-shortcuts.qdoc
	doc/qtcreator/src/qtquick/qtquick-live-preview-devices.qdoc
	doc/qtcreator/src/qtquick/qtquick-profiler.qdoc
	src/plugins/qmlprojectmanager/qmlprojectmanager.qbs
	src/plugins/remotelinux/linuxdevicetester.cpp

Change-Id: I3683c1799df05209d05413383456b285a2daf96e
This commit is contained in:
Tim Jenssen
2024-04-23 14:36:48 +02:00
718 changed files with 20624 additions and 11600 deletions

View File

@@ -2575,6 +2575,7 @@ void ICorePrivate::changeLog()
});
auto versionCombo = new QComboBox;
versionCombo->setMinimumWidth(80);
for (const VersionFilePair &f : versionedFiles)
versionCombo->addItem(f.first.toString());
dialog = new LogDialog(ICore::dialogParent());