Tim Jenssen
|
c4e94c2c9c
|
Merge remote-tracking branch 'origin/qmlprojectstorage'
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>
|
2022-06-21 10:47:34 +00:00 |
|