From c2781d324915062a8575dd35ff0fc4a950a8c3d5 Mon Sep 17 00:00:00 2001 From: Gunnar Sletta Date: Wed, 27 Apr 2016 13:06:02 +0200 Subject: Pick up stencilclip shaders from the qt-project subfolder Change-Id: I6fbc08be9148c772423d9225921fc1b2b1bf7444 Reviewed-by: Robin Burchell --- customcontext/renderer/qsgbasicclipmanager_p.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/customcontext/renderer/qsgbasicclipmanager_p.h b/customcontext/renderer/qsgbasicclipmanager_p.h index 76c06d0..e9f28bc 100644 --- a/customcontext/renderer/qsgbasicclipmanager_p.h +++ b/customcontext/renderer/qsgbasicclipmanager_p.h @@ -184,8 +184,14 @@ void QSGBasicClipManager::activate(const QSGClipNode *clip, m_program = new QOpenGLShaderProgram(); QSGShaderSourceBuilder::initializeProgramFromFiles( m_program, +#if QT_VERSION >= 0x050600 + QStringLiteral(":/qt-project.org/scenegraph/shaders/stencilclip.vert"), + QStringLiteral(":/qt-project.org/scenegraph/shaders/stencilclip.frag") +#else QStringLiteral(":/scenegraph/shaders/stencilclip.vert"), - QStringLiteral(":/scenegraph/shaders/stencilclip.frag")); + QStringLiteral(":/scenegraph/shaders/stencilclip.frag") +#endif + ); m_program->bindAttributeLocation("vCoord", 0); m_program->link(); m_clipMatrixId = m_program->uniformLocation("matrix"); -- cgit v1.2.3