diff options
Diffstat (limited to 'src/render/materialsystem')
| -rw-r--r-- | src/render/materialsystem/parameter.cpp | 1 | ||||
| -rw-r--r-- | src/render/materialsystem/qshaderprogram.cpp | 4 | ||||
| -rw-r--r-- | src/render/materialsystem/qshaderprogrambuilder.cpp | 1 | ||||
| -rw-r--r-- | src/render/materialsystem/shaderbuilder.cpp | 4 |
4 files changed, 4 insertions, 6 deletions
diff --git a/src/render/materialsystem/parameter.cpp b/src/render/materialsystem/parameter.cpp index 3360aebef..d515361ab 100644 --- a/src/render/materialsystem/parameter.cpp +++ b/src/render/materialsystem/parameter.cpp @@ -42,7 +42,6 @@ #include <Qt3DRender/private/qparameter_p.h> #include <Qt3DRender/qtexture.h> #include <Qt3DRender/qshaderdata.h> -#include <Qt3DRender/qbuffer.h> #include <Qt3DRender/private/buffer_p.h> #include <Qt3DRender/private/managers_p.h> diff --git a/src/render/materialsystem/qshaderprogram.cpp b/src/render/materialsystem/qshaderprogram.cpp index 8281d2707..50eb26a30 100644 --- a/src/render/materialsystem/qshaderprogram.cpp +++ b/src/render/materialsystem/qshaderprogram.cpp @@ -39,7 +39,7 @@ #include "qshaderprogram.h" #include "qshaderprogram_p.h" -#include <Qt3DRender/private/qurlhelper_p.h> +#include <Qt3DCore/private/qurlhelper_p.h> #include <QDebug> #include <QFile> #include <QFileInfo> @@ -710,7 +710,7 @@ QByteArray QShaderProgramPrivate::deincludify(const QByteArray &contents, const QByteArray QShaderProgram::loadSource(const QUrl &sourceUrl) { // TO DO: Handle remote path - return QShaderProgramPrivate::deincludify(Qt3DRender::QUrlHelper::urlToLocalFileOrQrc(sourceUrl)); + return QShaderProgramPrivate::deincludify(Qt3DCore::QUrlHelper::urlToLocalFileOrQrc(sourceUrl)); } } // of namespace Qt3DRender diff --git a/src/render/materialsystem/qshaderprogrambuilder.cpp b/src/render/materialsystem/qshaderprogrambuilder.cpp index 60685d73c..a52e3ddaa 100644 --- a/src/render/materialsystem/qshaderprogrambuilder.cpp +++ b/src/render/materialsystem/qshaderprogrambuilder.cpp @@ -40,7 +40,6 @@ #include "qshaderprogrambuilder.h" #include "qshaderprogrambuilder_p.h" #include "qshaderprogram.h" -#include <Qt3DRender/private/qurlhelper_p.h> #include <QDebug> #include <QFile> #include <QFileInfo> diff --git a/src/render/materialsystem/shaderbuilder.cpp b/src/render/materialsystem/shaderbuilder.cpp index 5c933759f..871b4cb4c 100644 --- a/src/render/materialsystem/shaderbuilder.cpp +++ b/src/render/materialsystem/shaderbuilder.cpp @@ -42,7 +42,7 @@ #include <Qt3DRender/private/qshaderprogrambuilder_p.h> #include <Qt3DRender/qshaderprogram.h> #include <Qt3DRender/private/qshaderprogram_p.h> -#include <Qt3DRender/private/qurlhelper_p.h> +#include <Qt3DCore/private/qurlhelper_p.h> #include <QtGui/private/qshaderformat_p.h> #include <QtGui/private/qshadergraphloader_p.h> @@ -213,7 +213,7 @@ bool ShaderBuilder::isShaderCodeDirty(QShaderProgram::ShaderType type) const void ShaderBuilder::generateCode(QShaderProgram::ShaderType type) { - const auto graphPath = QUrlHelper::urlToLocalFileOrQrc(shaderGraph(type)); + const auto graphPath = Qt3DCore::QUrlHelper::urlToLocalFileOrQrc(shaderGraph(type)); QFile file(graphPath); if (!file.open(QFile::ReadOnly)) { qWarning() << "Couldn't open file:" << graphPath; |