diff options
author | Yann Bodson <yann.bodson@nokia.com> | 2010-03-03 07:55:43 (GMT) |
---|---|---|
committer | Yann Bodson <yann.bodson@nokia.com> | 2010-03-03 07:55:43 (GMT) |
commit | 639ae76c6d1a46db546beb00c1d9022867ef7e2e (patch) | |
tree | daf1e890b48bfbed8a10de60f5c071d103ddbc43 /src/declarative/qml/qdeclarativecompiler_p.h | |
parent | 07bd4f61caaa61866fcfa7847eeeb905d4fa2b38 (diff) | |
parent | ef785f047adf6f559c282d67e627b78b75a7b9ef (diff) | |
download | Qt-639ae76c6d1a46db546beb00c1d9022867ef7e2e.zip Qt-639ae76c6d1a46db546beb00c1d9022867ef7e2e.tar.gz Qt-639ae76c6d1a46db546beb00c1d9022867ef7e2e.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/declarative/qml/qdeclarativecompiler_p.h')
-rw-r--r-- | src/declarative/qml/qdeclarativecompiler_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativecompiler_p.h b/src/declarative/qml/qdeclarativecompiler_p.h index 93a3f83..f8ada95 100644 --- a/src/declarative/qml/qdeclarativecompiler_p.h +++ b/src/declarative/qml/qdeclarativecompiler_p.h @@ -155,7 +155,6 @@ public: bool isError() const; QList<QDeclarativeError> errors() const; - static bool isValidId(const QString &); static bool isAttachedPropertyName(const QByteArray &); static bool isSignalPropertyName(const QByteArray &); @@ -247,6 +246,7 @@ private: QDeclarativeParser::Object *obj, const QDeclarativeParser::Object::DynamicProperty &); bool completeComponentBuild(); + bool checkValidId(QDeclarativeParser::Value *, const QString &); void genObject(QDeclarativeParser::Object *obj); |