diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 11:16:24 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-04-08 11:16:24 +0000 |
| commit | dab3fa107fa7b4a82928b71748b857ff85180f1e (patch) | |
| tree | 9a1e85401ae6b790209f666441f121bb13d1a7f8 /src/quick/scenegraph/util/qsgflatcolormaterial.cpp | |
| parent | a889bcb6c3c66a616e73fa5ed3c9d900d7c7d6f5 (diff) | |
| parent | 68ba8fe3ccf7abe8d24ba3614f8d7ceb3778de74 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7
Diffstat (limited to 'src/quick/scenegraph/util/qsgflatcolormaterial.cpp')
| -rw-r--r-- | src/quick/scenegraph/util/qsgflatcolormaterial.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/scenegraph/util/qsgflatcolormaterial.cpp b/src/quick/scenegraph/util/qsgflatcolormaterial.cpp index 005c7a043d..836b5759a2 100644 --- a/src/quick/scenegraph/util/qsgflatcolormaterial.cpp +++ b/src/quick/scenegraph/util/qsgflatcolormaterial.cpp @@ -66,8 +66,8 @@ QSGMaterialType FlatColorMaterialShader::type; FlatColorMaterialShader::FlatColorMaterialShader() : QSGMaterialShader(*new QSGMaterialShaderPrivate) { - setShaderSourceFile(QOpenGLShader::Vertex, QStringLiteral(":/scenegraph/shaders/flatcolor.vert")); - setShaderSourceFile(QOpenGLShader::Fragment, QStringLiteral(":/scenegraph/shaders/flatcolor.frag")); + setShaderSourceFile(QOpenGLShader::Vertex, QStringLiteral(":/qt-project.org/scenegraph/shaders/flatcolor.vert")); + setShaderSourceFile(QOpenGLShader::Fragment, QStringLiteral(":/qt-project.org/scenegraph/shaders/flatcolor.frag")); } void FlatColorMaterialShader::updateState(const RenderState &state, QSGMaterial *newEffect, QSGMaterial *oldEffect) |