1 files changed, 21 insertions, 21 deletions
diff --git a/tests/auto/core/arrayresourcesmanager/preallocatedarraypolicy/tst_preallocatedarraypolicy.cpp b/tests/auto/core/arrayresourcesmanager/preallocatedarraypolicy/tst_preallocatedarraypolicy.cpp
index c3fa5aea5..d56196d00 100644
--- a/tests/auto/core/arrayresourcesmanager/preallocatedarraypolicy/tst_preallocatedarraypolicy.cpp
+++ b/tests/auto/core/arrayresourcesmanager/preallocatedarraypolicy/tst_preallocatedarraypolicy.cpp
@@ -69,16 +69,16 @@ public:
     QAtomicInt m_value;
 };
 
-typedef Qt3D::QHandle<tst_ArrayResource> tHandle;
-typedef Qt3D::QHandle<tst_ArrayResource, 4> tHandle4;
-typedef Qt3D::QHandle<tst_ArrayResource, 8> tHandle8;
-typedef Qt3D::QHandle<tst_ArrayResource, 16> tHandle16;
+typedef Qt3DCore::QHandle<tst_ArrayResource> tHandle;
+typedef Qt3DCore::QHandle<tst_ArrayResource, 4> tHandle4;
+typedef Qt3DCore::QHandle<tst_ArrayResource, 8> tHandle8;
+typedef Qt3DCore::QHandle<tst_ArrayResource, 16> tHandle16;
 
 void tst_PreallocatedArrayPolicy::createResourcesManager()
 {
-    Qt3D::QResourceManager<tst_ArrayResource, int, 16, Qt3D::ArrayPreallocationPolicy> manager16;
-    Qt3D::QResourceManager<tst_ArrayResource, int, 4, Qt3D::ArrayPreallocationPolicy> manager4;
-    Qt3D::QResourceManager<tst_ArrayResource, int, 8, Qt3D::ArrayPreallocationPolicy> manager8;
+    Qt3DCore::QResourceManager<tst_ArrayResource, int, 16, Qt3DCore::ArrayPreallocationPolicy> manager16;
+    Qt3DCore::QResourceManager<tst_ArrayResource, int, 4, Qt3DCore::ArrayPreallocationPolicy> manager4;
+    Qt3DCore::QResourceManager<tst_ArrayResource, int, 8, Qt3DCore::ArrayPreallocationPolicy> manager8;
     QVERIFY(manager16.maxResourcesEntries() == 65535);
     QVERIFY(manager8.maxResourcesEntries() == 255);
     QVERIFY(manager4.maxResourcesEntries() == 15);
@@ -90,7 +90,7 @@ void tst_PreallocatedArrayPolicy::createResourcesManager()
  */
 void tst_PreallocatedArrayPolicy::acquireResources()
 {
-    Qt3D::QResourceManager<tst_ArrayResource, uint, 4, Qt3D::ArrayPreallocationPolicy> manager;
+    Qt3DCore::QResourceManager<tst_ArrayResource, uint, 4, Qt3DCore::ArrayPreallocationPolicy> manager;
 
     QList<tHandle4> handles;
 
@@ -110,7 +110,7 @@ void tst_PreallocatedArrayPolicy::acquireResources()
 void tst_PreallocatedArrayPolicy::getResources()
 {
 
-    Qt3D::QResourceManager<tst_ArrayResource, int, 8, Qt3D::ArrayPreallocationPolicy> manager;
+    Qt3DCore::QResourceManager<tst_ArrayResource, int, 8, Qt3DCore::ArrayPreallocationPolicy> manager;
     QList<tst_ArrayResource *> resources;
     QList<tHandle8> handles;
 
@@ -141,7 +141,7 @@ void tst_PreallocatedArrayPolicy::getResources()
  */
 void tst_PreallocatedArrayPolicy::registerResourcesResize()
 {
-    Qt3D::QResourceManager<tst_ArrayResource, uint, 16, Qt3D::ArrayPreallocationPolicy> manager;
+    Qt3DCore::QResourceManager<tst_ArrayResource, uint, 16, Qt3DCore::ArrayPreallocationPolicy> manager;
     QList<tHandle16> handles;
 
     for (uint i = 0; i < 2; i++) {
@@ -169,7 +169,7 @@ void tst_PreallocatedArrayPolicy::registerResourcesResize()
  */
 void tst_PreallocatedArrayPolicy::removeResource()
 {
-    Qt3D::QResourceManager<tst_ArrayResource, int, 16, Qt3D::ArrayPreallocationPolicy> manager;
+    Qt3DCore::QResourceManager<tst_ArrayResource, int, 16, Qt3DCore::ArrayPreallocationPolicy> manager;
 
     QList<tst_ArrayResource *> resources;
     QList<tHandle> handles;
@@ -193,7 +193,7 @@ void tst_PreallocatedArrayPolicy::removeResource()
  */
 void tst_PreallocatedArrayPolicy::resetResource()
 {
-    Qt3D::QResourceManager<tst_ArrayResource, uint, 16, Qt3D::ArrayPreallocationPolicy> manager;
+    Qt3DCore::QResourceManager<tst_ArrayResource, uint, 16, Qt3DCore::ArrayPreallocationPolicy> manager;
 
     QList<tst_ArrayResource *> resources;
     QList<tHandle16> handles;
@@ -220,7 +220,7 @@ void tst_PreallocatedArrayPolicy::resetResource()
 
 void tst_PreallocatedArrayPolicy::lookupResource()
 {
-    Qt3D::QResourceManager<tst_ArrayResource, uint, 16, Qt3D::ArrayPreallocationPolicy> manager;
+    Qt3DCore::QResourceManager<tst_ArrayResource, uint, 16, Qt3DCore::ArrayPreallocationPolicy> manager;
 
     QList<tst_ArrayResource *> resources;
     QList<tHandle16> handles;
@@ -245,7 +245,7 @@ void tst_PreallocatedArrayPolicy::lookupResource()
 
 void tst_PreallocatedArrayPolicy::releaseResource()
 {
-    Qt3D::QResourceManager<tst_ArrayResource, uint, 16, Qt3D::ArrayPreallocationPolicy> manager;
+    Qt3DCore::QResourceManager<tst_ArrayResource, uint, 16, Qt3DCore::ArrayPreallocationPolicy> manager;
     QList<tst_ArrayResource *> resources;
 
     for (int i = 0; i < 5; i++) {
@@ -267,11 +267,11 @@ class tst_Thread : public QThread
     Q_OBJECT
 public:
 
-    typedef Qt3D::QResourceManager<tst_ArrayResource,
+    typedef Qt3DCore::QResourceManager<tst_ArrayResource,
     int,
     16,
-    Qt3D::ArrayPreallocationPolicy,
-    Qt3D::ObjectLevelLockingPolicy> Manager;
+    Qt3DCore::ArrayPreallocationPolicy,
+    Qt3DCore::ObjectLevelLockingPolicy> Manager;
 
     tst_Thread()
         : QThread()
@@ -339,11 +339,11 @@ class tst_Thread2 : public QThread
     Q_OBJECT
 public:
 
-    typedef Qt3D::QResourceManager<tst_ArrayResource,
+    typedef Qt3DCore::QResourceManager<tst_ArrayResource,
     int,
     16,
-    Qt3D::ArrayPreallocationPolicy,
-    Qt3D::ObjectLevelLockingPolicy> Manager;
+    Qt3DCore::ArrayPreallocationPolicy,
+    Qt3DCore::ObjectLevelLockingPolicy> Manager;
 
     tst_Thread2(int releaseAbove = 7)
         : QThread()
@@ -415,7 +415,7 @@ void tst_PreallocatedArrayPolicy::heavyDutyMultiThreadedAccessRelease()
 
 void tst_PreallocatedArrayPolicy::maximumNumberOfResources()
 {
-    Qt3D::QResourceManager<tst_ArrayResource, uint, 16, Qt3D::ArrayPreallocationPolicy> manager;
+    Qt3DCore::QResourceManager<tst_ArrayResource, uint, 16, Qt3DCore::ArrayPreallocationPolicy> manager;
 
     QList<tst_ArrayResource *> resources;
     QList<tHandle16> handles;