Merge remote-tracking branch 'origin/5.9' into dev

Conflicts:
	src/imports/controls/ApplicationWindow.qml
	src/imports/controls/material/ApplicationWindow.qml
	src/imports/controls/universal/ApplicationWindow.qml
	src/imports/templates/qtquicktemplates2plugin.cpp

Change-Id: I9041c69f4ce5dab1d1b994d2318feddb696e56bf

14 files changed, 55 insertions, 36 deletions

diff --git a/src/imports/calendar/calendar.pro b/src/imports/calendar/calendar.pro
index 981860b5..039906c1 100644
--- a/src/imports/calendar/calendar.pro
+++ b/src/imports/calendar/calendar.pro
@@ -17,5 +17,7 @@ SOURCES += \
 
 include(calendar.pri)
 
+!static: CONFIG += qmlcache
+
 CONFIG += no_cxx_module
 load(qml_plugin)
diff --git a/src/imports/controls/ApplicationWindow.qml b/src/imports/controls/ApplicationWindow.qml
index 9a81812f..6698fcb3 100644
--- a/src/imports/controls/ApplicationWindow.qml
+++ b/src/imports/controls/ApplicationWindow.qml
@@ -35,9 +35,9 @@
 ****************************************************************************/
 
 import QtQuick 2.9
+import QtQuick.Window 2.3
 import QtQuick.Controls 2.3
 import QtQuick.Controls.impl 2.3
-import QtQuick.Window 2.2
 import QtQuick.Templates 2.3 as T
 
 T.ApplicationWindow {
diff --git a/src/imports/controls/RangeSlider.qml b/src/imports/controls/RangeSlider.qml
index 75c27d91..3a3c2202 100644
--- a/src/imports/controls/RangeSlider.qml
+++ b/src/imports/controls/RangeSlider.qml
@@ -75,7 +75,7 @@ T.RangeSlider {
         border.width: activeFocus ? 2 : 1
         border.color: control.enabled ? (activeFocus
             ? Default.focusColor
-            : (control.first.pressed ? Default.indicatorFramePressedColor : Default.indicatorFrameColor)) : Default.indicatorFrameDisabledColor
+            : (control.second.pressed ? Default.indicatorFramePressedColor : Default.indicatorFrameColor)) : Default.indicatorFrameDisabledColor
         color: control.enabled ? (second.pressed
             ? (activeFocus ? Default.focusPressedColor : Default.indicatorPressedColor)
             : (activeFocus ? Default.focusLightColor : Default.backgroundColor)) : Default.indicatorDisabledColor
diff --git a/src/imports/controls/controls.pri b/src/imports/controls/controls.pri
index 5b0f3000..7d23e7ae 100644
--- a/src/imports/controls/controls.pri
+++ b/src/imports/controls/controls.pri
@@ -2,7 +2,7 @@ HEADERS += \
     $$PWD/qquickdefaultbusyindicator_p.h \
     $$PWD/qquickdefaultdial_p.h \
     $$PWD/qquickdefaultprogressbar_p.h \
-    $$PWD/qquickdefaultstyle_p.h \
+    $$PWD/qquickdefaultstyle_p.h
 
 SOURCES += \
     $$PWD/qquickdefaultbusyindicator.cpp \
diff --git a/src/imports/controls/controls.pro b/src/imports/controls/controls.pro
index 145b468c..b75e4f56 100644
--- a/src/imports/controls/controls.pro
+++ b/src/imports/controls/controls.pro
@@ -26,6 +26,8 @@ qtquickcompiler {
     qmlfiles.prefix = /qt-project.org/imports/QtQuick/Controls.2
     qmlfiles.files += $$QML_CONTROLS
     RESOURCES += qmlfiles
+} else:!static {
+    CONFIG += qmlcache
 }
 
 CONFIG += no_cxx_module
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-default.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-default.qdoc
index acff6859..ad85b9ec 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-default.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-default.qdoc
@@ -31,7 +31,7 @@
 
     The Default style is a basic all-round style.
 
-    The Default style a simple and light-weight style that offers the maximum
+    The Default style is a simple and light-weight style that offers the maximum
     performance for Qt Quick Controls 2. It is built with a minimal amount of Qt
     Quick primitives, and keeps animations and transitions to the minimum.
 
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc
index 66a377bd..703c5d33 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc
@@ -133,18 +133,18 @@
         \li ...
     \endtable
 
-    \section1 Important Concepts in Qt Quick Controls 2
+    \section1 Topics
 
     \list
-      \li \l{Qt Quick Controls 2 Guidelines}
-      \li \l{Styling Qt Quick Controls 2}
-      \li \l{Customizing Qt Quick Controls 2}
-      \li \l{High-DPI Support in Qt Quick Controls 2}
-      \li \l{Using File Selectors with Qt Quick Controls 2}
+      \li \l{Qt Quick Controls 2 Guidelines}{Guidelines}
+      \li \l{Styling Qt Quick Controls 2}{Styling}
+      \li \l{Customizing Qt Quick Controls 2}{Customization}
+      \li \l{High-DPI Support in Qt Quick Controls 2}{High-DPI Support}
+      \li \l{Using File Selectors with Qt Quick Controls 2}{Using File Selectors}
+      \li \l{Deploying Qt Quick Controls 2 Applications}{Deployment}
+      \li \l{Qt Quick Controls 2 Configuration File}{Configuration File}
+      \li \l{Supported Environment Variables in Qt Quick Controls 2}{Environment Variables}
       \li \l{Differences between Qt Quick Controls}
-      \li \l{Deploying Qt Quick Controls 2 Applications}
-      \li \l{Qt Quick Controls 2 Configuration File}
-      \li \l{Supported Environment Variables in Qt Quick Controls 2}
     \endlist
 
     \section1 Reference
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc
index 9f942634..42d8bc62 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc
@@ -138,7 +138,7 @@
     \li \l {Default Style}
     \li \l {Material Style}
     \li \l {Universal Style}
-    \li \l{Using File Selectors with Qt Quick Controls 2}
+    \li \l {Using File Selectors with Qt Quick Controls 2}
     \li \l {Deploying Qt Quick Controls 2 Applications}
     \li \l {Qt Quick Controls 2 Configuration File}
     \li \l {Supported Environment Variables in Qt Quick Controls 2}
diff --git a/src/imports/controls/material/ApplicationWindow.qml b/src/imports/controls/material/ApplicationWindow.qml
index 14dd4637..45f1b59a 100644
--- a/src/imports/controls/material/ApplicationWindow.qml
+++ b/src/imports/controls/material/ApplicationWindow.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.9
-import QtQuick.Window 2.2
+import QtQuick.Window 2.3
 import QtQuick.Templates 2.3 as T
 import QtQuick.Controls.Material 2.3
 
diff --git a/src/imports/controls/universal/ApplicationWindow.qml b/src/imports/controls/universal/ApplicationWindow.qml
index e359b1bf..c9bd4cec 100644
--- a/src/imports/controls/universal/ApplicationWindow.qml
+++ b/src/imports/controls/universal/ApplicationWindow.qml
@@ -35,6 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.9
+import QtQuick.Window 2.3
 import QtQuick.Templates 2.3 as T
 import QtQuick.Controls.Universal 2.3
 import QtQuick.Controls.Universal.impl 2.3
diff --git a/src/imports/templates/qtquicktemplates2plugin.cpp b/src/imports/templates/qtquicktemplates2plugin.cpp
index e9f21378..9f74a012 100644
--- a/src/imports/templates/qtquicktemplates2plugin.cpp
+++ b/src/imports/templates/qtquicktemplates2plugin.cpp
@@ -216,6 +216,7 @@ void QtQuickTemplates2Plugin::registerTypes(const char *uri)
     qmlRegisterRevision<QQuickTextInput, 7>(uri, 2, 0);
     qmlRegisterRevision<QQuickTextEdit, 7>(uri, 2, 0);
     qmlRegisterRevision<QQuickWindow, 2>(uri, 2, 0);
+    qmlRegisterRevision<QWindow, 3>(uri, 2, 0);
 
     // QtQuick.Templates 2.1 (new types and revisions in Qt 5.8)
     qmlRegisterType<QQuickButtonGroup, 1>(uri, 2, 1, "ButtonGroup");
@@ -263,6 +264,7 @@ void QtQuickTemplates2Plugin::registerTypes(const char *uri)
     // make revisioned properties available to their subclasses (synced with Qt 5.9)
     qmlRegisterRevision<QQuickText, 9>(uri, 2, 2);
     qmlRegisterRevision<QQuickTextInput, 9>(uri, 2, 2);
+    qmlRegisterRevision<QQuickWindowQmlImpl, 2>(uri, 2, 2);
 
     // QtQuick.Templates 2.3 (new types and revisions in Qt 5.10)
     qmlRegisterType<QQuickAbstractButton, 3>(uri, 2, 3, "AbstractButton");
diff --git a/src/quicktemplates2/qquickcontrol.cpp b/src/quicktemplates2/qquickcontrol.cpp
index fc0b1b17..d285fdd2 100644
--- a/src/quicktemplates2/qquickcontrol.cpp
+++ b/src/quicktemplates2/qquickcontrol.cpp
@@ -281,6 +281,27 @@ QQuickItem *QQuickControlPrivate::getContentItem()
     return contentItem;
 }
 
+void QQuickControlPrivate::setContentItem_helper(QQuickItem *item, bool notify)
+{
+    Q_Q(QQuickControl);
+    if (contentItem == item)
+        return;
+
+    q->contentItemChange(item, contentItem);
+    destroyDelegate(contentItem, q);
+    contentItem = item;
+
+    if (item) {
+        if (!item->parentItem())
+            item->setParentItem(q);
+        if (componentComplete)
+            resizeContent();
+    }
+
+    if (notify)
+        emit q->contentItemChanged();
+}
+
 #if QT_CONFIG(accessibility)
 void QQuickControlPrivate::accessibilityActiveChanged(bool active)
 {
@@ -1176,25 +1197,15 @@ void QQuickControl::setBackground(QQuickItem *background)
 QQuickItem *QQuickControl::contentItem() const
 {
     QQuickControlPrivate *d = const_cast<QQuickControlPrivate *>(d_func());
-    return d->getContentItem();
+    if (!d->contentItem)
+        d->setContentItem_helper(d->getContentItem(), false);
+    return d->contentItem;
 }
 
 void QQuickControl::setContentItem(QQuickItem *item)
 {
     Q_D(QQuickControl);
-    if (d->contentItem == item)
-        return;
-
-    contentItemChange(item, d->contentItem);
-    QQuickControlPrivate::destroyDelegate(d->contentItem, this);
-    d->contentItem = item;
-    if (item) {
-        if (!item->parentItem())
-            item->setParentItem(this);
-        if (isComponentComplete())
-            d->resizeContent();
-    }
-    emit contentItemChanged();
+    d->setContentItem_helper(item, true);
 }
 
 void QQuickControl::classBegin()
diff --git a/src/quicktemplates2/qquickcontrol_p_p.h b/src/quicktemplates2/qquickcontrol_p_p.h
index 3cd04b17..7ff9dff3 100644
--- a/src/quicktemplates2/qquickcontrol_p_p.h
+++ b/src/quicktemplates2/qquickcontrol_p_p.h
@@ -95,6 +95,7 @@ public:
     virtual void resizeContent();
 
     virtual QQuickItem *getContentItem();
+    void setContentItem_helper(QQuickItem *item, bool notify = true);
 
 #if QT_CONFIG(accessibility)
     void accessibilityActiveChanged(bool active) override;
diff --git a/src/quicktemplates2/qquickscrollview.cpp b/src/quicktemplates2/qquickscrollview.cpp
index fc763511..c05e4848 100644
--- a/src/quicktemplates2/qquickscrollview.cpp
+++ b/src/quicktemplates2/qquickscrollview.cpp
@@ -108,7 +108,7 @@ public:
 
     QQuickItem *getContentItem() override;
 
-    QQuickFlickable *ensureFlickable();
+    QQuickFlickable *ensureFlickable(bool content);
     bool setFlickable(QQuickFlickable *flickable, bool content);
 
     void updateContentWidth();
@@ -146,14 +146,14 @@ QQuickScrollViewPrivate::QQuickScrollViewPrivate()
 
 QQuickItem *QQuickScrollViewPrivate::getContentItem()
 {
-    return ensureFlickable();
+    return ensureFlickable(false);
 }
 
-QQuickFlickable *QQuickScrollViewPrivate::ensureFlickable()
+QQuickFlickable *QQuickScrollViewPrivate::ensureFlickable(bool content)
 {
     Q_Q(QQuickScrollView);
     if (!flickable)
-        setFlickable(new QQuickFlickable(q), true);
+        setFlickable(new QQuickFlickable(q), content);
     return flickable;
 }
 
@@ -271,7 +271,7 @@ void QQuickScrollViewPrivate::contentData_append(QQmlListProperty<QObject> *prop
     if (!p->flickable && p->setFlickable(qobject_cast<QQuickFlickable *>(obj), true))
         return;
 
-    QQuickFlickable *flickable = p->ensureFlickable();
+    QQuickFlickable *flickable = p->ensureFlickable(true);
     Q_ASSERT(flickable);
     QQmlListProperty<QObject> data = flickable->flickableData();
     data.append(&data, obj);
@@ -313,7 +313,7 @@ void QQuickScrollViewPrivate::contentChildren_append(QQmlListProperty<QQuickItem
     if (!p->flickable)
         p->setFlickable(qobject_cast<QQuickFlickable *>(item), true);
 
-    QQuickFlickable *flickable = p->ensureFlickable();
+    QQuickFlickable *flickable = p->ensureFlickable(true);
     Q_ASSERT(flickable);
     QQmlListProperty<QQuickItem> children = flickable->flickableChildren();
     children.append(&children, item);
@@ -552,7 +552,7 @@ void QQuickScrollView::componentComplete()
     Q_D(QQuickScrollView);
     QQuickControl::componentComplete();
     if (!d->contentItem)
-        d->ensureFlickable();
+        d->ensureFlickable(true);
 }
 
 void QQuickScrollView::contentItemChange(QQuickItem *newItem, QQuickItem *oldItem)