diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2015-09-18 10:58:19 +0100 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2015-10-13 12:12:30 +0000 |
| commit | 84ca9536545f182bc098ef19dbfda472c6a5ae35 (patch) | |
| tree | c025603df1cd2f696a077f10ec7cc625186aefd0 /tests | |
| parent | beb770c05f6fc037ddd49c08d706d29b935bd40d (diff) | |
Rename RenderShader -> Shader
Change-Id: Iafdfc44bdc97c53974a2d47834a61914be06ac25
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/shader/shader.pro (renamed from tests/auto/render/rendershader/rendershader.pro) | 4 | ||||
| -rw-r--r-- | tests/auto/render/shader/tst_shader.cpp (renamed from tests/auto/render/rendershader/tst_rendershader.cpp) | 10 |
3 files changed, 8 insertions, 8 deletions
diff --git a/tests/auto/render/render.pro b/tests/auto/render/render.pro index c4d674d59..6f66f94ff 100644 --- a/tests/auto/render/render.pro +++ b/tests/auto/render/render.pro @@ -6,7 +6,7 @@ contains(QT_CONFIG, private_tests) { renderqueue \ renderpass \ qgraphicsutils \ - rendershader \ + shader \ renderviewutils \ renderviews \ material \ diff --git a/tests/auto/render/rendershader/rendershader.pro b/tests/auto/render/shader/shader.pro index c5d28d410..ba942083a 100644 --- a/tests/auto/render/rendershader/rendershader.pro +++ b/tests/auto/render/shader/shader.pro @@ -1,9 +1,9 @@ TEMPLATE = app -TARGET = tst_rendershader +TARGET = tst_shader QT += core-private 3dcore 3dcore-private 3drenderer 3drenderer-private testlib CONFIG += testcase -SOURCES += tst_rendershader.cpp +SOURCES += tst_shader.cpp diff --git a/tests/auto/render/rendershader/tst_rendershader.cpp b/tests/auto/render/shader/tst_shader.cpp index 54f020aa1..6a8a61f58 100644 --- a/tests/auto/render/rendershader/tst_rendershader.cpp +++ b/tests/auto/render/shader/tst_shader.cpp @@ -35,7 +35,7 @@ ****************************************************************************/ #include <QtTest/QTest> -#include <Qt3DRenderer/private/rendershader_p.h> +#include <Qt3DRenderer/private/shader_p.h> #include <Qt3DRenderer/qshaderprogram.h> class tst_RenderShader : public QObject @@ -78,7 +78,7 @@ Qt3DRender::QShaderProgram *createFrontendShader() void tst_RenderShader::hasCoherentInitialState() { - Qt3DRender::Render::RenderShader *shader = new Qt3DRender::Render::RenderShader(); + Qt3DRender::Render::Shader *shader = new Qt3DRender::Render::Shader(); QCOMPARE(shader->isLoaded(), false); QCOMPARE(shader->dna(), 0U); @@ -93,7 +93,7 @@ void tst_RenderShader::hasCoherentInitialState() void tst_RenderShader::matchesFrontendPeer() { Qt3DRender::QShaderProgram *frontend = createFrontendShader(); - Qt3DRender::Render::RenderShader *backend = new Qt3DRender::Render::RenderShader(); + Qt3DRender::Render::Shader *backend = new Qt3DRender::Render::Shader(); backend->updateFromPeer(frontend); QCOMPARE(backend->isLoaded(), false); @@ -107,7 +107,7 @@ void tst_RenderShader::matchesFrontendPeer() void tst_RenderShader::cleanupLeavesACoherentState() { Qt3DRender::QShaderProgram *frontend = createFrontendShader(); - Qt3DRender::Render::RenderShader *shader = new Qt3DRender::Render::RenderShader(); + Qt3DRender::Render::Shader *shader = new Qt3DRender::Render::Shader(); shader->updateFromPeer(frontend); @@ -125,4 +125,4 @@ void tst_RenderShader::cleanupLeavesACoherentState() QTEST_APPLESS_MAIN(tst_RenderShader) -#include "tst_rendershader.moc" +#include "tst_shader.moc" |