diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-09-12 09:08:04 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-09-12 09:08:04 +0200 |
| commit | 8df0653bf8cbb7778d5ab3e32890005874a5a92a (patch) | |
| tree | 565663026d037862c755bcf80887138666bca7f2 /src/libs/qmljs | |
| parent | 3a5ca31a7ebcc43427802d52bc825e4869d8619d (diff) | |
| parent | a21df46481f580d0f74b5f82f3f3ce1df2445129 (diff) | |
| download | qt-creator-8df0653bf8cbb7778d5ab3e32890005874a5a92a.tar.gz | |
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
Diffstat (limited to 'src/libs/qmljs')
| -rw-r--r-- | src/libs/qmljs/qmljscheck.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/libs/qmljs/qmljscheck.cpp b/src/libs/qmljs/qmljscheck.cpp index 06dbe7d8d2..e3fe353b95 100644 --- 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"}) {} |