Merge remote-tracking branch 'origin/4.10'

Conflicts: cmake/QtCreatorIDEBranding.cmake qbs/modules/qtc/qtc.qbs qtcreator_ide_branding.pri src/plugins/projectexplorer/gcctoolchain.cpp src/plugins/qmldesigner/components/stateseditor/stateseditormodel.cpp Change-Id: Iffdf48e782a734107ea170ebb3812e997cea0e7b
2019-09-12 09:08:04 +02:00
parent 3a5ca31a7e a21df46481
commit 8df0653bf8
39 changed files with 234 additions and 81 deletions
--- a/src/libs/qmljs/qmljscheck.cpp
+++ b/src/libs/qmljs/qmljscheck.cpp
@@ -594,11 +594,7 @@ public:
 class UnsupportedTypesByVisualDesigner : public QStringList
 {
 public:
-    UnsupportedTypesByVisualDesigner() : QStringList({"Transform",
-                                                      "Timer",
-                                                      "Rotation",
-                                                      "Scale",
-                                                      "Translate",
+    UnsupportedTypesByVisualDesigner() : QStringList({"Timer",
                                                      "Package",
                                                      "Particles"})
    {}