- Fixed KineticScrolling due to Qt 4.6.1 changes.

[qtrapids] / src / client / ColumnSelectorDialog.cpp

diff --git a/src/client/ColumnSelectorDialog.cpp b/src/client/ColumnSelectorDialog.cpp
index 274b841..88f1dc4 100644 (file)
--- a/src/client/ColumnSelectorDialog.cpp
+++ b/src/client/ColumnSelectorDialog.cpp
@@ -28,7 +28,7 @@
 #include <QAbstractButton>
 
 #ifdef Q_WS_MAEMO_5
-       #include <QtMaemo5/QMaemo5KineticScroller>
+       #include <QAbstractKineticScroller>
 #endif
 
 #include "ColumnSelectorDialog.h"
@@ -36,16 +36,20 @@
 
 ColumnSelectorDialog::ColumnSelectorDialog(QTreeWidget *treewidget, QWidget* parent, Qt::WindowFlags f) :
        QDialog(parent, f), // Superclass construct
-       dialogButtons_(0),
-       grid_(0),
+       dialogButtons_(NULL),
+       grid_(NULL),
        treeWidget_(treewidget),
+       scroller_(NULL)
        checkBoxes_()
 {
-       /// @TODO Kineticscrolling (Fingerscrollable does not work in Qt 4.6, only in 4.5)      
        QScrollArea *scrollArea = new QScrollArea(this);
 
 #ifdef Q_WS_MAEMO_5
-       new QMaemo5KineticScroller(scrollArea);
+       /// @todo Kineticscrolling (property "FingerScrollable" does not work in Qt 4.6, only in 4.5)   
+       scroller_ = scrollArea->property("kineticScroller").value<QAbstractKineticScroller*>();
+
+       if (!scroller_)                                                               
+               qFatal("This example only works with QMaemo5Style as the default style for all QAbstractScrollAreas"); 
 #endif
 
        scrollArea->setWidgetResizable(true);