Merge remote-tracking branch 'origin/4.9'

Conflicts:
	doc/src/howto/creator-sidebar-views.qdoc
	doc/src/howto/creator-ui.qdoc
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri
	src/plugins/autotest/testresultmodel.cpp
	src/plugins/autotest/testresultmodel.h

Change-Id: I24cc585ca7782cb1d9cb0b8b73b46892b41937fd
This commit is contained in:
Eike Ziller
2019-05-08 12:41:25 +02:00
108 changed files with 1536 additions and 737 deletions

View File

@@ -99,9 +99,9 @@ def main():
args = parse_arguments()
base_repo_name = args.name if args.name else "qtcreator"
if not args.name and not args.modules: # default Qt Creator repository
qbs_path = os.path.join('src', 'shared', 'qbs')
if os.path.exists(os.path.join(args.repo, qbs_path)):
args.modules = [qbs_path]
submodules = [os.path.join('src', 'shared', 'qbs'),
os.path.join('src', 'tools', 'perfparser')]
args.modules = [path for path in submodules if os.path.exists(os.path.join(args.repo, path, '.git'))]
repos = [(base_repo_name, args.repo, '')]
for module in args.modules:
repos += [(module, os.path.join(args.repo, module), module + os.sep)]