Merge remote-tracking branch 'origin/7.0'

Change-Id: I3da1b663a570682201afbe644d6f9299019aae21
2022-04-26 15:22:35 +02:00
parent 3000a0e96f 099f02b5db
commit 3211d064e0
7 changed files with 138 additions and 9 deletions
--- a/src/libs/qmljs/qmljscheck.cpp
+++ b/src/libs/qmljs/qmljscheck.cpp
@@ -571,7 +571,9 @@ public:
                       "color", "margin", "padding", "print",   "border", "font",
                       "text",  "source", "state",   "visible", "focus",  "data",
                      "clip",  "layer",  "scale",   "enabled", "anchors",
-                      "texture", "shaderInfo", "sprite", "spriteSequence", "baseState"})
+                      "texture", "shaderInfo", "sprite", "spriteSequence", "baseState"
+                      "vector", "string", "url", "var", "point", "date", "size", "list",
+                      "enumeration"})
    {}
 };