diff options
| author | Kim Motoyoshi Kalland <kim.kalland@nokia.com> | 2012-03-21 14:21:51 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-04 03:29:45 +0200 |
| commit | c71c8c4619594a276d69378bbd77da5117afd566 (patch) | |
| tree | 9b8ac6fb0db75abb747de6ec2a74e754770f4820 /tests/auto/quick/qquickshadereffect | |
| parent | 2c741bc8af46aa26ec9a61bc996bb0de2e409943 (diff) | |
Fixed crash when using 'var' property in ShaderEffect.
Also made CustomParticle and ShaderEffect share some code.
Task-number: QTBUG-23924
Change-Id: I975f71f031b379cf5e29302a9c931e4ead5437ea
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Diffstat (limited to 'tests/auto/quick/qquickshadereffect')
| -rw-r--r-- | tests/auto/quick/qquickshadereffect/tst_qquickshadereffect.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/auto/quick/qquickshadereffect/tst_qquickshadereffect.cpp b/tests/auto/quick/qquickshadereffect/tst_qquickshadereffect.cpp index 00ae8fc76d..1edf511ebf 100644 --- a/tests/auto/quick/qquickshadereffect/tst_qquickshadereffect.cpp +++ b/tests/auto/quick/qquickshadereffect/tst_qquickshadereffect.cpp @@ -257,13 +257,12 @@ void tst_qquickshadereffect::lookThroughShaderCode() if ((presenceFlags & TexCoordPresent) == 0) expected += "Warning: Missing reference to \'qt_MultiTexCoord0\'.\n"; if ((presenceFlags & MatrixPresent) == 0) - expected += "Warning: Missing reference to \'qt_Matrix\'.\n"; + expected += "Warning: Vertex shader is missing reference to \'qt_Matrix\'.\n"; if ((presenceFlags & OpacityPresent) == 0) - expected += "Warning: Missing reference to \'qt_Opacity\'.\n"; + expected += "Warning: Shaders are missing reference to \'qt_Opacity\'.\n"; item.setVertexShader(vertexShader); item.setFragmentShader(fragmentShader); - item.ensureCompleted(); QCOMPARE(item.parseLog(), expected); // If the uniform was successfully parsed, the notify signal has been connected to an update slot. |