diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2017-05-23 23:41:14 +0300 |
|---|---|---|
| committer | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2017-05-23 23:41:40 +0300 |
| commit | 8430da3bf7f495ecfe84b36421d4da801cf0f6a5 (patch) | |
| tree | 805d10955fa65e635077038f5fb54bb0e0b168eb /src/libs/qmljs/qmljscheck.cpp | |
| parent | d42e867f441f90bf127c3fc8571b862bb4a9596a (diff) | |
| parent | 7482d8a15239ee1cb289953f7d8ce167583b6261 (diff) | |
| download | qt-creator-8430da3bf7f495ecfe84b36421d4da801cf0f6a5.tar.gz | |
Merge remote-tracking branch 'origin/4.3' into master
Change-Id: I01ab8c85ea3372b6dce4142ddb9cf92d903ffca6
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 bd7073ead8..911b46d906 100644 --- a/src/libs/qmljs/qmljscheck.cpp +++ b/src/libs/qmljs/qmljscheck.cpp @@ -569,7 +569,6 @@ public: "ShaderEffect", "ShaderEffectSource", "Component", - "Loader", "Transition", "PropertyAnimation", "SequentialAnimation", |