diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2015-09-18 09:36:56 +0100 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2015-10-13 10:18:46 +0000 |
| commit | 333e7dccc1a928bf582b0e55b175b2b1ebcef0b6 (patch) | |
| tree | ce34947b8714dc3afd3713582693736e7cfb3557 /tests | |
| parent | 2b1f2ca279cc4aefb3659110519b4a77e407c84f (diff) | |
Rename RenderrenderPass -> RenderPass
Change-Id: Ia7eeddb8a114eef1ba3c0d2bfae7ecc8d2fcf8d1
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/render/render.pro | 2 | ||||
| -rw-r--r-- | tests/auto/render/renderpass/renderpass.pro (renamed from tests/auto/render/renderrenderpass/renderrenderpass.pro) | 4 | ||||
| -rw-r--r-- | tests/auto/render/renderpass/tst_renderpass.cpp (renamed from tests/auto/render/renderrenderpass/tst_renderrenderpass.cpp) | 18 |
3 files changed, 12 insertions, 12 deletions
diff --git a/tests/auto/render/render.pro b/tests/auto/render/render.pro index 03da795e5..c4d674d59 100644 --- a/tests/auto/render/render.pro +++ b/tests/auto/render/render.pro @@ -4,7 +4,7 @@ contains(QT_CONFIG, private_tests) { SUBDIRS += \ entity \ renderqueue \ - renderrenderpass \ + renderpass \ qgraphicsutils \ rendershader \ renderviewutils \ diff --git a/tests/auto/render/renderrenderpass/renderrenderpass.pro b/tests/auto/render/renderpass/renderpass.pro index 460bcb238..ab0fe4211 100644 --- a/tests/auto/render/renderrenderpass/renderrenderpass.pro +++ b/tests/auto/render/renderpass/renderpass.pro @@ -1,9 +1,9 @@ TEMPLATE = app -TARGET = tst_renderrenderpass +TARGET = tst_renderpass QT += core-private 3dcore 3dcore-private 3drenderer 3drenderer-private testlib CONFIG += testcase -SOURCES += tst_renderrenderpass.cpp +SOURCES += tst_renderpass.cpp diff --git a/tests/auto/render/renderrenderpass/tst_renderrenderpass.cpp b/tests/auto/render/renderpass/tst_renderpass.cpp index 3bc709d3f..3fd4b4306 100644 --- a/tests/auto/render/renderrenderpass/tst_renderrenderpass.cpp +++ b/tests/auto/render/renderpass/tst_renderpass.cpp @@ -35,7 +35,7 @@ ****************************************************************************/ #include <QtTest/QtTest> -#include <Qt3DRenderer/private/renderrenderpass_p.h> +#include <Qt3DRenderer/private/renderpass_p.h> #include <Qt3DCore/QScenePropertyChange> @@ -83,7 +83,7 @@ private slots: void shouldHaveInitialState() { // GIVEN - RenderRenderPass backend; + RenderPass backend; // THEN QVERIFY(backend.shaderProgram().isNull()); @@ -215,7 +215,7 @@ private slots: frontendState->setParent(&frontend); frontend.addRenderState(frontendState); - RenderRenderPass backend; + RenderPass backend; QFETCH(RenderState*, backendState); @@ -246,7 +246,7 @@ private slots: // GIVEN QScopedPointer<QShaderProgram> shader(new QShaderProgram); - RenderRenderPass backend; + RenderPass backend; // WHEN QScenePropertyChangePtr addChange(new QScenePropertyChange(NodeAdded, QSceneChange::Node, shader->id())); @@ -272,7 +272,7 @@ private slots: // GIVEN QScopedPointer<QAnnotation> annotation(new QAnnotation); - RenderRenderPass backend; + RenderPass backend; // WHEN QScenePropertyChangePtr addChange(new QScenePropertyChange(NodeAdded, QSceneChange::Node, annotation->id())); @@ -299,7 +299,7 @@ private slots: // GIVEN QScopedPointer<QParameterMapping> binding(new QParameterMapping); - RenderRenderPass backend; + RenderPass backend; // WHEN QScenePropertyChangePtr addChange(new QScenePropertyChange(NodeAdded, QSceneChange::Node, binding->id())); @@ -329,7 +329,7 @@ private slots: // GIVEN QScopedPointer<QParameter> parameter(new QParameter); - RenderRenderPass backend; + RenderPass backend; // WHEN QScenePropertyChangePtr addChange(new QScenePropertyChange(NodeAdded, QSceneChange::Node, parameter->id())); @@ -362,7 +362,7 @@ private slots: QFETCH(QRenderState*, frontendState); QNodePtr frontendStatePtr(frontendState); - RenderRenderPass backend; + RenderPass backend; QFETCH(RenderState*, backendState); @@ -389,4 +389,4 @@ private slots: QTEST_APPLESS_MAIN(tst_RenderRenderPass) -#include "tst_renderrenderpass.moc" +#include "tst_renderpass.moc" |