Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7

7 files changed, 97 insertions, 381 deletions

diff --git a/src/declarative/graphicsitems/graphicsitems.pri b/src/declarative/graphicsitems/graphicsitems.pri
index af76a67..eab41e3 100644
--- a/src/declarative/graphicsitems/graphicsitems.pri
+++ b/src/declarative/graphicsitems/graphicsitems.pri
@@ -48,7 +48,6 @@ HEADERS += \
     $$PWD/qdeclarativetext_p_p.h \
     $$PWD/qdeclarativevisualitemmodel_p.h \
     $$PWD/qdeclarativelistview_p.h \
-    $$PWD/qdeclarativegraphicsobjectcontainer_p.h \
     $$PWD/qdeclarativelayoutitem_p.h \
     $$PWD/qdeclarativeitemchangelistener_p.h \
     $$PWD/qdeclarativeeffects.cpp
@@ -82,5 +81,4 @@ SOURCES += \
     $$PWD/qdeclarativetextedit.cpp \
     $$PWD/qdeclarativevisualitemmodel.cpp \
     $$PWD/qdeclarativelistview.cpp \
-    $$PWD/qdeclarativegraphicsobjectcontainer.cpp \
     $$PWD/qdeclarativelayoutitem.cpp
diff --git a/src/declarative/graphicsitems/qdeclarativegraphicsobjectcontainer.cpp b/src/declarative/graphicsitems/qdeclarativegraphicsobjectcontainer.cpp
deleted file mode 100644
index f5beebd..0000000
--- a/src/declarative/graphicsitems/qdeclarativegraphicsobjectcontainer.cpp
+++ /dev/null
@@ -1,269 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "private/qdeclarativegraphicsobjectcontainer_p.h"
-
-#include "private/qdeclarativeitem_p.h"
-
-#include <QGraphicsObject>
-#include <QGraphicsWidget>
-#include <QGraphicsSceneResizeEvent>
-
-QT_BEGIN_NAMESPACE
-
-class QDeclarativeGraphicsObjectContainerPrivate : public QDeclarativeItemPrivate
-{
-    Q_DECLARE_PUBLIC(QDeclarativeGraphicsObjectContainer)
-
-public:
-    QDeclarativeGraphicsObjectContainerPrivate() : QDeclarativeItemPrivate(), graphicsObject(0), syncedResize(false)
-    { }
-
-    void _q_updateSize();
-
-    void setFiltering(bool on)
-    {
-        Q_Q(QDeclarativeGraphicsObjectContainer);
-        if (graphicsObject && graphicsObject->isWidget()) {
-            if (!on) {
-                graphicsObject->removeEventFilter(q);
-                QObject::disconnect(q, SIGNAL(widthChanged()), q, SLOT(_q_updateSize()));
-                QObject::disconnect(q, SIGNAL(heightChanged()), q, SLOT(_q_updateSize()));
-            } else {
-                graphicsObject->installEventFilter(q);
-                QObject::connect(q, SIGNAL(widthChanged()), q, SLOT(_q_updateSize()));
-                QObject::connect(q, SIGNAL(heightChanged()), q, SLOT(_q_updateSize()));
-            }
-        }
-    }
-
-
-    QGraphicsObject *graphicsObject;
-    bool syncedResize;
-};
-
-
-/*!
-    \qmlclass GraphicsObjectContainer QDeclarativeGraphicsObjectContainer
-    \since 4.7
-    \brief The GraphicsObjectContainer element allows you to add QGraphicsObjects into Fluid UI elements.
-
-    While any QObject based class can be exposed to QML, QDeclarativeItem
-    provides a lot of important functionality, including anchors and proper
-    management of child items. GraphicsObjectContainer helps provide these
-    functions to other QGraphicsObjects, so that they can be used unaltered in
-    a QML scene. QGraphicsObjects, which are not QDeclarativeItems, and which are
-    placed in a QML scene outside of a GraphicsObjectContainer, will not appear
-    on screen at all.
-
-    A GraphicsObjectContainer can have one element inside it, and it must be a
-    QGraphicsObject or subclass which has been exposed to the QML engine.
-    The graphics object inside the GraphicsObjectContainer can then be used
-    like any other item in QML with the exception of not being reparentable
-    and not having the standard properties of QML items (such as anchors).
-
-    As the contained object is positioned relative to the container, anchors
-    affecting the container item will affect the onscreen position of the
-    contained item. If synchronizedResizing is set to true, then anchors
-    affecting the container item's size will also affect the contained item's
-    size.
-
-    Example:
-    \code
-    import Qt 4.7
-    import MyApp 2.1 as Widgets
-    Rectangle{
-        id: rect
-        property alias widgetPropertyThree: widget.myThirdProperty;
-        GraphicsObjectContainer{
-            synchronizedResizing: true
-            anchors.margins: 10
-            anchors.fill: parent
-            Widgets.MyWidget{
-                myProperty: "A Value"
-                myOtherProperty: rect.color
-            }
-        }
-    }
-    \endcode
-*/
-
-/*!
-    \internal
-    \class QDeclarativeGraphicsObjectContainer
-    \brief The QDeclarativeGraphicsObjectContainer class allows you to add QGraphicsObjects into Fluid UI applications.
-*/
-
-QDeclarativeGraphicsObjectContainer::QDeclarativeGraphicsObjectContainer(QDeclarativeItem *parent)
-: QDeclarativeItem(*new QDeclarativeGraphicsObjectContainerPrivate, parent)
-{
-}
-
-QDeclarativeGraphicsObjectContainer::~QDeclarativeGraphicsObjectContainer()
-{
-}
-
-QGraphicsObject *QDeclarativeGraphicsObjectContainer::graphicsObject() const
-{
-    Q_D(const QDeclarativeGraphicsObjectContainer);
-    return d->graphicsObject;
-}
-
-/*!
-    \qmlproperty QGraphicsObject GraphicsObjectContainer::graphicsObject
-    The QGraphicsObject associated with this element.
-*/
-void QDeclarativeGraphicsObjectContainer::setGraphicsObject(QGraphicsObject *object)
-{
-    Q_D(QDeclarativeGraphicsObjectContainer);
-    if (object == d->graphicsObject)
-        return;
-
-    //### remove previously set item?
-
-    d->setFiltering(false);
-
-    d->graphicsObject = object;
-
-    if (d->graphicsObject) {
-        d->graphicsObject->setParentItem(this);
-
-        if (d->syncedResize && d->graphicsObject->isWidget()) {
-            QGraphicsWidget *gw = static_cast<QGraphicsWidget*>(d->graphicsObject);
-            QSizeF gwSize = gw->size(); //### should we use sizeHint?
-            QSizeF newSize = gwSize;
-            if (heightValid())
-                newSize.setHeight(height());
-            if (widthValid())
-                newSize.setWidth(width());
-            if (gwSize != newSize)
-                gw->resize(newSize);
-
-            gwSize = gw->size();
-            setImplicitWidth(gwSize.width());
-            setImplicitHeight(gwSize.height());
-
-            d->setFiltering(true);
-        }
-    }
-}
-
-QVariant QDeclarativeGraphicsObjectContainer::itemChange(GraphicsItemChange change, const QVariant &value)
-{
-    Q_D(QDeclarativeGraphicsObjectContainer);
-    if (change == ItemSceneHasChanged) {
-        QGraphicsObject *o = d->graphicsObject;
-        d->graphicsObject = 0;
-        setGraphicsObject(o);
-    }
-    return QDeclarativeItem::itemChange(change, value);
-}
-
-bool QDeclarativeGraphicsObjectContainer::eventFilter(QObject *watched, QEvent *e)
-{
-    Q_D(QDeclarativeGraphicsObjectContainer);
-    if (watched == d->graphicsObject && e->type() == QEvent::GraphicsSceneResize) {
-        if (d->graphicsObject && d->graphicsObject->isWidget() && d->syncedResize) {
-           QSizeF newSize = static_cast<QGraphicsWidget*>(d->graphicsObject)->size();
-           setImplicitWidth(newSize.width());
-           setImplicitHeight(newSize.height());
-       }
-    }
-    return QDeclarativeItem::eventFilter(watched, e);
-}
-
-/*!
-    \qmlproperty bool GraphicsObjectContainer::synchronizedResizing
-
-    This property determines whether or not the container and graphics object will synchronize their
-    sizes.
-
-    \note This property only applies when wrapping a QGraphicsWidget.
-
-    If synchronizedResizing is enabled, the container and widget will
-    synchronize their sizes as follows.
-    \list
-    \o If a size has been set on the container, the widget will be resized to the container.
-    Any changes in the container's size will be reflected in the widget.
-
-    \o \e Otherwise, the container will initially be sized to the preferred size of the widget.
-    Any changes to the container's size will be reflected in the widget, and any changes to the
-    widget's size will be reflected in the container.
-    \endlist
-*/
-bool QDeclarativeGraphicsObjectContainer::synchronizedResizing() const
-{
-    Q_D(const QDeclarativeGraphicsObjectContainer);
-    return d->syncedResize;
-}
-
-void QDeclarativeGraphicsObjectContainer::setSynchronizedResizing(bool on)
-{
-    Q_D(QDeclarativeGraphicsObjectContainer);
-    if (on == d->syncedResize)
-        return;
-
-    d->syncedResize = on;
-    d->setFiltering(on);
-}
-
-void QDeclarativeGraphicsObjectContainerPrivate::_q_updateSize()
-{
-    if (!graphicsObject || !graphicsObject->isWidget() || !syncedResize)
-        return;
-
-    QGraphicsWidget *gw = static_cast<QGraphicsWidget*>(graphicsObject);
-    const QSizeF newSize(width(), height());
-    gw->resize(newSize);
-
-    //### will respecting the widgets min/max ever get us in trouble? (all other items always
-    //    size to exactly what you tell them)
-    /*QSizeF constrainedSize = newSize.expandedTo(gw->minimumSize()).boundedTo(gw->maximumSize());
-    gw->resize(constrainedSize);
-    if (constrainedSize != newSize) {
-        setImplicitWidth(constrainedSize.width());
-        setImplicitHeight(constrainedSize.height());
-    }*/
-}
-
-#include <moc_qdeclarativegraphicsobjectcontainer_p.cpp>
-
-QT_END_NAMESPACE
diff --git a/src/declarative/graphicsitems/qdeclarativegraphicsobjectcontainer_p.h b/src/declarative/graphicsitems/qdeclarativegraphicsobjectcontainer_p.h
deleted file mode 100644
index 20c5bcf..0000000
--- a/src/declarative/graphicsitems/qdeclarativegraphicsobjectcontainer_p.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QDECLARATIVEGRAPHICSOBJECTCONTAINER_H
-#define QDECLARATIVEGRAPHICSOBJECTCONTAINER_H
-
-#include "qdeclarativeitem.h"
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class QGraphicsObject;
-class QDeclarativeGraphicsObjectContainerPrivate;
-
-class Q_DECLARATIVE_EXPORT QDeclarativeGraphicsObjectContainer : public QDeclarativeItem
-{
-    Q_OBJECT
-
-    Q_CLASSINFO("DefaultProperty", "graphicsObject")
-    Q_PROPERTY(QGraphicsObject *graphicsObject READ graphicsObject WRITE setGraphicsObject)
-    Q_PROPERTY(bool synchronizedResizing READ synchronizedResizing WRITE setSynchronizedResizing)
-
-public:
-    QDeclarativeGraphicsObjectContainer(QDeclarativeItem *parent = 0);
-    ~QDeclarativeGraphicsObjectContainer();
-
-    QGraphicsObject *graphicsObject() const;
-    void setGraphicsObject(QGraphicsObject *);
-
-    bool synchronizedResizing() const;
-    void setSynchronizedResizing(bool on);
-
-protected:
-    QVariant itemChange(GraphicsItemChange change, const QVariant &value);
-    bool eventFilter(QObject *watched, QEvent *e);
-
-private:
-    Q_PRIVATE_SLOT(d_func(), void _q_updateSize())
-    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QDeclarativeGraphicsObjectContainer)
-};
-
-QT_END_NAMESPACE
-
-QML_DECLARE_TYPE(QDeclarativeGraphicsObjectContainer)
-
-QT_END_HEADER
-
-#endif // QDECLARATIVEGRAPHICSOBJECTCONTAINER_H
diff --git a/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp b/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp
index 35a4d00..7664af1 100644
--- a/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp
@@ -57,7 +57,6 @@
 #include "private/qdeclarativeflipable_p.h"
 #include "private/qdeclarativefocuspanel_p.h"
 #include "private/qdeclarativefocusscope_p.h"
-#include "private/qdeclarativegraphicsobjectcontainer_p.h"
 #include "private/qdeclarativegridview_p.h"
 #include "private/qdeclarativeimage_p.h"
 #include "private/qdeclarativeitem_p.h"
@@ -96,7 +95,6 @@ void QDeclarativeItemModule::defineModule()
     qmlRegisterType<QDeclarativeFocusScope>("Qt",4,6,"FocusScope");
     qmlRegisterType<QDeclarativeGradient>("Qt",4,6,"Gradient");
     qmlRegisterType<QDeclarativeGradientStop>("Qt",4,6,"GradientStop");
-    qmlRegisterType<QDeclarativeGraphicsObjectContainer>("Qt",4,6,"GraphicsObjectContainer");
     qmlRegisterType<QDeclarativeGrid>("Qt",4,6,"Grid");
     qmlRegisterType<QDeclarativeGridView>("Qt",4,6,"GridView");
     qmlRegisterType<QDeclarativeImage>("Qt",4,6,"Image");
diff --git a/src/declarative/graphicsitems/qdeclarativetextinput.cpp b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
index 4b311af..1b8b84b 100644
--- a/src/declarative/graphicsitems/qdeclarativetextinput.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
@@ -429,6 +429,29 @@ void QDeclarativeTextInput::setFocusOnPress(bool b)
 }
 
 /*!
+    \qmlproperty bool TextInput::autoScroll
+
+    Whether the TextInput should scroll when the text is longer than the width. By default this is
+    set to true.
+*/
+bool QDeclarativeTextInput::autoScroll() const
+{
+    Q_D(const QDeclarativeTextInput);
+    return d->autoScroll;
+}
+
+void QDeclarativeTextInput::setAutoScroll(bool b)
+{
+    Q_D(QDeclarativeTextInput);
+    if (d->autoScroll == b)
+        return;
+
+    d->autoScroll = b;
+
+    emit autoScrollChanged(d->autoScroll);
+}
+
+/*!
     \qmlproperty Validator TextInput::validator
 
     Allows you to set a validator on the TextInput. When a validator is set
@@ -645,6 +668,8 @@ void QDeclarativeTextInputPrivate::focusChanged(bool hasFocus)
     Q_Q(QDeclarativeTextInput);
     focused = hasFocus;
     q->setCursorVisible(hasFocus);
+    if (!hasFocus)
+        control->deselect();
     QDeclarativeItemPrivate::focusChanged(hasFocus);
 }
 
@@ -679,7 +704,15 @@ void QDeclarativeTextInput::mousePressEvent(QGraphicsSceneMouseEvent *event)
         }
         setFocus(true);
     }
-    d->control->processEvent(event);
+    bool mark = event->modifiers() & Qt::ShiftModifier;
+    int cursor = d->xToPos(event->pos().x());
+    d->control->moveCursor(cursor, mark);
+}
+
+void QDeclarativeTextInput::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
+{
+    Q_D(QDeclarativeTextInput);
+    d->control->moveCursor(d->xToPos(event->pos().x()), true);
 }
 
 /*!
@@ -704,6 +737,7 @@ bool QDeclarativeTextInput::event(QEvent* ev)
         case QEvent::KeyPress:
         case QEvent::KeyRelease://###Should the control be doing anything with release?
         case QEvent::GraphicsSceneMousePress:
+        case QEvent::GraphicsSceneMouseMove:
         case QEvent::GraphicsSceneMouseRelease:
             break;
         default:
@@ -733,28 +767,56 @@ void QDeclarativeTextInput::drawContents(QPainter *p, const QRect &r)
     int flags = QLineControl::DrawText;
     if(!isReadOnly() && d->cursorVisible && !d->cursorItem)
         flags |= QLineControl::DrawCursor;
-    if (d->control->hasSelectedText()){
+    if (d->control->hasSelectedText())
             flags |= QLineControl::DrawSelections;
-    }
-
     QPoint offset = QPoint(0,0);
-    if(d->hAlign != AlignLeft){
-        QFontMetrics fm = QFontMetrics(d->font);
-        //###Is this using bearing appropriately?
-        int minLB = qMax(0, -fm.minLeftBearing());
-        int minRB = qMax(0, -fm.minRightBearing());
-        int widthUsed = qRound(d->control->naturalTextWidth()) + 1 + minRB;
-        int hOffset = 0;
+    QFontMetrics fm = QFontMetrics(d->font);
+    int cix = qRound(d->control->cursorToX());
+    QRect br(boundingRect().toRect());
+    //###Is this using bearing appropriately?
+    int minLB = qMax(0, -fm.minLeftBearing());
+    int minRB = qMax(0, -fm.minRightBearing());
+    int widthUsed = qRound(d->control->naturalTextWidth()) + 1 + minRB;
+    if (d->autoScroll) {
+        if ((minLB + widthUsed) <=  br.width()) {
+            // text fits in br; use hscroll for alignment
+            switch (d->hAlign & ~(Qt::AlignAbsolute|Qt::AlignVertical_Mask)) {
+            case Qt::AlignRight:
+                d->hscroll = widthUsed - br.width() + 1;
+                break;
+            case Qt::AlignHCenter:
+                d->hscroll = (widthUsed - br.width()) / 2;
+                break;
+            default:
+                // Left
+                d->hscroll = 0;
+                break;
+            }
+            d->hscroll -= minLB;
+        } else if (cix - d->hscroll >= br.width()) {
+            // text doesn't fit, cursor is to the right of br (scroll right)
+            d->hscroll = cix - br.width() + 1;
+        } else if (cix - d->hscroll < 0 && d->hscroll < widthUsed) {
+            // text doesn't fit, cursor is to the left of br (scroll left)
+            d->hscroll = cix;
+        } else if (widthUsed - d->hscroll < br.width()) {
+            // text doesn't fit, text document is to the left of br; align
+            // right
+            d->hscroll = widthUsed - br.width() + 1;
+        }
+        // the y offset is there to keep the baseline constant in case we have script changes in the text.
+        offset = br.topLeft() - QPoint(d->hscroll, d->control->ascent() - fm.ascent());
+    } else {
         if(d->hAlign == AlignRight){
-            hOffset = width() - widthUsed;
+            d->hscroll = width() - widthUsed;
         }else if(d->hAlign == AlignHCenter){
-            hOffset = (width() - widthUsed) / 2;
+            d->hscroll = (width() - widthUsed) / 2;
         }
-        hOffset -= minLB;
-        offset = QPoint(hOffset, 0);
+        d->hscroll -= minLB;
+        offset = QPoint(d->hscroll, 0);
     }
-    QRect clipRect = r;
-    d->control->draw(p, offset, clipRect, flags);
+
+    d->control->draw(p, offset, r, flags);
 
     p->restore();
 }
@@ -892,10 +954,11 @@ void QDeclarativeTextInput::q_textChanged()
 
 void QDeclarativeTextInput::updateRect(const QRect &r)
 {
+    Q_D(QDeclarativeTextInput);
     if(r == QRect())
         clearCache();
     else
-        dirtyCache(r);
+        dirtyCache(QRect(r.x() - d->hscroll, r.y(), r.width(), r.height()));
     update();
 }
 
diff --git a/src/declarative/graphicsitems/qdeclarativetextinput_p.h b/src/declarative/graphicsitems/qdeclarativetextinput_p.h
index 64aff7d..6e61580 100644
--- a/src/declarative/graphicsitems/qdeclarativetextinput_p.h
+++ b/src/declarative/graphicsitems/qdeclarativetextinput_p.h
@@ -86,6 +86,7 @@ class Q_DECLARATIVE_EXPORT QDeclarativeTextInput : public QDeclarativePaintedIte
     Q_PROPERTY(bool acceptableInput READ hasAcceptableInput NOTIFY acceptableInputChanged)
     Q_PROPERTY(EchoMode echoMode READ echoMode WRITE setEchoMode NOTIFY echoModeChanged)
     Q_PROPERTY(bool focusOnPress READ focusOnPress WRITE setFocusOnPress NOTIFY focusOnPressChanged)
+    Q_PROPERTY(bool autoScroll READ autoScroll WRITE setAutoScroll NOTIFY autoScrollChanged)
 
 public:
     QDeclarativeTextInput(QDeclarativeItem* parent=0);
@@ -163,6 +164,9 @@ public:
     bool focusOnPress() const;
     void setFocusOnPress(bool);
 
+    bool autoScroll() const;
+    void setAutoScroll(bool);
+
     bool hasAcceptableInput() const;
 
     void drawContents(QPainter *p,const QRect &r);
@@ -189,12 +193,14 @@ Q_SIGNALS:
     void inputMaskChanged(const QString &inputMask);
     void echoModeChanged(EchoMode echoMode);
     void focusOnPressChanged(bool focusOnPress);
+    void autoScrollChanged(bool autoScroll);
 
 protected:
     virtual void geometryChanged(const QRectF &newGeometry,
                                  const QRectF &oldGeometry);
 
     void mousePressEvent(QGraphicsSceneMouseEvent *event);
+    void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
     void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
     void keyPressEvent(QKeyEvent* ev);
     bool event(QEvent *e);
diff --git a/src/declarative/graphicsitems/qdeclarativetextinput_p_p.h b/src/declarative/graphicsitems/qdeclarativetextinput_p_p.h
index 9e44b15..26cf78c 100644
--- a/src/declarative/graphicsitems/qdeclarativetextinput_p_p.h
+++ b/src/declarative/graphicsitems/qdeclarativetextinput_p_p.h
@@ -72,7 +72,7 @@ public:
                  color((QRgb)0), style(QDeclarativeText::Normal),
                  styleColor((QRgb)0), hAlign(QDeclarativeTextInput::AlignLeft),
                  hscroll(0), oldScroll(0), focused(false), focusOnPress(true),
-                 cursorVisible(false)
+                 cursorVisible(false), autoScroll(true)
     {
     }
 
@@ -81,6 +81,14 @@ public:
         delete control;
     }
 
+    int xToPos(int x, QTextLine::CursorPosition betweenOrOn = QTextLine::CursorBetweenCharacters) const
+    {
+        Q_Q(const QDeclarativeTextInput);
+        QRect cr = q->boundingRect().toRect();
+        x-= cr.x() - hscroll;
+        return control->xToPos(x, betweenOrOn);
+    }
+
     void init();
     void startCreatingCursor();
     void focusChanged(bool hasFocus);
@@ -107,6 +115,7 @@ public:
     bool focused;
     bool focusOnPress;
     bool cursorVisible;
+    bool autoScroll;
 };
 
 QT_END_NAMESPACE