diff options
| author | Tim Jenssen <tim.jenssen@qt.io> | 2020-06-26 15:13:07 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@qt.io> | 2020-06-26 16:51:22 +0200 |
| commit | b8cd87dea027f54957373a10c77a506ec2509b10 (patch) | |
| tree | ab7b00b4be9a46c1a0c89afaab7016444a257633 /src/libs/qmljs/qmljscheck.cpp | |
| parent | 97ac63b4012ab55def11a58ee6bd7b6878dc37e1 (diff) | |
| parent | 5a06305ffe054287f55cba4c5d860ea73fccf684 (diff) | |
| download | qt-creator-b8cd87dea027f54957373a10c77a506ec2509b10.tar.gz | |
Merge remote-tracking branch 'origin/qds-1.59' into 4.13
Conflicts:
src/plugins/clangformat/clangformatplugin.cpp
src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp
src/plugins/qmldesigner/qmldesigner.qbs
Change-Id: Ie4a0beeb9fd32ac9683f4e8769988a9c3f3e369a
Diffstat (limited to 'src/libs/qmljs/qmljscheck.cpp')
| -rw-r--r-- | src/libs/qmljs/qmljscheck.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/libs/qmljs/qmljscheck.cpp b/src/libs/qmljs/qmljscheck.cpp index 6527718c57..f58b414487 100644 --- a/src/libs/qmljs/qmljscheck.cpp +++ b/src/libs/qmljs/qmljscheck.cpp @@ -621,7 +621,6 @@ class UnsupportedTypesByQmlUi : public QStringList public: UnsupportedTypesByQmlUi() : QStringList({"ShaderEffect", "Component", - "Transition", "Drawer"}) { append(UnsupportedTypesByVisualDesigner()); |