Tim Jenssen 63d3a6bd3d Merge remote-tracking branch 'origin/8.0' into 9.0 ...

Conflicts:
  src/plugins/qmldesigner/components/assetslibrary/assetslibrarywidget.cpp
  src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp
  src/plugins/qmldesigner/qmldesignerplugin.cpp

Change-Id: I24216ae3f83cdde3493b4a6274e24a72f75820fc

2022-11-09 11:45:25 +01:00

18 KiB

Raw Blame History

View Raw