diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-08-31 08:55:16 +0200 |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-08-31 08:55:16 +0200 |
| commit | 71478352376022faa9be6d79f2a760c289945ff5 (patch) | |
| tree | 0f8ff4a88c1b033367337a93d23a329d145ee903 /src/declarative/qml/qdeclarativecustomparser_p.h | |
| parent | c38efcb67cf93ba3e91e184c3b891efef4ef75a3 (diff) | |
| parent | 05daa9bfe1a03ffe1cc580b6cfd88e093e2493c0 (diff) | |
Merge branch 'master' into refactor
Conflicts:
src/3rdparty/v8
src/declarative/declarative.pro
src/declarative/items/qsgcanvas.cpp
src/declarative/items/qsgshadereffectsource_p.h
src/declarative/items/qsgview.cpp
src/declarative/particles/qsgcustomparticle.cpp
src/imports/gestures/gestures.pro
src/imports/particles/particles.pro
src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro
src/qtquick1/qtquick1.pro
tests/auto/declarative/examples/examples.pro
tests/auto/declarative/qsglistview/qsglistview.pro
tests/auto/qtquick1/qdeclarativeviewer/qdeclarativeviewer.pro
Change-Id: I423344f83e1835116cad531b877fde6e68a8849a
Diffstat (limited to 'src/declarative/qml/qdeclarativecustomparser_p.h')
| -rw-r--r-- | src/declarative/qml/qdeclarativecustomparser_p.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/declarative/qml/qdeclarativecustomparser_p.h b/src/declarative/qml/qdeclarativecustomparser_p.h index 31452836bd..47b3ee8f8e 100644 --- a/src/declarative/qml/qdeclarativecustomparser_p.h +++ b/src/declarative/qml/qdeclarativecustomparser_p.h @@ -55,7 +55,7 @@ #include "private/qdeclarativemetatype_p.h" #include "qdeclarativeerror.h" -#include "private/qdeclarativeparser_p.h" +#include "private/qdeclarativescript_p.h" #include "private/qdeclarativebinding_p.h" #include <QtCore/qbytearray.h> @@ -79,10 +79,10 @@ public: ~QDeclarativeCustomParserProperty(); QByteArray name() const; - QDeclarativeParser::Location location() const; + QDeclarativeScript::Location location() const; bool isList() const; - // Will be one of QDeclarativeParser::Variant, QDeclarativeCustomParserProperty or + // Will be one of QDeclarativeScript::Variant, QDeclarativeCustomParserProperty or // QDeclarativeCustomParserNode QList<QVariant> assignedValues() const; @@ -102,7 +102,7 @@ public: ~QDeclarativeCustomParserNode(); QByteArray name() const; - QDeclarativeParser::Location location() const; + QDeclarativeScript::Location location() const; QList<QDeclarativeCustomParserProperty> properties() const; @@ -147,7 +147,7 @@ protected: private: QList<QDeclarativeError> exceptions; QDeclarativeCompiler *compiler; - QDeclarativeParser::Object *object; + QDeclarativeScript::Object *object; Flags m_flags; friend class QDeclarativeCompiler; }; |