qiurui
/
qt3d
mirror of https://github.com/qt/qt3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use new custom parser private api and switch to 5.4 branch 

Change-Id: Ie47ce5da4abe9027ca192fbc5c096df49e0eaff5
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
This commit is contained in:
Sean Harmer 2014-08-15 09:59:20 +01:00
parent 93709e0bfc
commit d10325b34e
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/quick3d/quick3drenderer/items/shaderpropertyparser.cpp
View File

@ -54,14 +54,12 @@ ShaderPropertyParser::ShaderPropertyParser()
{
}
QByteArray ShaderPropertyParser::compile(const QV4::CompiledData::QmlUnit *qmlUnit, const QList<const QV4::CompiledData::Binding *> &bindings)
void ShaderPropertyParser::verifyBindings(const QV4::CompiledData::Unit *qmlUnit,
const QList<const QV4::CompiledData::Binding *> &bindings)
{
QByteArray data;
// TO DO : Complete below when a proper Uniform API is defined
// TODO: Complete below when a proper Uniform API is defined
Q_FOREACH (const QV4::CompiledData::Binding *binding, bindings) {
QString propertyName = qmlUnit->header.stringAt(binding->propertyNameIndex);
QString propertyName = qmlUnit->stringAt(binding->propertyNameIndex);
qDebug() << Q_FUNC_INFO << "propertyName " << propertyName;
if (binding->type == QV4::CompiledData::Binding::Type_Object) {
@ -86,13 +84,11 @@ QByteArray ShaderPropertyParser::compile(const QV4::CompiledData::QmlUnit *qmlUn
qDebug() << Q_FUNC_INFO << "Script property";
}
}
return data;
}
void ShaderPropertyParser::setCustomData(QObject *, const QByteArray &, QQmlCompiledData *)
void ShaderPropertyParser::applyBindings(QObject *, QQmlCompiledData *, const QList<const QV4::CompiledData::Binding *> &)
{
// TODO: Implement me
}
} // Quick

6
src/quick3d/quick3drenderer/items/shaderpropertyparser.h
View File

@ -44,6 +44,7 @@
#include <Qt3DQuickRenderer/qt3dquickrenderer_global.h>
#include <QtQml/private/qqmlcustomparser_p.h>
#include <QtQml/private/qv4compileddata_p.h>
QT_BEGIN_NAMESPACE
@ -58,8 +59,11 @@ class QT3DQUICKRENDERERSHARED_EXPORT ShaderPropertyParser : public QQmlCustomPar
public:
ShaderPropertyParser();
QByteArray compile(const QV4::CompiledData::QmlUnit *qmlUnit, const QList<const QV4::CompiledData::Binding *> &bindings);
QByteArray compile(const QV4::CompiledData::Unit *qmlUnit, const QList<const QV4::CompiledData::Binding *> &bindings);
void setCustomData(QObject *, const QByteArray &, QQmlCompiledData *);
void verifyBindings(const QV4::CompiledData::Unit *, const QList<const QV4::CompiledData::Binding *> &) Q_DECL_OVERRIDE;
void applyBindings(QObject *, QQmlCompiledData *, const QList<const QV4::CompiledData::Binding *> &) Q_DECL_OVERRIDE;
};
} // Quick

6
sync.profile
View File

@ -22,7 +22,7 @@ $publicclassregexp = "Qt3D::.+";
# - any git symbolic ref resolvable from the module's repository (e.g. "refs/heads/master" to track master branch)
#
%dependencies = (
"qtbase" => "refs/heads/dev",
"qtxmlpatterns" => "refs/heads/dev",
"qtdeclarative" => "refs/heads/dev",
"qtbase" => "refs/heads/5.4",
"qtxmlpatterns" => "refs/heads/5.4",
"qtdeclarative" => "refs/heads/5.4",
);