Merge remote-tracking branch 'origin/5.5.0' into 5.5

Change-Id: If49d9c8dfdd757f80e371c3ee18b621f618c3cae

3 files changed, 80 insertions, 4 deletions

diff --git a/dist/changes-5.5.0 b/dist/changes-5.5.0
new file mode 100644
index 00000000..3dfa2ae6
--- /dev/null
+++ b/dist/changes-5.5.0
@@ -0,0 +1,75 @@
+Qt 5.5 introduces many new features and improvements as well as bugfixes
+over the 5.4.x series. For more details, refer to the online documentation
+included in this distribution. The documentation is also available online:
+
+  http://doc.qt.io/qt-5/index.html
+
+The Qt version 5.5 series is binary compatible with the 5.4.x series.
+Applications compiled for 5.4 will continue to run with 5.5.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+  https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+*                          Controls                                        *
+****************************************************************************
+
+ - Menu:
+   * [QTBUG-40576] Added aboutToShow, aboutToHide signals
+   * Added Undo, Redo, Delete, Clear and Select All actions to EditMenu
+
+ - SplitView:
+   * [QTBUG-42509] Added remove() function
+
+ - TableView:
+   * [QTBUG-44246] "model" property exposed to rowDelegate is now consistent
+     with ListView behavior
+
+ - TextField:
+   * [QTBUG-40735] Added remove() function
+
+ - TreeView:
+   * Introduced TreeView
+
+****************************************************************************
+*                          Dialogs                                         *
+****************************************************************************
+
+ - General:
+   * Added fallback to QML if the helper fails to show the native dialog at
+     runtime.
+
+ - FileDialog:
+   * Added FileDialog.shortcuts to enable setting the starting folder to a
+     standard system path. Setting folder to shortcuts.pictures will result
+     in a special image gallery dialog on iOS.
+
+ - FontDialog:
+   * [QTBUG-46044] Added support for more font.weight enum values
+   * Internationalized the names of font.weight enums
+
+****************************************************************************
+*                          Layouts                                         *
+****************************************************************************
+
+ - [QTBUG-39724][QTBUG-41559] Added support for Layout margins
+
+****************************************************************************
+*                          Styles                                          *
+****************************************************************************
+
+ - Merged Extras' styling system into Controls'.
+
+****************************************************************************
+*                          Extras                                          *
+****************************************************************************
+
+ - Imported Qt Quick Extras (the former Qt Quick Enterprise Controls)
+
+ - ToggleButton:
+   * Corrected text color
diff --git a/src/controls/Private/qquicksceneposlistener.cpp b/src/controls/Private/qquicksceneposlistener.cpp
index d6155fe1..6bcc1deb 100644
--- a/src/controls/Private/qquicksceneposlistener.cpp
+++ b/src/controls/Private/qquicksceneposlistener.cpp
@@ -128,8 +128,6 @@ void QQuickScenePosListener::itemGeometryChanged(QQuickItem *, const QRectF &, c
 
 void QQuickScenePosListener::itemParentChanged(QQuickItem *, QQuickItem *parent)
 {
-    Q_ASSERT(m_item == parent);
-
     addAncestorListeners(parent);
 }
 
@@ -165,7 +163,8 @@ void QQuickScenePosListener::updateScenePos()
  */
 void QQuickScenePosListener::removeAncestorListeners(QQuickItem *item)
 {
-    Q_ASSERT(item != m_item);
+    if (item == m_item)
+        return;
 
     QQuickItem *p = item;
     while (p != 0) {
@@ -181,7 +180,8 @@ void QQuickScenePosListener::removeAncestorListeners(QQuickItem *item)
  */
 void QQuickScenePosListener::addAncestorListeners(QQuickItem *item)
 {
-    Q_ASSERT(item != m_item);
+    if (item == m_item)
+        return;
 
     QQuickItem *p = item;
     while (p != 0) {
diff --git a/src/extras/StatusIndicator.qml b/src/extras/StatusIndicator.qml
index 7348833d..df76a3d4 100644
--- a/src/extras/StatusIndicator.qml
+++ b/src/extras/StatusIndicator.qml
@@ -35,6 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.2
+import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles 1.4
 import QtQuick.Controls.Private 1.0
 import QtQuick.Extras 1.4