diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2017-05-21 08:26:29 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2017-05-21 08:26:29 +0100 |
| commit | 9f8fc3717508a6b8045f65e6c820692fb67dc450 (patch) | |
| tree | ad426afcaa91f61ecd669fbc416838f108554771 /tests/auto/animation/animation.pro | |
| parent | a830a9365832fd52c1849768543a64c55e4cee0a (diff) | |
| parent | cd9059a22604307f483764db134d51b15c540758 (diff) | |
Merge branch '5.9' into dev
Conflicts:
.qmake.conf
src/core/qscene.cpp
src/plugins/sceneparsers/gltf/gltfimporter.cpp
src/plugins/sceneparsers/gltfexport/gltfexporter.cpp
src/render/texture/gltexture.cpp
Change-Id: I7bde0fc0177eae252fef01cc43725fcf69c13a80
Diffstat (limited to 'tests/auto/animation/animation.pro')
| -rw-r--r-- | tests/auto/animation/animation.pro | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/tests/auto/animation/animation.pro b/tests/auto/animation/animation.pro index 969f477e7..b48fd347b 100644 --- a/tests/auto/animation/animation.pro +++ b/tests/auto/animation/animation.pro @@ -7,7 +7,13 @@ SUBDIRS += \ qblendedclipanimator \ qchannelmapping \ qchannelmapper \ - qclipblendvalue + qclipblendvalue \ + qanimationcontroller \ + qanimationgroup \ + qkeyframeanimation \ + qmorphinganimation \ + qmorphtarget \ + qvertexblendanimation qtConfig(private_tests) { SUBDIRS += \ @@ -27,5 +33,6 @@ qtConfig(private_tests) { qadditiveclipblend \ additiveclipblend \ clipblendvalue \ - animationutils + animationutils \ + qabstractanimation } |