Merge remote-tracking branch 'origin/5.0'

Change-Id: I9409f35cb9d1bc2e57631d2bfa3a0931ff5dd259
2021-07-21 09:18:52 +02:00
parent 0adb502457 f9893f5883
commit f46c8b5c92
109 changed files with 5149 additions and 4095 deletions
--- a/src/libs/qmljs/qmljscheck.cpp
+++ b/src/libs/qmljs/qmljscheck.cpp
@@ -608,9 +608,8 @@ public:
 class UnsupportedTypesByVisualDesigner : public QStringList
 {
 public:
-    UnsupportedTypesByVisualDesigner() : QStringList({"Timer",
-                                                      "Package",
-                                                      "Particles"})
+    UnsupportedTypesByVisualDesigner()
+        : QStringList({"Timer", "Package", "Particles", "ApplicationWindow"})
    {}
 };

@@ -628,11 +627,13 @@ public:
 class UnsupportedRootObjectTypesByVisualDesigner : public QStringList
 {
 public:
-    UnsupportedRootObjectTypesByVisualDesigner() : QStringList({"QtObject"
-                                                                "ListModel"
-                                                                "Component"
-                                                                "Timer"
-                                                                "Package"})
+    UnsupportedRootObjectTypesByVisualDesigner()
+        : QStringList({"QtObject"
+                       "ListModel"
+                       "Component"
+                       "Timer"
+                       "Package",
+                       "ApplicationWindow"})
    {}
 };