diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-05-26 08:34:03 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-05-26 08:34:03 (GMT) |
| commit | aedd4d0cfb6965f51fb38689539b3417b6071601 (patch) | |
| tree | 5c80c85d0f8d26c45be1d5956d9c903aee95174c /src/declarative/qml/qml.pri | |
| parent | b29a83e5070410359ebed2d99b18f86bbe2d2939 (diff) | |
| parent | a06c0fe5a2c9eebf5e7cceb06f64e725b42715bd (diff) | |
| download | Qt-aedd4d0cfb6965f51fb38689539b3417b6071601.zip Qt-aedd4d0cfb6965f51fb38689539b3417b6071601.tar.gz Qt-aedd4d0cfb6965f51fb38689539b3417b6071601.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/qml/qml.pri')
| -rw-r--r-- | src/declarative/qml/qml.pri | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/declarative/qml/qml.pri b/src/declarative/qml/qml.pri index 99e30e4..b6ac30e 100644 --- a/src/declarative/qml/qml.pri +++ b/src/declarative/qml/qml.pri @@ -22,7 +22,8 @@ SOURCES += qml/qmlparser.cpp \ qml/qmlparserstatus.cpp \ qml/qmlcompositetypemanager.cpp \ qml/qmlinfo.cpp \ - qml/qmlerror.cpp + qml/qmlerror.cpp \ + qml/qmlscriptparser.cpp HEADERS += qml/qmlparser_p.h \ qml/qmlinstruction_p.h \ @@ -59,15 +60,13 @@ HEADERS += qml/qmlparser_p.h \ qml/qmlcompositetypemanager_p.h \ qml/qmllist.h \ qml/qmldeclarativedata_p.h \ - qml/qmlerror.h + qml/qmlerror.h \ + qml/qmlscriptparser_p.h # for qtscript debugger QT += scripttools -include(script/script.pri) -# new language front-end +include(script/script.pri) include(parser/parser.pri) +include(rewriter/rewriter.pri) -HEADERS += qml/qmlscriptparser_p.h - -SOURCES += qml/qmlscriptparser.cpp |