diff options
author | Paul Lemire <paul.lemire@kdab.com> | 2014-10-02 09:40:37 +0200 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2014-10-03 21:18:49 +0200 |
commit | 3f20529e605eac75f416931c5c96ea03efa0c3ce (patch) | |
tree | 1db3865f104a9a61ab5eeb71b5fc77868adbe07b /src/render/frontend/qshaderprogram.cpp | |
parent | 7b26f6a1746419161a8f875e341b3e31220f4141 (diff) |
QAbstract removed from core
Task-number: QTBUG-41530
Change-Id: I32ed3d9b819e4e9eafdd36adc30bed9156284777
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/frontend/qshaderprogram.cpp')
-rw-r--r-- | src/render/frontend/qshaderprogram.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/render/frontend/qshaderprogram.cpp b/src/render/frontend/qshaderprogram.cpp index 048c31e4f..cc080b1ca 100644 --- a/src/render/frontend/qshaderprogram.cpp +++ b/src/render/frontend/qshaderprogram.cpp @@ -50,13 +50,13 @@ QT_BEGIN_NAMESPACE namespace Qt3D { QShaderProgramPrivate::QShaderProgramPrivate(QShaderProgram *qq) - : QAbstractShaderPrivate(qq) + : QNodePrivate(qq) { } void QShaderProgramPrivate::copy(const QNodePrivate *ref) { - QAbstractShaderPrivate::copy(ref); + QNodePrivate::copy(ref); const QShaderProgramPrivate *prog = static_cast<const QShaderProgramPrivate *>(ref); m_vertexSourceFile = prog->m_vertexSourceFile; m_tessControlSourceFile = prog->m_tessControlSourceFile; @@ -74,12 +74,12 @@ void QShaderProgramPrivate::copy(const QNodePrivate *ref) } QShaderProgram::QShaderProgram(QNode *parent) - : QAbstractShader(*new QShaderProgramPrivate(this), parent) + : QNode(*new QShaderProgramPrivate(this), parent) { } QShaderProgram::QShaderProgram(QShaderProgramPrivate &dd, QNode *parent) - : QAbstractShader(dd, parent) + : QNode(dd, parent) { } |