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/declarative.pro | |
| parent | 8bb487e60899382f0890fd675eb272d5cc562882 (diff) | |
| parent | 2d16155bb8fef642ce6bb5cab7cb26b1289a1e6b (diff) | |
Merge branch 'qtquick2' into v8
Conflicts:
src/declarative/qml/qml.pri
Diffstat (limited to 'src/declarative/declarative.pro')
| -rw-r--r-- | src/declarative/declarative.pro | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/declarative/declarative.pro b/src/declarative/declarative.pro index bc3dbbb9c4..5cb1d9570c 100644 --- a/src/declarative/declarative.pro +++ b/src/declarative/declarative.pro @@ -19,7 +19,7 @@ exists("qdeclarative_enable_gcov") { LIBS += -lgcov } -include($$QT_SOURCE_TREE/src/qbase.pri) +load(qt_module_config) HEADERS += qtdeclarativeversion.h @@ -33,6 +33,7 @@ include(qml/qml.pri) include(debugger/debugger.pri) include(scenegraph/scenegraph.pri) include(items/items.pri) +include(particles/particles.pri) symbian: { TARGET.UID3=0x2001E623 |