summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qdeclarativecompiler_p.h
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2010-03-03 07:14:07 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2010-03-03 07:15:01 (GMT)
commit4690084e9f3fbf3635aa3fb6a8025ae046672aea (patch)
treee691c0745411ae0075cd507bc14799cc30c68124 /src/declarative/qml/qdeclarativecompiler_p.h
parentaebadf248a93458615a53b3480987f829aba0ee6 (diff)
downloadQt-4690084e9f3fbf3635aa3fb6a8025ae046672aea.zip
Qt-4690084e9f3fbf3635aa3fb6a8025ae046672aea.tar.gz
Qt-4690084e9f3fbf3635aa3fb6a8025ae046672aea.tar.bz2
Move JS global scope to top of the QML scope chain
QT-2787
Diffstat (limited to 'src/declarative/qml/qdeclarativecompiler_p.h')
-rw-r--r--src/declarative/qml/qdeclarativecompiler_p.h2
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);