1 files changed, 14 insertions, 14 deletions

diff --git a/tests/auto/extras/qcuboidgeometry/tst_qcuboidgeometry.cpp b/tests/auto/extras/qcuboidgeometry/tst_qcuboidgeometry.cpp
index f20b1e870..2bfa89601 100644
--- a/tests/auto/extras/qcuboidgeometry/tst_qcuboidgeometry.cpp
+++ b/tests/auto/extras/qcuboidgeometry/tst_qcuboidgeometry.cpp
@@ -29,9 +29,9 @@
 #include <QtTest/QTest>
 #include <QObject>
 #include <Qt3DExtras/qcuboidgeometry.h>
-#include <Qt3DRender/qattribute.h>
-#include <Qt3DRender/qbuffer.h>
-#include <qopenglcontext.h>
+#include <Qt3DCore/qattribute.h>
+#include <Qt3DCore/qbuffer.h>
+#include <QtGui/qopenglcontext.h>
 #include <QtGui/qvector2d.h>
 #include <QtGui/qvector3d.h>
 #include <QtGui/qvector4d.h>
@@ -58,13 +58,13 @@ private Q_SLOTS:
         QCOMPARE(geometry.yzMeshResolution(), QSize(2, 2));
         QCOMPARE(geometry.xzMeshResolution(), QSize(2, 2));
         QVERIFY(geometry.positionAttribute() != nullptr);
-        QCOMPARE(geometry.positionAttribute()->name(), Qt3DRender::QAttribute::defaultPositionAttributeName());
+        QCOMPARE(geometry.positionAttribute()->name(), Qt3DCore::QAttribute::defaultPositionAttributeName());
         QVERIFY(geometry.normalAttribute() != nullptr);
-        QCOMPARE(geometry.normalAttribute()->name(), Qt3DRender::QAttribute::defaultNormalAttributeName());
+        QCOMPARE(geometry.normalAttribute()->name(), Qt3DCore::QAttribute::defaultNormalAttributeName());
         QVERIFY(geometry.texCoordAttribute() != nullptr);
-        QCOMPARE(geometry.texCoordAttribute()->name(), Qt3DRender::QAttribute::defaultTextureCoordinateAttributeName());
+        QCOMPARE(geometry.texCoordAttribute()->name(), Qt3DCore::QAttribute::defaultTextureCoordinateAttributeName());
         QVERIFY(geometry.tangentAttribute() != nullptr);
-        QCOMPARE(geometry.tangentAttribute()->name(), Qt3DRender::QAttribute::defaultTangentAttributeName());
+        QCOMPARE(geometry.tangentAttribute()->name(), Qt3DCore::QAttribute::defaultTangentAttributeName());
         QVERIFY(geometry.indexAttribute() != nullptr);
     }
 
@@ -520,12 +520,12 @@ private Q_SLOTS:
     {
         // GIVEN
         Qt3DExtras::QCuboidGeometry geometry;
-        const QVector<Qt3DRender::QAttribute *> attributes = geometry.attributes();
-        Qt3DRender::QAttribute *positionAttribute = geometry.positionAttribute();
-        Qt3DRender::QAttribute *normalAttribute = geometry.normalAttribute();
-        Qt3DRender::QAttribute *texCoordAttribute = geometry.texCoordAttribute();
-        Qt3DRender::QAttribute *tangentAttribute = geometry.tangentAttribute();
-        Qt3DRender::QAttribute *indexAttribute = geometry.indexAttribute();
+        const QVector<Qt3DCore::QAttribute *> attributes = geometry.attributes();
+        Qt3DCore::QAttribute *positionAttribute = geometry.positionAttribute();
+        Qt3DCore::QAttribute *normalAttribute = geometry.normalAttribute();
+        Qt3DCore::QAttribute *texCoordAttribute = geometry.texCoordAttribute();
+        Qt3DCore::QAttribute *tangentAttribute = geometry.tangentAttribute();
+        Qt3DCore::QAttribute *indexAttribute = geometry.indexAttribute();
 
         // WHEN
         QFETCH(float, xExtent);
@@ -545,7 +545,7 @@ private Q_SLOTS:
 
         // Check buffer of each attribute is valid and actually has some data
         for (const auto &attribute : attributes) {
-            Qt3DRender::QBuffer *buffer = attribute->buffer();
+            Qt3DCore::QBuffer *buffer = attribute->buffer();
             QVERIFY(buffer != nullptr);
             QVERIFY(buffer->data().size() != 0);
         }