Merge remote-tracking branch 'origin/4.3' into master

Change-Id: I01ab8c85ea3372b6dce4142ddb9cf92d903ffca6
2017-05-23 23:41:14 +03:00
parent d42e867f44 7482d8a152
commit 8430da3bf7
49 changed files with 610 additions and 277 deletions
--- a/src/libs/qmljs/qmljscheck.cpp
+++ b/src/libs/qmljs/qmljscheck.cpp
@@ -569,7 +569,6 @@ public:
                                             "ShaderEffect",
                                             "ShaderEffectSource",
                                             "Component",
-                                             "Loader",
                                             "Transition",
                                             "PropertyAnimation",
                                             "SequentialAnimation",