diff options
author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-05-04 11:38:59 +0200 |
---|---|---|
committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-05-04 11:38:59 +0200 |
commit | 01285af37aafa00a1bf3fbd7654b1ec5e057775d (patch) | |
tree | b3c421716c3bc6892b565a096a8ec5be837cd267 /src/imports | |
parent | 16f58282bc5a1f81f7346ac6560df68761ad277d (diff) | |
parent | dbbcc4dff099d5cf41a3253f922b785889e17545 (diff) |
Merge branch 'master' into qtquick2
Conflicts:
src/imports/particles/particles.pro
Diffstat (limited to 'src/imports')
-rw-r--r-- | src/imports/gestures/gestures.pro | 2 | ||||
-rw-r--r-- | src/imports/particles/particles.pro | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/imports/gestures/gestures.pro b/src/imports/gestures/gestures.pro index 8ebf9a02f8..7ecd4b8afa 100644 --- a/src/imports/gestures/gestures.pro +++ b/src/imports/gestures/gestures.pro @@ -2,7 +2,7 @@ TARGET = qmlgesturesplugin TARGETPATH = Qt/labs/gestures include(../qimportbase.pri) -QT += declarative +QT += core-private gui-private declarative-private script-private SOURCES += qdeclarativegesturearea.cpp plugin.cpp HEADERS += qdeclarativegesturearea_p.h diff --git a/src/imports/particles/particles.pro b/src/imports/particles/particles.pro index c04e640ba6..6eea892f83 100644 --- a/src/imports/particles/particles.pro +++ b/src/imports/particles/particles.pro @@ -48,6 +48,8 @@ HEADERS += \ deformableparticle.h \ pictureaffector.h +QT += core-private gui-private declarative-private + SOURCES += \ V1/qdeclarativeparticles.cpp \ spritestate.cpp \ |