Fix animation cmake projects

Change-Id: If2a92b254ea7bb227f2fc608d93937de7088d805
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

19 files changed, 27 insertions, 27 deletions

diff --git a/src/animation/CMakeLists.txt b/src/animation/CMakeLists.txt
index d62d2299a..fcfb527fd 100644
--- a/src/animation/CMakeLists.txt
+++ b/src/animation/CMakeLists.txt
@@ -46,7 +46,7 @@ qt_add_module(3DAnimation
         frontend/qanimationcallback.h
         frontend/qanimationclip.cpp frontend/qanimationclip.h frontend/qanimationclip_p.h
         frontend/qanimationclipdata.cpp frontend/qanimationclipdata.h
-        frontend/qanimationcliploader.cpp frontend/qanimationcliploader.h
+        frontend/qanimationcliploader.cpp frontend/qanimationcliploader.h frontend/qanimationcliploader_p.h
         frontend/qanimationcontroller.cpp frontend/qanimationcontroller.h frontend/qanimationcontroller_p.h
         frontend/qanimationgroup.cpp frontend/qanimationgroup.h frontend/qanimationgroup_p.h
         frontend/qblendedclipanimator.cpp frontend/qblendedclipanimator.h frontend/qblendedclipanimator_p.h
diff --git a/src/quick3d/imports/animation/CMakeLists.txt b/src/quick3d/imports/animation/CMakeLists.txt
index 0991bd68c..17de3b0f7 100644
--- a/src/quick3d/imports/animation/CMakeLists.txt
+++ b/src/quick3d/imports/animation/CMakeLists.txt
@@ -12,7 +12,7 @@ qt_add_qml_module(quick3danimationplugin
     SOURCES
         qt3dquick3danimationplugin.cpp qt3dquick3danimationplugin.h
     PUBLIC_LIBRARIES
-        3DAnimation
+        Qt::3DAnimation
         Qt::3DCore
         Qt::3DQuick
         Qt::3DQuickPrivate
diff --git a/src/quick3d/imports/scene3d/CMakeLists.txt b/src/quick3d/imports/scene3d/CMakeLists.txt
index 4af7f4cbf..d5f86f563 100644
--- a/src/quick3d/imports/scene3d/CMakeLists.txt
+++ b/src/quick3d/imports/scene3d/CMakeLists.txt
@@ -50,5 +50,5 @@ qt_extend_target(qtquickscene3dplugin CONDITION QT_FEATURE_qt3d_logic
 
 qt_extend_target(qtquickscene3dplugin CONDITION QT_FEATURE_qt3d_animation
     PUBLIC_LIBRARIES
-        3DAnimation
+        Qt::3DAnimation
 )
diff --git a/src/quick3d/quick3danimation/CMakeLists.txt b/src/quick3d/quick3danimation/CMakeLists.txt
index ab34453f4..ee8d41e99 100644
--- a/src/quick3d/quick3danimation/CMakeLists.txt
+++ b/src/quick3d/quick3danimation/CMakeLists.txt
@@ -21,7 +21,7 @@ qt_add_module(3DQuickAnimation
         Qt::CorePrivate
         Qt::QmlPrivate
     PUBLIC_LIBRARIES
-        3DAnimation
+        Qt::3DAnimation
         Qt::3DCore
         Qt::3DCorePrivate
         Qt::3DQuick
diff --git a/tests/auto/animation/qanimationaspect/CMakeLists.txt b/tests/auto/animation/qanimationaspect/CMakeLists.txt
index 0376d9c74..2b87cf024 100644
--- a/tests/auto/animation/qanimationaspect/CMakeLists.txt
+++ b/tests/auto/animation/qanimationaspect/CMakeLists.txt
@@ -8,7 +8,7 @@ qt_add_test(tst_qanimationaspect
     SOURCES
         tst_qanimationaspect.cpp
     PUBLIC_LIBRARIES
-        3DAnimation
+        Qt::3DAnimation
         Qt::CorePrivate
         Qt::Gui
 )
diff --git a/tests/auto/animation/qanimationcliploader/CMakeLists.txt b/tests/auto/animation/qanimationcliploader/CMakeLists.txt
index 72e179601..8306868dd 100644
--- a/tests/auto/animation/qanimationcliploader/CMakeLists.txt
+++ b/tests/auto/animation/qanimationcliploader/CMakeLists.txt
@@ -10,8 +10,8 @@ qt_add_test(tst_qanimationclip
     INCLUDE_DIRECTORIES
         ../../core/common
     PUBLIC_LIBRARIES
-        3DAnimation
-        3DAnimationPrivate
+        Qt::3DAnimation
+        Qt::3DAnimationPrivate
         Qt::3DCore
         Qt::3DCorePrivate
         Qt::CorePrivate
diff --git a/tests/auto/animation/qanimationcontroller/CMakeLists.txt b/tests/auto/animation/qanimationcontroller/CMakeLists.txt
index 9d22b4b07..ca1af7566 100644
--- a/tests/auto/animation/qanimationcontroller/CMakeLists.txt
+++ b/tests/auto/animation/qanimationcontroller/CMakeLists.txt
@@ -8,7 +8,7 @@ qt_add_test(tst_qanimationcontroller
     SOURCES
         tst_qanimationcontroller.cpp
     PUBLIC_LIBRARIES
-        3DAnimation
+        Qt::3DAnimation
         Qt::3DCore
         Qt::3DCorePrivate
         Qt::3DRender
diff --git a/tests/auto/animation/qanimationgroup/CMakeLists.txt b/tests/auto/animation/qanimationgroup/CMakeLists.txt
index 04a289b3d..5e2bc7483 100644
--- a/tests/auto/animation/qanimationgroup/CMakeLists.txt
+++ b/tests/auto/animation/qanimationgroup/CMakeLists.txt
@@ -8,7 +8,7 @@ qt_add_test(tst_qanimationgroup
     SOURCES
         tst_qanimationgroup.cpp
     PUBLIC_LIBRARIES
-        3DAnimation
+        Qt::3DAnimation
         Qt::3DCore
         Qt::3DCorePrivate
         Qt::3DRender
diff --git a/tests/auto/animation/qblendedclipanimator/CMakeLists.txt b/tests/auto/animation/qblendedclipanimator/CMakeLists.txt
index c64f09d7e..736123702 100644
--- a/tests/auto/animation/qblendedclipanimator/CMakeLists.txt
+++ b/tests/auto/animation/qblendedclipanimator/CMakeLists.txt
@@ -10,8 +10,8 @@ qt_add_test(tst_qblendedclipanimator
     INCLUDE_DIRECTORIES
         ../../core/common
     PUBLIC_LIBRARIES
-        3DAnimation
-        3DAnimationPrivate
+        Qt::3DAnimation
+        Qt::3DAnimationPrivate
         Qt::3DCore
         Qt::3DCorePrivate
         Qt::CorePrivate
diff --git a/tests/auto/animation/qcallbackmapping/CMakeLists.txt b/tests/auto/animation/qcallbackmapping/CMakeLists.txt
index 2b43dcdda..db02dc866 100644
--- a/tests/auto/animation/qcallbackmapping/CMakeLists.txt
+++ b/tests/auto/animation/qcallbackmapping/CMakeLists.txt
@@ -10,8 +10,8 @@ qt_add_test(tst_qcallbackmapping
     INCLUDE_DIRECTORIES
         ../../core/common
     PUBLIC_LIBRARIES
-        3DAnimation
-        3DAnimationPrivate
+        Qt::3DAnimation
+        Qt::3DAnimationPrivate
         Qt::3DCore
         Qt::3DCorePrivate
         Qt::CorePrivate
diff --git a/tests/auto/animation/qchannelmapper/CMakeLists.txt b/tests/auto/animation/qchannelmapper/CMakeLists.txt
index c4b430d48..222b2d0b0 100644
--- a/tests/auto/animation/qchannelmapper/CMakeLists.txt
+++ b/tests/auto/animation/qchannelmapper/CMakeLists.txt
@@ -10,8 +10,8 @@ qt_add_test(tst_qchannelmapper
     INCLUDE_DIRECTORIES
         ../../core/common
     PUBLIC_LIBRARIES
-        3DAnimation
-        3DAnimationPrivate
+        Qt::3DAnimation
+        Qt::3DAnimationPrivate
         Qt::3DCore
         Qt::3DCorePrivate
         Qt::CorePrivate
diff --git a/tests/auto/animation/qclipanimator/CMakeLists.txt b/tests/auto/animation/qclipanimator/CMakeLists.txt
index 1bc3bed21..14f28f47b 100644
--- a/tests/auto/animation/qclipanimator/CMakeLists.txt
+++ b/tests/auto/animation/qclipanimator/CMakeLists.txt
@@ -10,8 +10,8 @@ qt_add_test(tst_qclipanimator
     INCLUDE_DIRECTORIES
         ../../core/common
     PUBLIC_LIBRARIES
-        3DAnimation
-        3DAnimationPrivate
+        Qt::3DAnimation
+        Qt::3DAnimationPrivate
         Qt::3DCore
         Qt::3DCorePrivate
         Qt::CorePrivate
diff --git a/tests/auto/animation/qclipblendvalue/CMakeLists.txt b/tests/auto/animation/qclipblendvalue/CMakeLists.txt
index 060f49d3c..299d83324 100644
--- a/tests/auto/animation/qclipblendvalue/CMakeLists.txt
+++ b/tests/auto/animation/qclipblendvalue/CMakeLists.txt
@@ -10,8 +10,8 @@ qt_add_test(tst_qclipblendvalue
     INCLUDE_DIRECTORIES
         ../../core/common
     PUBLIC_LIBRARIES
-        3DAnimation
-        3DAnimationPrivate
+        Qt::3DAnimation
+        Qt::3DAnimationPrivate
         Qt::3DCore
         Qt::3DCorePrivate
         Qt::CorePrivate
diff --git a/tests/auto/animation/qclock/CMakeLists.txt b/tests/auto/animation/qclock/CMakeLists.txt
index d0792e577..1ed4bcf2f 100644
--- a/tests/auto/animation/qclock/CMakeLists.txt
+++ b/tests/auto/animation/qclock/CMakeLists.txt
@@ -10,8 +10,8 @@ qt_add_test(tst_qclock
     INCLUDE_DIRECTORIES
         ../../core/common
     PUBLIC_LIBRARIES
-        3DAnimation
-        3DAnimationPrivate
+        Qt::3DAnimation
+        Qt::3DAnimationPrivate
         Qt::3DCore
         Qt::3DCorePrivate
         Qt::CorePrivate
diff --git a/tests/auto/animation/qkeyframeanimation/CMakeLists.txt b/tests/auto/animation/qkeyframeanimation/CMakeLists.txt
index 2037c8c99..a4a39b749 100644
--- a/tests/auto/animation/qkeyframeanimation/CMakeLists.txt
+++ b/tests/auto/animation/qkeyframeanimation/CMakeLists.txt
@@ -8,7 +8,7 @@ qt_add_test(tst_qkeyframeanimation
     SOURCES
         tst_qkeyframeanimation.cpp
     PUBLIC_LIBRARIES
-        3DAnimation
+        Qt::3DAnimation
         Qt::3DCore
         Qt::3DCorePrivate
         Qt::3DRender
diff --git a/tests/auto/animation/qmorphinganimation/CMakeLists.txt b/tests/auto/animation/qmorphinganimation/CMakeLists.txt
index 32078c8b9..a970bf6fa 100644
--- a/tests/auto/animation/qmorphinganimation/CMakeLists.txt
+++ b/tests/auto/animation/qmorphinganimation/CMakeLists.txt
@@ -8,7 +8,7 @@ qt_add_test(tst_qmorphinganimation
     SOURCES
         tst_qmorphinganimation.cpp
     PUBLIC_LIBRARIES
-        3DAnimation
+        Qt::3DAnimation
         Qt::3DCore
         Qt::3DCorePrivate
         Qt::3DRender
diff --git a/tests/auto/animation/qmorphtarget/CMakeLists.txt b/tests/auto/animation/qmorphtarget/CMakeLists.txt
index dc8c452f2..5881d620b 100644
--- a/tests/auto/animation/qmorphtarget/CMakeLists.txt
+++ b/tests/auto/animation/qmorphtarget/CMakeLists.txt
@@ -8,7 +8,7 @@ qt_add_test(tst_qmorphtarget
     SOURCES
         tst_qmorphtarget.cpp
     PUBLIC_LIBRARIES
-        3DAnimation
+        Qt::3DAnimation
         Qt::3DCore
         Qt::3DCorePrivate
         Qt::3DRender
diff --git a/tests/auto/animation/qskeletonmapping/CMakeLists.txt b/tests/auto/animation/qskeletonmapping/CMakeLists.txt
index 23687dfdd..63f76972e 100644
--- a/tests/auto/animation/qskeletonmapping/CMakeLists.txt
+++ b/tests/auto/animation/qskeletonmapping/CMakeLists.txt
@@ -10,8 +10,8 @@ qt_add_test(tst_qskeletonmapping
     INCLUDE_DIRECTORIES
         ../../core/common
     PUBLIC_LIBRARIES
-        3DAnimation
-        3DAnimationPrivate
+        Qt::3DAnimation
+        Qt::3DAnimationPrivate
         Qt::3DCore
         Qt::3DCorePrivate
         Qt::CorePrivate
diff --git a/tests/auto/animation/qvertexblendanimation/CMakeLists.txt b/tests/auto/animation/qvertexblendanimation/CMakeLists.txt
index 03fd65987..f716d4ed4 100644
--- a/tests/auto/animation/qvertexblendanimation/CMakeLists.txt
+++ b/tests/auto/animation/qvertexblendanimation/CMakeLists.txt
@@ -8,7 +8,7 @@ qt_add_test(tst_qvertexblendanimation
     SOURCES
         tst_qvertexblendanimation.cpp
     PUBLIC_LIBRARIES
-        3DAnimation
+        Qt::3DAnimation
         Qt::3DCore
         Qt::3DCorePrivate
         Qt::3DRender