diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-06-30 04:42:16 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-06-30 04:42:16 (GMT) |
| commit | c9135a429441cb00720866604b79d6613000f7c5 (patch) | |
| tree | b338494396f892094afa933d8f10475215752c0a /src/declarative/extra/extra.pri | |
| parent | dba327eec1a308e61c2bd21941ba982fb9283827 (diff) | |
| parent | a77153a64e8559b21a7e6ea53fe26eb2719ce9f5 (diff) | |
| download | Qt-c9135a429441cb00720866604b79d6613000f7c5.zip Qt-c9135a429441cb00720866604b79d6613000f7c5.tar.gz Qt-c9135a429441cb00720866604b79d6613000f7c5.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/extra/extra.pri
Diffstat (limited to 'src/declarative/extra/extra.pri')
| -rw-r--r-- | src/declarative/extra/extra.pri | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/src/declarative/extra/extra.pri b/src/declarative/extra/extra.pri index 7244f98..fde4e3a 100644 --- a/src/declarative/extra/extra.pri +++ b/src/declarative/extra/extra.pri @@ -1,16 +1,29 @@ SOURCES += \ extra/qnumberformat.cpp \ extra/qmlnumberformatter.cpp \ + extra/qmldatetimeformatter.cpp \ extra/qfxintegermodel.cpp \ extra/qmlfolderlistmodel.cpp \ - extra/qmltimer.cpp + extra/qmltimer.cpp \ + extra/qfxanimatedimageitem.cpp \ + extra/qfxblendedimage.cpp \ + extra/qfxflowview.cpp \ + extra/qmlbehaviour.cpp \ + extra/qbindablemap.cpp HEADERS += \ extra/qnumberformat.h \ extra/qmlnumberformatter.h \ + extra/qmldatetimeformatter.h \ extra/qfxintegermodel.h \ extra/qmlfolderlistmodel.h \ - extra/qmltimer.h + extra/qmltimer.h \ + extra/qfxanimatedimageitem.h \ + extra/qfxanimatedimageitem_p.h \ + extra/qfxblendedimage.h \ + extra/qfxflowview.h \ + extra/qmlbehaviour.h \ + extra/qbindablemap.h contains(QT_CONFIG, xmlpatterns) { QT+=xmlpatterns |