aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGiuseppe D'Angelo <giuseppe.dangelo@kdab.com>2016-03-29 21:56:46 +0200
committerGiuseppe D'Angelo <giuseppe.dangelo@kdab.com>2016-04-01 18:40:58 +0000
commit07f2ce1827243a61f763801200987ddc85fb817b (patch)
tree7142703c71e10859f1aa9553ccc85f64764edfe8
parent886662d409f6422bc43df500314470f776958bfd (diff)
Move Qt Quick resources under the :/qt-project.org/ directory
Change-Id: I7c7745264ff66b7db042e19f6d44124fa78bb86c Reviewed-by: Robin Burchell <robin.burchell@viroteck.net> Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
-rw-r--r--src/quick/items/items.qrc2
-rw-r--r--src/quick/items/qquickanimatedsprite.cpp4
-rw-r--r--src/quick/items/qquickshadereffect.cpp4
-rw-r--r--src/quick/items/qquickshadereffectnode.cpp4
-rw-r--r--src/quick/items/qquickspritesequence.cpp4
5 files changed, 9 insertions, 9 deletions
diff --git a/src/quick/items/items.qrc b/src/quick/items/items.qrc
index 671d8acdbb..99f9b5224f 100644
--- a/src/quick/items/items.qrc
+++ b/src/quick/items/items.qrc
@@ -1,5 +1,5 @@
<RCC>
- <qresource prefix="/items">
+ <qresource prefix="/qt-project.org/items">
<file>shaders/sprite.frag</file>
<file>shaders/sprite.vert</file>
<file>shaders/shadereffect.vert</file>
diff --git a/src/quick/items/qquickanimatedsprite.cpp b/src/quick/items/qquickanimatedsprite.cpp
index d7f3f4f83b..44b5ff1e45 100644
--- a/src/quick/items/qquickanimatedsprite.cpp
+++ b/src/quick/items/qquickanimatedsprite.cpp
@@ -96,8 +96,8 @@ public:
AnimatedSpriteMaterialData()
: QSGMaterialShader()
{
- setShaderSourceFile(QOpenGLShader::Vertex, QStringLiteral(":/items/shaders/sprite.vert"));
- setShaderSourceFile(QOpenGLShader::Fragment, QStringLiteral(":/items/shaders/sprite.frag"));
+ setShaderSourceFile(QOpenGLShader::Vertex, QStringLiteral(":/qt-project.org/items/shaders/sprite.vert"));
+ setShaderSourceFile(QOpenGLShader::Fragment, QStringLiteral(":/qt-project.org/items/shaders/sprite.frag"));
}
void updateState(const RenderState &state, QSGMaterial *newEffect, QSGMaterial *) Q_DECL_OVERRIDE
diff --git a/src/quick/items/qquickshadereffect.cpp b/src/quick/items/qquickshadereffect.cpp
index 6cb9216955..47c67e0e1c 100644
--- a/src/quick/items/qquickshadereffect.cpp
+++ b/src/quick/items/qquickshadereffect.cpp
@@ -1027,12 +1027,12 @@ QSGNode *QQuickShaderEffect::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeDa
Key s = m_common.source;
QSGShaderSourceBuilder builder;
if (s.sourceCode[Key::FragmentShader].isEmpty()) {
- builder.appendSourceFile(QStringLiteral(":/items/shaders/shadereffect.frag"));
+ builder.appendSourceFile(QStringLiteral(":/qt-project.org/items/shaders/shadereffect.frag"));
s.sourceCode[Key::FragmentShader] = builder.source();
builder.clear();
}
if (s.sourceCode[Key::VertexShader].isEmpty()) {
- builder.appendSourceFile(QStringLiteral(":/items/shaders/shadereffect.vert"));
+ builder.appendSourceFile(QStringLiteral(":/qt-project.org/items/shaders/shadereffect.vert"));
s.sourceCode[Key::VertexShader] = builder.source();
}
s.className = metaObject()->className();
diff --git a/src/quick/items/qquickshadereffectnode.cpp b/src/quick/items/qquickshadereffectnode.cpp
index 95537fdefc..df030d15a7 100644
--- a/src/quick/items/qquickshadereffectnode.cpp
+++ b/src/quick/items/qquickshadereffectnode.cpp
@@ -299,8 +299,8 @@ void QQuickCustomMaterialShader::compile()
QSGShaderSourceBuilder::initializeProgramFromFiles(
program(),
- QStringLiteral(":/items/shaders/shadereffectfallback.vert"),
- QStringLiteral(":/items/shaders/shadereffectfallback.frag"));
+ QStringLiteral(":/qt-project.org/items/shaders/shadereffectfallback.vert"),
+ QStringLiteral(":/qt-project.org/items/shaders/shadereffectfallback.frag"));
#ifndef QT_NO_DEBUG
for (int i = 0; i < attrCount; ++i) {
diff --git a/src/quick/items/qquickspritesequence.cpp b/src/quick/items/qquickspritesequence.cpp
index 854582e58e..6327328f8a 100644
--- a/src/quick/items/qquickspritesequence.cpp
+++ b/src/quick/items/qquickspritesequence.cpp
@@ -95,8 +95,8 @@ public:
SpriteSequenceMaterialData()
: QSGMaterialShader()
{
- setShaderSourceFile(QOpenGLShader::Vertex, QStringLiteral(":/items/shaders/sprite.vert"));
- setShaderSourceFile(QOpenGLShader::Fragment, QStringLiteral(":/items/shaders/sprite.frag"));
+ setShaderSourceFile(QOpenGLShader::Vertex, QStringLiteral(":/qt-project.org/items/shaders/sprite.vert"));
+ setShaderSourceFile(QOpenGLShader::Fragment, QStringLiteral(":/qt-project.org/items/shaders/sprite.frag"));
}
void updateState(const RenderState &state, QSGMaterial *newEffect, QSGMaterial *) Q_DECL_OVERRIDE