Merge branch 'master' into animation-refactor

Conflicts:
	src/quick/items/qquickcanvas.cpp
	src/quick/items/qquickcanvas_p.h
	tools/qmlscene/main.cpp

Change-Id: Ia1b0839c5c2bd54d7442292842137cf360a98337

5 files changed, 0 insertions, 35 deletions

diff --git a/src/qtquick1/graphicsitems/qdeclarativeitem.cpp b/src/qtquick1/graphicsitems/qdeclarativeitem.cpp
index bd795cb4b5..1f57d53b7e 100644
--- a/src/qtquick1/graphicsitems/qdeclarativeitem.cpp
+++ b/src/qtquick1/graphicsitems/qdeclarativeitem.cpp
@@ -1986,14 +1986,6 @@ void QDeclarativeItemPrivate::transform_clear(QDeclarativeListProperty<QGraphics
     }
 }
 
-void QDeclarativeItemPrivate::parentProperty(QObject *o, void *rv, QDeclarativeNotifierEndpoint *e)
-{
-    QDeclarativeItem *item = static_cast<QDeclarativeItem*>(o);
-    if (e)
-        e->connect(&item->d_func()->parentNotifier);
-    *((QDeclarativeItem **)rv) = item->parentItem();
-}
-
 /*!
     \qmlproperty list<Object> QtQuick1::Item::data
     \default
@@ -3101,7 +3093,6 @@ QVariant QDeclarativeItem::itemChange(GraphicsItemChange change,
     case ItemParentHasChanged:
         d->resolveLayoutMirror();
         emit parentChanged(parentItem());
-        d->parentNotifier.notify();
         break;
     case ItemVisibleHasChanged: {
             for(int ii = 0; ii < d->changeListeners.count(); ++ii) {
diff --git a/src/qtquick1/graphicsitems/qdeclarativeitem_p.h b/src/qtquick1/graphicsitems/qdeclarativeitem_p.h
index 8dccd1ac37..1dcafe55f4 100644
--- a/src/qtquick1/graphicsitems/qdeclarativeitem_p.h
+++ b/src/qtquick1/graphicsitems/qdeclarativeitem_p.h
@@ -216,10 +216,6 @@ public:
         return item->d_func();
     }
 
-    // Accelerated property accessors
-    QDeclarativeNotifier parentNotifier;
-    static void parentProperty(QObject *o, void *rv, QDeclarativeNotifierEndpoint *e);
-
     QDeclarative1Anchors *anchors() {
         if (!_anchors) {
             Q_Q(QDeclarativeItem);
diff --git a/src/qtquick1/graphicsitems/qdeclarativetextedit.cpp b/src/qtquick1/graphicsitems/qdeclarativetextedit.cpp
index fc799a2b4c..b547deacca 100644
--- a/src/qtquick1/graphicsitems/qdeclarativetextedit.cpp
+++ b/src/qtquick1/graphicsitems/qdeclarativetextedit.cpp
@@ -1610,23 +1610,6 @@ void QDeclarative1TextEdit::moveCursorDelegate()
     d->cursor->setY(cursorRect.y());
 }
 
-void QDeclarative1TextEditPrivate::updateSelection()
-{
-    Q_Q(QDeclarative1TextEdit);
-    QTextCursor cursor = control->textCursor();
-    bool startChange = (lastSelectionStart != cursor.selectionStart());
-    bool endChange = (lastSelectionEnd != cursor.selectionEnd());
-    cursor.beginEditBlock();
-    cursor.setPosition(lastSelectionStart, QTextCursor::MoveAnchor);
-    cursor.setPosition(lastSelectionEnd, QTextCursor::KeepAnchor);
-    cursor.endEditBlock();
-    control->setTextCursor(cursor);
-    if(startChange)
-        q->selectionStartChanged();
-    if(endChange)
-        q->selectionEndChanged();
-}
-
 void QDeclarative1TextEdit::updateSelectionMarkers()
 {
     Q_D(QDeclarative1TextEdit);
diff --git a/src/qtquick1/graphicsitems/qdeclarativetextedit_p_p.h b/src/qtquick1/graphicsitems/qdeclarativetextedit_p_p.h
index f747b49564..e4bb09ba1e 100644
--- a/src/qtquick1/graphicsitems/qdeclarativetextedit_p_p.h
+++ b/src/qtquick1/graphicsitems/qdeclarativetextedit_p_p.h
@@ -88,7 +88,6 @@ public:
 
     void updateDefaultTextOption();
     void relayoutDocument();
-    void updateSelection();
     bool determineHorizontalAlignment();
     bool setHAlign(QDeclarative1TextEdit::HAlignment, bool forceAlign = false);
     void mirrorChange();
diff --git a/src/qtquick1/qtquick1.cpp b/src/qtquick1/qtquick1.cpp
index b8c0e109ba..bb6c536413 100644
--- a/src/qtquick1/qtquick1.cpp
+++ b/src/qtquick1/qtquick1.cpp
@@ -40,7 +40,6 @@
 ****************************************************************************/
 
 #include <QtDeclarative/qdeclarative.h>
-#include <QtDeclarative/private/qdeclarativefastproperties_p.h>
 #include <QtQuick1/qdeclarativeitem.h>
 #include <QtQuick1/private/qdeclarativeitem_p.h>
 #include <QtQuick1/private/qdeclarativeutilmodule_p.h>
@@ -51,9 +50,6 @@ QT_BEGIN_NAMESPACE
 
 void QDeclarativeQtQuick1Module::defineModule(QDeclarativeQtQuick1Module::Module module)
 {
-    QDeclarativeFastProperties::instance()->add(&QDeclarativeItem::staticMetaObject,
-                                QDeclarativeItem::staticMetaObject.indexOfProperty("parent"),
-                                QDeclarativeItemPrivate::parentProperty);
     if (module == QtQuick1)
         qmlRegisterBaseTypes("QtQuick", 1, 0);
     else if (module == Qt47)