diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2011-06-09 16:22:45 +1000 |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2011-06-09 16:22:45 +1000 |
| commit | 250763ffb5cef2173b80b0e67266c937850ff516 (patch) | |
| tree | 1de5e73b20a714c2cd32565873e6f3712a699c0d /src/declarative/qml/qml.pri | |
| parent | 8bb487e60899382f0890fd675eb272d5cc562882 (diff) | |
| parent | 2d16155bb8fef642ce6bb5cab7cb26b1289a1e6b (diff) | |
Merge branch 'qtquick2' into v8
Conflicts:
src/declarative/qml/qml.pri
Diffstat (limited to 'src/declarative/qml/qml.pri')
| -rw-r--r-- | src/declarative/qml/qml.pri | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/declarative/qml/qml.pri b/src/declarative/qml/qml.pri index cc2f362d4a..7325cd8340 100644 --- a/src/declarative/qml/qml.pri +++ b/src/declarative/qml/qml.pri @@ -113,12 +113,10 @@ HEADERS += \ $$PWD/qdeclarativeimport_p.h \ $$PWD/qdeclarativeextensionplugin.h \ $$PWD/qintrusivelist_p.h \ + $$PWD/qdeclarativescriptstring_p.h QT += sql include(parser/parser.pri) include(rewriter/rewriter.pri) include(v4/v4.pri) include(v8/v8.pri) - -# mirrors logic in corelib/kernel/kernel.pri -unix:!symbian: contains(QT_CONFIG, clock-gettime):include($$QT_SOURCE_TREE/config.tests/unix/clock-gettime/clock-gettime.pri) |