diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2014-09-29 17:19:36 +0200 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2014-10-03 21:18:41 +0200 |
| commit | 7b26f6a1746419161a8f875e341b3e31220f4141 (patch) | |
| tree | f784e568015e1f7f199abb388b97fefdb158c84e /src/render/frontend/qshaderprogram.h | |
| parent | c16689bb1ccf31416df7b8c69fe032898cf87dec (diff) | |
QNode refactoring
Move almost everything to private classes.
Assimp loading restored.
All examples working.
QNode hierachy is now handled through QObject::setParent, addChild,
removeChild are part of the private api.
Note: commented QChangeArbiter unit tests as they can no longer work with this
patch and will restore them when QChangeArbiter will have been made private.
Task-number: QTBUG-41470
Task-number: QTBUG-41523
Change-Id: I4430974b3aa7f3744c38714b451b122e0cb4d0c9
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/frontend/qshaderprogram.h')
| -rw-r--r-- | src/render/frontend/qshaderprogram.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/render/frontend/qshaderprogram.h b/src/render/frontend/qshaderprogram.h index 26bbbb605..7c70f2fb1 100644 --- a/src/render/frontend/qshaderprogram.h +++ b/src/render/frontend/qshaderprogram.h @@ -82,8 +82,6 @@ public: Compute }; - void copy(const QNode *ref) Q_DECL_OVERRIDE; - // Source from file void setVertexShaderSourceFile(const QString &vertexShaderSourceFile); QString vertexShaderSourceFile() const; @@ -144,9 +142,11 @@ Q_SIGNALS: void computeShaderCodeChanged(); protected: - Q_DECLARE_PRIVATE(QShaderProgram) QShaderProgram(QShaderProgramPrivate &dd, QNode *parent = 0); - QShaderProgram *doClone(bool isClone) const Q_DECL_OVERRIDE; + +private: + Q_DECLARE_PRIVATE(QShaderProgram) + QShaderProgram *doClone() const Q_DECL_OVERRIDE; }; } |