summaryrefslogtreecommitdiffstats
path: root/src/gui/util/util.pri
diff options
context:
space:
mode:
authorRobert Griebl <robert.griebl@nokia.com>2010-11-30 21:44:52 (GMT)
committerRobert Griebl <robert.griebl@nokia.com>2010-12-02 00:04:34 (GMT)
commit0274e68767cce6440515a68d6af868725d5577a4 (patch)
tree7b219fb5cce3c9e76ae966f13401ae13bad9b28d /src/gui/util/util.pri
parentf6f8ba94d5f82b8df723a217a3d0ecb50e570cbc (diff)
downloadQt-0274e68767cce6440515a68d6af868725d5577a4.zip
Qt-0274e68767cce6440515a68d6af868725d5577a4.tar.gz
Qt-0274e68767cce6440515a68d6af868725d5577a4.tar.bz2
QScroller merge, part 1
This merge consists of the actual kinetic scroller implementation, its autotests plus a few examples. QAbstractScrollArea and QAbstractItemView have been extended to support the new scroll events. The complete history is in http://scm.dev.nokia.troll.no/projects/qt/repos/rgriebls-qt-flickgesture/logs/4.7-flickgesture (part 2 is the QML Flickable replacement / part 3 is QWebView support) Task-number: QTBUG-9054 Reviewed-by: Ralf Engels
Diffstat (limited to 'src/gui/util/util.pri')
-rw-r--r--src/gui/util/util.pri12
1 files changed, 12 insertions, 0 deletions
diff --git a/src/gui/util/util.pri b/src/gui/util/util.pri
index f125f82..2814a2d 100644
--- a/src/gui/util/util.pri
+++ b/src/gui/util/util.pri
@@ -6,6 +6,11 @@ HEADERS += \
util/qcompleter_p.h \
util/qdesktopservices.h \
util/qsystemtrayicon_p.h \
+ util/qscroller.h \
+ util/qscroller_p.h \
+ util/qscrollerproperties.h \
+ util/qscrollerproperties_p.h \
+ util/qflickgesture_p.h \
util/qundogroup.h \
util/qundostack.h \
util/qundostack_p.h \
@@ -15,6 +20,9 @@ SOURCES += \
util/qsystemtrayicon.cpp \
util/qcompleter.cpp \
util/qdesktopservices.cpp \
+ util/qscroller.cpp \
+ util/qscrollerproperties.cpp \
+ util/qflickgesture.cpp \
util/qundogroup.cpp \
util/qundostack.cpp \
util/qundoview.cpp
@@ -57,3 +65,7 @@ symbian {
DEFINES += USE_SCHEMEHANDLER
}
}
+
+macx {
+ OBJECTIVE_SOURCES += util/qscroller_mac.mm
+}