Merge remote-tracking branch 'origin/10.0'

Conflicts:
	src/plugins/python/pipsupport.cpp
	src/plugins/qtsupport/exampleslistmodel.cpp
	src/plugins/qtsupport/examplesparser.cpp
	tests/auto/examples/tst_examples.cpp

Change-Id: I00273622423fa99d41621969f6ecbbdaa0e18664
This commit is contained in:
Eike Ziller
2023-04-13 15:59:08 +02:00
97 changed files with 550 additions and 328 deletions

View File

@@ -10,6 +10,7 @@ add_qtc_plugin(GenericProjectManager
genericproject.cpp genericproject.h
genericprojectconstants.h
genericprojectfileseditor.cpp genericprojectfileseditor.h
genericprojectmanagertr.h
genericprojectplugin.cpp genericprojectplugin.h
genericprojectwizard.cpp genericprojectwizard.h
)