Merge remote-tracking branch 'origin/qds-1.59' into 4.13

Conflicts: src/plugins/clangformat/clangformatplugin.cpp src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp src/plugins/qmldesigner/qmldesigner.qbs Change-Id: Ie4a0beeb9fd32ac9683f4e8769988a9c3f3e369a
2020-06-26 15:13:07 +02:00
parent 97ac63b401 5a06305ffe
commit b8cd87dea0
123 changed files with 7677 additions and 311 deletions
--- a/src/libs/qmljs/qmljscheck.cpp
+++ b/src/libs/qmljs/qmljscheck.cpp
@@ -621,7 +621,6 @@ class UnsupportedTypesByQmlUi : public QStringList
 public:
    UnsupportedTypesByQmlUi() : QStringList({"ShaderEffect",
                                             "Component",
-                                             "Transition",
                                             "Drawer"})
    {
        append(UnsupportedTypesByVisualDesigner());