Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

6 files changed, 45 insertions, 5 deletions

diff --git a/src/declarative/graphicsitems/qmlgraphicslistview.cpp b/src/declarative/graphicsitems/qmlgraphicslistview.cpp
index 7fb6454..135262c 100644
--- a/src/declarative/graphicsitems/qmlgraphicslistview.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicslistview.cpp
@@ -1256,6 +1256,8 @@ QmlGraphicsListView::~QmlGraphicsListView()
     d->clear();
     if (d->ownModel)
         delete d->model;
+    delete d->header;
+    delete d->footer;
 }
 
 /*!
diff --git a/src/declarative/graphicsitems/qmlgraphicsloader.cpp b/src/declarative/graphicsitems/qmlgraphicsloader.cpp
index 86239cf..bb1020c 100644
--- a/src/declarative/graphicsitems/qmlgraphicsloader.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsloader.cpp
@@ -263,6 +263,7 @@ void QmlGraphicsLoaderPrivate::_q_sourceLoaded()
 
         QObject *obj = component->create(ctxt);
         if (obj) {
+            ctxt->setParent(obj);
             item = qobject_cast<QmlGraphicsItem *>(obj);
             if (item) {
                 item->setParentItem(q);
@@ -271,6 +272,7 @@ void QmlGraphicsLoaderPrivate::_q_sourceLoaded()
             }
         } else {
             delete obj;
+            delete ctxt;
             source = QUrl();
         }
         emit q->sourceChanged();
diff --git a/src/declarative/graphicsitems/qmlgraphicsrepeater.cpp b/src/declarative/graphicsitems/qmlgraphicsrepeater.cpp
index a650999..99f0faa 100644
--- a/src/declarative/graphicsitems/qmlgraphicsrepeater.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsrepeater.cpp
@@ -56,6 +56,8 @@ QmlGraphicsRepeaterPrivate::QmlGraphicsRepeaterPrivate()
 
 QmlGraphicsRepeaterPrivate::~QmlGraphicsRepeaterPrivate()
 {
+    if (ownModel)
+        delete model;
 }
 
 QML_DEFINE_TYPE(Qt,4,6,Repeater,QmlGraphicsRepeater)
diff --git a/src/declarative/graphicsitems/qmlgraphicstextedit.cpp b/src/declarative/graphicsitems/qmlgraphicstextedit.cpp
index 747e2fb..0b8bc83 100644
--- a/src/declarative/graphicsitems/qmlgraphicstextedit.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicstextedit.cpp
@@ -871,7 +871,10 @@ void QmlGraphicsTextEditPrivate::init()
     q->setFlag(QGraphicsItem::ItemAcceptsInputMethod);
 
     control = new QTextControl(q);
+
+#if QT_VERSION >= 0x040601 // XXX see bug QT-2236
     control->setIgnoreUnusedNavigationEvents(true);
+#endif
 
     QObject::connect(control, SIGNAL(updateRequest(QRectF)), q, SLOT(updateImgCache(QRectF)));
 
diff --git a/src/declarative/graphicsitems/qmlgraphicswebview.cpp b/src/declarative/graphicsitems/qmlgraphicswebview.cpp
index 1fdf557..85fd0d7 100644
--- a/src/declarative/graphicsitems/qmlgraphicswebview.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicswebview.cpp
@@ -103,8 +103,7 @@ public:
 
     QBasicTimer pressTimer;
     QPoint pressPoint;
-    int pressTime; // milliseconds before it's a "hold" XXX not currently settable
-    static const int pressDragLength = 15; // XXX #pixels before it's no longer a "hold"; device-specific
+    int pressTime; // milliseconds before it's a "hold"
 
     void updateWindowObjects();
     class WindowObjectList : public QmlConcreteList<QObject *>
@@ -612,6 +611,28 @@ bool QmlGraphicsWebView::heuristicZoom(int clickX, int clickY, qreal maxzoom)
     }
 }
 
+/*!
+    \qmlproperty int WebView::pressGrabTime
+
+    The number of milliseconds the user must press before the WebView
+    starts passing move events through to the web engine (rather than
+    letting other QML elements such as a Flickable take them).
+
+    Defaults to 400ms. Set to 0 to always grab and pass move events to
+    the web engine.
+*/
+int QmlGraphicsWebView::pressGrabTime() const
+{
+    Q_D(const QmlGraphicsWebView);
+    return d->pressTime;
+}
+
+void QmlGraphicsWebView::setPressGrabTime(int ms)
+{
+    Q_D(QmlGraphicsWebView);
+    d->pressTime = ms;
+}
+
 void QmlGraphicsWebView::mousePressEvent(QGraphicsSceneMouseEvent *event)
 {
     Q_D(QmlGraphicsWebView);
@@ -620,8 +641,13 @@ void QmlGraphicsWebView::mousePressEvent(QGraphicsSceneMouseEvent *event)
     QMouseEvent *me = sceneMouseEventToMouseEvent(event);
 
     d->pressPoint = me->pos();
-    d->pressTimer.start(d->pressTime,this);
-    setKeepMouseGrab(false);
+    if (d->pressTime) {
+        d->pressTimer.start(d->pressTime,this);
+        setKeepMouseGrab(false);
+    } else {
+        grabMouse();
+        setKeepMouseGrab(true);
+    }
 
     page()->event(me);
     event->setAccepted(
@@ -684,7 +710,7 @@ void QmlGraphicsWebView::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
 
     QMouseEvent *me = sceneMouseEventToMouseEvent(event);
     if (d->pressTimer.isActive()) {
-        if ((me->pos() - d->pressPoint).manhattanLength() > d->pressDragLength)  {
+        if ((me->pos() - d->pressPoint).manhattanLength() > QApplication::startDragDistance())  {
             d->pressTimer.stop();
         }
     }
diff --git a/src/declarative/graphicsitems/qmlgraphicswebview_p.h b/src/declarative/graphicsitems/qmlgraphicswebview_p.h
index 0b2ba07..f5edb7a 100644
--- a/src/declarative/graphicsitems/qmlgraphicswebview_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicswebview_p.h
@@ -99,6 +99,8 @@ class Q_DECLARATIVE_EXPORT QmlGraphicsWebView : public QmlGraphicsPaintedItem
 
     Q_PROPERTY(QString html READ html WRITE setHtml)
 
+    Q_PROPERTY(int pressGrabTime READ pressGrabTime WRITE setPressGrabTime)
+
     Q_PROPERTY(int preferredWidth READ preferredWidth WRITE setPreferredWidth NOTIFY preferredWidthChanged)
     Q_PROPERTY(int preferredHeight READ preferredHeight WRITE setPreferredHeight NOTIFY preferredHeightChanged)
     Q_PROPERTY(QUrl url READ url WRITE setUrl NOTIFY urlChanged)
@@ -135,6 +137,9 @@ public:
     Q_INVOKABLE bool heuristicZoom(int clickX, int clickY, qreal maxzoom);
     QRect elementAreaAt(int x, int y, int minwidth, int minheight) const;
 
+    int pressGrabTime() const;
+    void setPressGrabTime(int);
+
     int preferredWidth() const;
     void setPreferredWidth(int);
     int preferredHeight() const;