diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-05 10:25:45 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-05 10:25:45 (GMT) |
| commit | f30d3602011780e598e6b55c69d0b40a9cc94e16 (patch) | |
| tree | 12449eb61dc1f119d9254198979ec51295fa9151 /src/declarative/qml/parser/parser.pri | |
| parent | 349e9189e205c3dfdef271798310d1f38163b891 (diff) | |
| parent | 1f221f04afb2fc8a1426d30f77f3e6026fdbdab7 (diff) | |
| download | Qt-f30d3602011780e598e6b55c69d0b40a9cc94e16.zip Qt-f30d3602011780e598e6b55c69d0b40a9cc94e16.tar.gz Qt-f30d3602011780e598e6b55c69d0b40a9cc94e16.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (3324 commits)
Fix test.
Remove hacky fix (breaks autotest).
Fix Behaviors for object-type properties.
Pass symbols::prefix (Action -> QmlAction)
Add license header.
Fix bad merge (compile)
Pass tst_headers::licenseCheck
Fix ListView tests.
Test fixes.
More test fixes.
Clean up QmlImageReader thread on engine destruction.
Update test to handle QmlNetworkAccessManagerFactory
Test fixes.
Add a QEXPECT_FAIL for known bug.
Fix autotest.
Add some painting benchmarks.
Make sure cookies are saved.
Fix headers::licenseCheck autotest failure
Re-add accidentally deleted file
Test SizeItemToLoader to SizeLoaderToItem resizeMode change.
...
Diffstat (limited to 'src/declarative/qml/parser/parser.pri')
| -rw-r--r-- | src/declarative/qml/parser/parser.pri | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/src/declarative/qml/parser/parser.pri b/src/declarative/qml/parser/parser.pri new file mode 100644 index 0000000..4530479 --- /dev/null +++ b/src/declarative/qml/parser/parser.pri @@ -0,0 +1,21 @@ +INCLUDEPATH += $$PWD + +HEADERS += \ + $$PWD/qmljsast_p.h \ + $$PWD/qmljsastfwd_p.h \ + $$PWD/qmljsastvisitor_p.h \ + $$PWD/qmljsengine_p.h \ + $$PWD/qmljsgrammar_p.h \ + $$PWD/qmljslexer_p.h \ + $$PWD/qmljsmemorypool_p.h \ + $$PWD/qmljsnodepool_p.h \ + $$PWD/qmljsparser_p.h \ + $$PWD/qmljsglobal_p.h + +SOURCES += \ + $$PWD/qmljsast.cpp \ + $$PWD/qmljsastvisitor.cpp \ + $$PWD/qmljsengine_p.cpp \ + $$PWD/qmljsgrammar.cpp \ + $$PWD/qmljslexer.cpp \ + $$PWD/qmljsparser.cpp |