Merge remote-tracking branch 'origin/qmlprojectstorage'

Browse Source

Conflicts:
	src/plugins/qmldesigner/qmldesignerprojectmanager.cpp
	src/plugins/qmlprojectmanager/qmlproject.cpp
	src/plugins/qmlprojectmanager/qmlproject.h

Change-Id: I0c0d59c8e3b8455b6ac575d34fdf49f39388db7a
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>

...

This commit is contained in:

Tim Jenssen

2022-06-13 13:23:12 +02:00

parent 6aa826436c

commit c4e94c2c9c

34 changed files with 10581 additions and 4556 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

1058

tests/unit/unittest/projectstorage-test.cpp

File diff suppressed because it is too large Load Diff