diff options
author | Laszlo Agocs <laszlo.agocs@qt.io> | 2020-06-16 13:57:10 +0200 |
---|---|---|
committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2020-06-18 10:23:17 +0200 |
commit | b976a12940b52c4a5c20972802828fc50674f60f (patch) | |
tree | 77ac9d9ee622cb1521b127620b276936db90ebb9 /tests/auto/quick/qquickshadereffect | |
parent | d62f11f1d04851ac07491aa3994e20607b2e2adc (diff) |
ShaderEffect: vertexShader and fragmentShader are now URLs
..and so fully compatible in behavior with properties like Image.source.
The main improvement here is that unlike with the old code, which incorrectly
handled local file URLs, one can now write fragmentShader: "myshader.frag.qsb"
which leads to picking up the file relative to the component (the .qml file),
as expected.
Existing code (that uses file: or qrc: URLs) will continue to work
as-is.
Change-Id: I89dd84b998b59ae6d5b6cb3d8a6353961ee8bb4a
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Reviewed-by: Christian Strømme <christian.stromme@qt.io>
Diffstat (limited to 'tests/auto/quick/qquickshadereffect')
-rw-r--r-- | tests/auto/quick/qquickshadereffect/tst_qquickshadereffect.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/quick/qquickshadereffect/tst_qquickshadereffect.cpp b/tests/auto/quick/qquickshadereffect/tst_qquickshadereffect.cpp index 0a9b92375f..9bc4b20968 100644 --- a/tests/auto/quick/qquickshadereffect/tst_qquickshadereffect.cpp +++ b/tests/auto/quick/qquickshadereffect/tst_qquickshadereffect.cpp @@ -172,7 +172,7 @@ void tst_qquickshadereffect::withoutQmlEngine() // using a shader without QML engine used to crash auto window = new QQuickWindow; auto shaderEffect = new TestShaderEffect(window->contentItem()); - shaderEffect->setVertexShader(""); + shaderEffect->setVertexShader(QUrl()); QVERIFY(shaderEffect->isComponentComplete()); delete window; } |