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

Conflicts:
	src/imports/controls/universal/ToolButton.qml

Change-Id: Ib9f1e7d83fb824d9e6a13a2bc429d1a5642fe4f6

20 files changed, 212 insertions, 27 deletions

diff --git a/.gitignore b/.gitignore
index bf6ecd8d..b377694e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -98,3 +98,12 @@ android-*.so-deployment-settings.json
 *_plugin_import.cpp
 *_wrapper.sh
 *_wrapper.bat
+*.mak
+*.xib
+*.plist
+*.pbxproj
+*_plugin_import.cpp
+*.xcsettings
+*.xcscheme
+*.xcodeproj
+qt.conf
diff --git a/src/imports/controls/doc/src/qtlabscontrols-gettingstarted.qdoc b/src/imports/controls/doc/src/qtlabscontrols-gettingstarted.qdoc
index 3f6d2898..fda89d5b 100644
--- a/src/imports/controls/doc/src/qtlabscontrols-gettingstarted.qdoc
+++ b/src/imports/controls/doc/src/qtlabscontrols-gettingstarted.qdoc
@@ -53,7 +53,8 @@
     {
         QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
         QGuiApplication app(argc, argv);
-        QQmlApplicationEngine engine("main.qml");
+        QQmlApplicationEngine engine;
+        engine.load(QUrl(QStringLiteral("qrc:/main.qml")));
         return app.exec();
     }
     \endcode
diff --git a/src/imports/controls/doc/src/qtlabscontrols-highdpi.qdoc b/src/imports/controls/doc/src/qtlabscontrols-highdpi.qdoc
index 557ef254..e9f6a88b 100644
--- a/src/imports/controls/doc/src/qtlabscontrols-highdpi.qdoc
+++ b/src/imports/controls/doc/src/qtlabscontrols-highdpi.qdoc
@@ -41,7 +41,8 @@
     {
         QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling); // <--
         QGuiApplication app(argc, argv);
-        QQmlApplicationEngine engine("main.qml");
+        QQmlApplicationEngine engine;
+        engine.load(QUrl(QStringLiteral("qrc:/main.qml")));
         return app.exec();
     }
     \endcode
diff --git a/src/imports/controls/material/qtlabsmaterialstyleplugin.cpp b/src/imports/controls/material/qtlabsmaterialstyleplugin.cpp
index 0c6f2ad0..6370f78d 100644
--- a/src/imports/controls/material/qtlabsmaterialstyleplugin.cpp
+++ b/src/imports/controls/material/qtlabsmaterialstyleplugin.cpp
@@ -94,7 +94,7 @@ void QtLabsMaterialStylePlugin::initializeEngine(QQmlEngine *engine, const char
 
     QQuickStyleSelector selector;
     if (selector.style() == QLatin1String("material")) {
-        if (QFont(QStringLiteral("Roboto")).family() == QLatin1String("Roboto")) {
+        if (QFont(QStringLiteral("Roboto")).exactMatch()) {
             QPlatformTheme *old = QGuiApplicationPrivate::platform_theme;
             if (old) {
                 QQuickProxyTheme *theme = new QQuickMaterialTheme(old);
diff --git a/src/imports/controls/plugins.qmltypes b/src/imports/controls/plugins.qmltypes
index 62287cb5..73f905f2 100644
--- a/src/imports/controls/plugins.qmltypes
+++ b/src/imports/controls/plugins.qmltypes
@@ -385,6 +385,7 @@ Module {
         }
         Property { name: "x"; type: "double" }
         Property { name: "y"; type: "double" }
+        Property { name: "z"; type: "double" }
         Property { name: "width"; type: "double" }
         Property { name: "height"; type: "double" }
         Property { name: "implicitWidth"; type: "double" }
@@ -408,9 +409,13 @@ Module {
         Property { name: "contentItem"; type: "QQuickItem"; isPointer: true }
         Property { name: "contentData"; type: "QObject"; isList: true; isReadonly: true }
         Property { name: "contentChildren"; type: "QQuickItem"; isList: true; isReadonly: true }
+        Property { name: "clip"; type: "bool" }
         Property { name: "focus"; type: "bool" }
+        Property { name: "activeFocus"; type: "bool"; isReadonly: true }
         Property { name: "modal"; type: "bool" }
         Property { name: "visible"; type: "bool" }
+        Property { name: "opacity"; type: "double" }
+        Property { name: "scale"; type: "double" }
         Property { name: "closePolicy"; type: "ClosePolicy" }
         Property { name: "transformOrigin"; type: "TransformOrigin" }
         Property { name: "enter"; type: "QQuickTransition"; isPointer: true }
diff --git a/src/imports/controls/universal/ToolButton.qml b/src/imports/controls/universal/ToolButton.qml
index 5387db8c..f5fd5c88 100644
--- a/src/imports/controls/universal/ToolButton.qml
+++ b/src/imports/controls/universal/ToolButton.qml
@@ -49,6 +49,8 @@ T.ToolButton {
 
     padding: 6
 
+    property bool useSystemFocusVisuals: true
+
     //! [contentItem]
     contentItem: Text {
         text: control.text
diff --git a/src/imports/controls/universal/qquickuniversalfocusrectangle.cpp b/src/imports/controls/universal/qquickuniversalfocusrectangle.cpp
index a894390e..554b8607 100644
--- a/src/imports/controls/universal/qquickuniversalfocusrectangle.cpp
+++ b/src/imports/controls/universal/qquickuniversalfocusrectangle.cpp
@@ -36,7 +36,9 @@
 
 #include "qquickuniversalfocusrectangle_p.h"
 
+#include <QtGui/qpixmap.h>
 #include <QtGui/qpainter.h>
+#include <QtGui/qpixmapcache.h>
 #include <QtQuick/private/qquickitem_p.h>
 
 QT_BEGIN_NAMESPACE
@@ -49,20 +51,32 @@ QQuickUniversalFocusRectangle::QQuickUniversalFocusRectangle(QQuickItem *parent)
 
 void QQuickUniversalFocusRectangle::paint(QPainter *painter)
 {
-    const QRect bounds = boundingRect().toAlignedRect().adjusted(0, 0, -1, -1);
+    if (!isVisible() || width() <= 0 || height() <= 0)
+        return;
 
-    QPen pen;
-    pen.setWidth(1);
-    pen.setDashPattern(QVector<qreal>() << 1 << 1);
+    QRect bounds = boundingRect().toAlignedRect();
+    const QString key = QStringLiteral("qquickuniversalfocusrectangle_%1_%2").arg(bounds.width()).arg(bounds.height());
 
-    pen.setColor(Qt::white);
-    painter->setPen(pen);
-    painter->drawRect(bounds);
+    QPixmap pixmap(bounds.width(), bounds.height());
+    if (!QPixmapCache::find(key, &pixmap)) {
+        bounds.adjust(0, 0, -1, -1);
+        pixmap.fill(Qt::transparent);
+        QPainter p(&pixmap);
 
-    pen.setColor(Qt::black);
-    pen.setDashOffset(1);
-    painter->setPen(pen);
-    painter->drawRect(bounds);
+        QPen pen;
+        pen.setWidth(1);
+        pen.setColor(Qt::white);
+        p.setPen(pen);
+        p.drawRect(bounds);
+
+        pen.setColor(Qt::black);
+        pen.setDashPattern(QVector<qreal>() << 1 << 1);
+        p.setPen(pen);
+        p.drawRect(bounds);
+
+        QPixmapCache::insert(key, pixmap);
+    }
+    painter->drawPixmap(0, 0, pixmap);
 }
 
 QT_END_NAMESPACE
diff --git a/src/imports/controls/universal/qtlabsuniversalstyleplugin.cpp b/src/imports/controls/universal/qtlabsuniversalstyleplugin.cpp
index b88e69b5..6d9d8c8a 100644
--- a/src/imports/controls/universal/qtlabsuniversalstyleplugin.cpp
+++ b/src/imports/controls/universal/qtlabsuniversalstyleplugin.cpp
@@ -93,7 +93,7 @@ void QtLabsUniversalStylePlugin::initializeEngine(QQmlEngine *engine, const char
 {
     QQuickStyleSelector selector;
     if (selector.style() == QLatin1String("universal")) {
-        if (QFont(QStringLiteral("Segoe UI")).family() == QLatin1String("Segoe UI")) {
+        if (QFont(QStringLiteral("Segoe UI")).exactMatch()) {
             QPlatformTheme *old = QGuiApplicationPrivate::platform_theme;
             if (old) {
                 QQuickProxyTheme *theme = new QQuickUniversalTheme(old);
diff --git a/src/imports/templates/plugins.qmltypes b/src/imports/templates/plugins.qmltypes
index d3ca28fc..792d4e95 100644
--- a/src/imports/templates/plugins.qmltypes
+++ b/src/imports/templates/plugins.qmltypes
@@ -379,6 +379,7 @@ Module {
         }
         Property { name: "x"; type: "double" }
         Property { name: "y"; type: "double" }
+        Property { name: "z"; type: "double" }
         Property { name: "width"; type: "double" }
         Property { name: "height"; type: "double" }
         Property { name: "implicitWidth"; type: "double" }
@@ -402,9 +403,13 @@ Module {
         Property { name: "contentItem"; type: "QQuickItem"; isPointer: true }
         Property { name: "contentData"; type: "QObject"; isList: true; isReadonly: true }
         Property { name: "contentChildren"; type: "QQuickItem"; isList: true; isReadonly: true }
+        Property { name: "clip"; type: "bool" }
         Property { name: "focus"; type: "bool" }
+        Property { name: "activeFocus"; type: "bool"; isReadonly: true }
         Property { name: "modal"; type: "bool" }
         Property { name: "visible"; type: "bool" }
+        Property { name: "opacity"; type: "double" }
+        Property { name: "scale"; type: "double" }
         Property { name: "closePolicy"; type: "ClosePolicy" }
         Property { name: "transformOrigin"; type: "TransformOrigin" }
         Property { name: "enter"; type: "QQuickTransition"; isPointer: true }
diff --git a/src/templates/qquickapplicationwindow.cpp b/src/templates/qquickapplicationwindow.cpp
index 96087fc9..d2bbcd79 100644
--- a/src/templates/qquickapplicationwindow.cpp
+++ b/src/templates/qquickapplicationwindow.cpp
@@ -340,6 +340,7 @@ QQuickItem *QQuickApplicationWindow::contentItem() const
 
 /*!
     \qmlproperty Control Qt.labs.controls::ApplicationWindow::activeFocusControl
+    \readonly
 
     This property holds the control that currently has active focus, or \c null if there is
     no control with active focus.
@@ -547,6 +548,7 @@ QQuickApplicationWindowAttached::QQuickApplicationWindowAttached(QObject *parent
 
 /*!
     \qmlattachedproperty ApplicationWindow Qt.labs.controls::ApplicationWindow::window
+    \readonly
 
     This attached property holds the application window. The property can be attached
     to any item. The value is \c null if the item is not in an ApplicationWindow.
@@ -559,6 +561,7 @@ QQuickApplicationWindow *QQuickApplicationWindowAttached::window() const
 
 /*!
     \qmlattachedproperty Item Qt.labs.controls::ApplicationWindow::contentItem
+    \readonly
 
     This attached property holds the window content item. The property can be attached
     to any item. The value is \c null if the item is not in an ApplicationWindow.
@@ -571,6 +574,7 @@ QQuickItem *QQuickApplicationWindowAttached::contentItem() const
 
 /*!
     \qmlattachedproperty Control Qt.labs.controls::ApplicationWindow::activeFocusControl
+    \readonly
 
     This attached property holds the control that currently has active focus, or \c null
     if there is no control with active focus. The property can be attached to any item.
@@ -587,6 +591,7 @@ QQuickItem *QQuickApplicationWindowAttached::activeFocusControl() const
 
 /*!
     \qmlattachedproperty Item Qt.labs.controls::ApplicationWindow::header
+    \readonly
 
     This attached property holds the window header item. The property can be attached
     to any item. The value is \c null if the item is not in an ApplicationWindow, or
@@ -600,6 +605,7 @@ QQuickItem *QQuickApplicationWindowAttached::header() const
 
 /*!
     \qmlattachedproperty Item Qt.labs.controls::ApplicationWindow::footer
+    \readonly
 
     This attached property holds the window footer item. The property can be attached
     to any item. The value is \c null if the item is not in an ApplicationWindow, or
@@ -613,6 +619,7 @@ QQuickItem *QQuickApplicationWindowAttached::footer() const
 
 /*!
     \qmlattachedproperty Item Qt.labs.controls::ApplicationWindow::overlay
+    \readonly
 
     This attached property holds the window overlay item. The property can be attached
     to any item. The value is \c null if the item is not in an ApplicationWindow.
diff --git a/src/templates/qquickcombobox.cpp b/src/templates/qquickcombobox.cpp
index 98270a07..3bef5acf 100644
--- a/src/templates/qquickcombobox.cpp
+++ b/src/templates/qquickcombobox.cpp
@@ -447,6 +447,7 @@ void QQuickComboBox::setPressed(bool pressed)
 }
 
 /*!
+    \readonly
     \qmlproperty int Qt.labs.controls::ComboBox::highlightedIndex
 
     This property holds the index of the highlighted item in the combo box popup list.
diff --git a/src/templates/qquickcontrol.cpp b/src/templates/qquickcontrol.cpp
index 42ab4c70..348adc9e 100644
--- a/src/templates/qquickcontrol.cpp
+++ b/src/templates/qquickcontrol.cpp
@@ -419,6 +419,7 @@ void QQuickControl::resetFont()
 
 /*!
     \qmlproperty real Qt.labs.controls::Control::availableWidth
+    \readonly
 
     This property holds the width available after deducting horizontal padding.
 
@@ -431,6 +432,7 @@ qreal QQuickControl::availableWidth() const
 
 /*!
     \qmlproperty real Qt.labs.controls::Control::availableHeight
+    \readonly
 
     This property holds the height available after deducting vertical padding.
 
@@ -717,6 +719,7 @@ bool QQuickControl::isMirrored() const
 
 /*!
     \qmlproperty enumeration Qt.labs.controls::Control::focusReason
+    \readonly
 
     This property holds the reason of the last focus change.
 
@@ -784,7 +787,9 @@ void QQuickControl::setBackground(QQuickItem *background)
 /*!
     \qmlproperty Item Qt.labs.controls::Control::contentItem
 
-    TODO
+    This property holds the visual content item.
+
+    \note The content item is automatically resized inside the \l padding of the control.
 */
 QQuickItem *QQuickControl::contentItem() const
 {
diff --git a/src/templates/qquickdial.cpp b/src/templates/qquickdial.cpp
index 2ad86f45..cdd7c60b 100644
--- a/src/templates/qquickdial.cpp
+++ b/src/templates/qquickdial.cpp
@@ -254,6 +254,7 @@ void QQuickDial::setValue(qreal value)
 
 /*!
     \qmlproperty real Qt.labs.controls::Dial::position
+    \readonly
 
     This property holds the logical position of the handle.
 
@@ -271,7 +272,8 @@ qreal QQuickDial::position() const
 }
 
 /*!
-    \qmlproperty real Qt.labs.controls::Dial::angle \readonly
+    \qmlproperty real Qt.labs.controls::Dial::angle
+    \readonly
 
     This property holds the angle of the handle.
 
diff --git a/src/templates/qquickpopup.cpp b/src/templates/qquickpopup.cpp
index 8f9a04cb..3cdf3bd2 100644
--- a/src/templates/qquickpopup.cpp
+++ b/src/templates/qquickpopup.cpp
@@ -396,6 +396,12 @@ void QQuickPopupItem::itemChange(ItemChange change, const ItemChangeData &data)
     case ItemVisibleHasChanged:
         emit d->popup->visibleChanged();
         break;
+    case ItemActiveFocusHasChanged:
+        emit d->popup->activeFocusChanged();
+        break;
+    case ItemOpacityHasChanged:
+        emit d->popup->opacityChanged();
+        break;
     default:
         break;
     }
@@ -727,6 +733,27 @@ void QQuickPopup::setY(qreal y)
 }
 
 /*!
+    \qmlproperty real Qt.labs.controls::Popup::z
+
+    This property holds the z-value of the popup. Z-value determines
+    the stacking order of popups. The default z-value is \c 0.
+*/
+qreal QQuickPopup::z() const
+{
+    Q_D(const QQuickPopup);
+    return d->popupItem->z();
+}
+
+void QQuickPopup::setZ(qreal z)
+{
+    Q_D(QQuickPopup);
+    if (qFuzzyCompare(z, d->popupItem->z()))
+        return;
+    d->popupItem->setZ(z);
+    emit zChanged();
+}
+
+/*!
     \qmlproperty real Qt.labs.controls::Popup::width
 
     This property holds the width of the popup.
@@ -856,6 +883,7 @@ void QQuickPopup::setContentHeight(qreal height)
 
 /*!
     \qmlproperty real Qt.labs.controls::Popup::availableWidth
+    \readonly
 
     This property holds the width available after deducting horizontal padding.
 
@@ -868,6 +896,7 @@ qreal QQuickPopup::availableWidth() const
 
 /*!
     \qmlproperty real Qt.labs.controls::Popup::availableHeight
+    \readonly
 
     This property holds the height available after deducting vertical padding.
 
@@ -921,7 +950,7 @@ void QQuickPopup::resetMargins()
 
     This property holds the top margin around the popup.
 
-    \sa margin, bottomMargin
+    \sa margins, bottomMargin
 */
 qreal QQuickPopup::topMargin() const
 {
@@ -948,7 +977,7 @@ void QQuickPopup::resetTopMargin()
 
     This property holds the left margin around the popup.
 
-    \sa margin, rightMargin
+    \sa margins, rightMargin
 */
 qreal QQuickPopup::leftMargin() const
 {
@@ -975,7 +1004,7 @@ void QQuickPopup::resetLeftMargin()
 
     This property holds the right margin around the popup.
 
-    \sa margin, leftMargin
+    \sa margins, leftMargin
 */
 qreal QQuickPopup::rightMargin() const
 {
@@ -1002,7 +1031,7 @@ void QQuickPopup::resetRightMargin()
 
     This property holds the bottom margin around the popup.
 
-    \sa margin, topMargin
+    \sa margins, topMargin
 */
 qreal QQuickPopup::bottomMargin() const
 {
@@ -1302,9 +1331,29 @@ QQmlListProperty<QQuickItem> QQuickPopup::contentChildren()
 }
 
 /*!
+    \qmlproperty bool Qt.labs.controls::Popup::clip
+
+    This property holds whether clipping is enabled. The default value is \c false.
+*/
+bool QQuickPopup::clip() const
+{
+    Q_D(const QQuickPopup);
+    return d->popupItem->clip();
+}
+
+void QQuickPopup::setClip(bool clip)
+{
+    Q_D(QQuickPopup);
+    if (clip == d->popupItem->clip())
+        return;
+    d->popupItem->setClip(clip);
+    emit clipChanged();
+}
+
+/*!
     \qmlproperty bool Qt.labs.controls::Popup::focus
 
-    This property holds whether the popup has focus.
+    This property holds whether the popup has focus. The default value is \c false.
 */
 bool QQuickPopup::hasFocus() const
 {
@@ -1322,9 +1371,21 @@ void QQuickPopup::setFocus(bool focus)
 }
 
 /*!
+    \qmlproperty bool Qt.labs.controls::Popup::activeFocus
+    \readonly
+
+    This property holds whether the popup has active focus.
+*/
+bool QQuickPopup::hasActiveFocus() const
+{
+    Q_D(const QQuickPopup);
+    return d->popupItem->hasActiveFocus();
+}
+
+/*!
     \qmlproperty bool Qt.labs.controls::Popup::modal
 
-    This property holds whether the popup is modal.
+    This property holds whether the popup is modal. The default value is \c false.
 */
 bool QQuickPopup::isModal() const
 {
@@ -1344,7 +1405,7 @@ void QQuickPopup::setModal(bool modal)
 /*!
     \qmlproperty bool Qt.labs.controls::Popup::visible
 
-    This property holds whether the popup is visible.
+    This property holds whether the popup is visible. The default value is \c false.
 */
 bool QQuickPopup::isVisible() const
 {
@@ -1361,6 +1422,43 @@ void QQuickPopup::setVisible(bool visible)
 }
 
 /*!
+    \qmlproperty real Qt.labs.controls::Popup::opacity
+
+    This property holds the opacity of the popup. The default value is \c 1.0.
+*/
+qreal QQuickPopup::opacity() const
+{
+    Q_D(const QQuickPopup);
+    return d->popupItem->opacity();
+}
+
+void QQuickPopup::setOpacity(qreal opacity)
+{
+    Q_D(QQuickPopup);
+    d->popupItem->setOpacity(opacity);
+}
+
+/*!
+    \qmlproperty real Qt.labs.controls::Popup::scale
+
+    This property holds the scale factor of the popup. The default value is \c 1.0.
+*/
+qreal QQuickPopup::scale() const
+{
+    Q_D(const QQuickPopup);
+    return d->popupItem->scale();
+}
+
+void QQuickPopup::setScale(qreal scale)
+{
+    Q_D(QQuickPopup);
+    if (qFuzzyCompare(scale, d->popupItem->scale()))
+        return;
+    d->popupItem->setScale(scale);
+    emit scaleChanged();
+}
+
+/*!
     \qmlproperty enumeration Qt.labs.controls::Popup::closePolicy
 
     This property determines the circumstances under which the popup closes.
diff --git a/src/templates/qquickpopup_p.h b/src/templates/qquickpopup_p.h
index ee08c08a..4b5d3e72 100644
--- a/src/templates/qquickpopup_p.h
+++ b/src/templates/qquickpopup_p.h
@@ -69,6 +69,7 @@ class Q_LABSTEMPLATES_EXPORT QQuickPopup : public QObject, public QQmlParserStat
     Q_INTERFACES(QQmlParserStatus)
     Q_PROPERTY(qreal x READ x WRITE setX NOTIFY xChanged FINAL)
     Q_PROPERTY(qreal y READ y WRITE setY NOTIFY yChanged FINAL)
+    Q_PROPERTY(qreal z READ z WRITE setZ NOTIFY zChanged FINAL)
     Q_PROPERTY(qreal width READ width WRITE setWidth RESET resetWidth NOTIFY widthChanged FINAL)
     Q_PROPERTY(qreal height READ height WRITE setHeight RESET resetHeight NOTIFY heightChanged FINAL)
     Q_PROPERTY(qreal implicitWidth READ implicitWidth WRITE setImplicitWidth NOTIFY implicitWidthChanged FINAL)
@@ -92,9 +93,13 @@ class Q_LABSTEMPLATES_EXPORT QQuickPopup : public QObject, public QQmlParserStat
     Q_PROPERTY(QQuickItem *contentItem READ contentItem WRITE setContentItem NOTIFY contentItemChanged FINAL)
     Q_PROPERTY(QQmlListProperty<QObject> contentData READ contentData FINAL)
     Q_PROPERTY(QQmlListProperty<QQuickItem> contentChildren READ contentChildren NOTIFY contentChildrenChanged FINAL)
-    Q_PROPERTY(bool focus READ hasFocus WRITE setFocus NOTIFY focusChanged)
-    Q_PROPERTY(bool modal READ isModal WRITE setModal NOTIFY modalChanged)
-    Q_PROPERTY(bool visible READ isVisible WRITE setVisible NOTIFY visibleChanged)
+    Q_PROPERTY(bool clip READ clip WRITE setClip NOTIFY clipChanged FINAL)
+    Q_PROPERTY(bool focus READ hasFocus WRITE setFocus NOTIFY focusChanged FINAL)
+    Q_PROPERTY(bool activeFocus READ hasActiveFocus NOTIFY activeFocusChanged FINAL)
+    Q_PROPERTY(bool modal READ isModal WRITE setModal NOTIFY modalChanged FINAL)
+    Q_PROPERTY(bool visible READ isVisible WRITE setVisible NOTIFY visibleChanged FINAL)
+    Q_PROPERTY(qreal opacity READ opacity WRITE setOpacity NOTIFY opacityChanged FINAL)
+    Q_PROPERTY(qreal scale READ scale WRITE setScale NOTIFY scaleChanged FINAL)
     Q_PROPERTY(ClosePolicy closePolicy READ closePolicy WRITE setClosePolicy NOTIFY closePolicyChanged FINAL)
     Q_PROPERTY(TransformOrigin transformOrigin READ transformOrigin WRITE setTransformOrigin)
     Q_PROPERTY(QQuickTransition *enter READ enter WRITE setEnter NOTIFY enterChanged FINAL)
@@ -111,6 +116,9 @@ public:
     qreal y() const;
     void setY(qreal y);
 
+    qreal z() const;
+    void setZ(qreal z);
+
     qreal width() const;
     void setWidth(qreal width);
     void resetWidth();
@@ -188,15 +196,26 @@ public:
     QQmlListProperty<QObject> contentData();
     QQmlListProperty<QQuickItem> contentChildren();
 
+    bool clip() const;
+    void setClip(bool clip);
+
     bool hasFocus() const;
     void setFocus(bool focus);
 
+    bool hasActiveFocus() const;
+
     bool isModal() const;
     void setModal(bool modal);
 
     bool isVisible() const;
     void setVisible(bool visible);
 
+    qreal opacity() const;
+    void setOpacity(qreal opacity);
+
+    qreal scale() const;
+    void setScale(qreal scale);
+
     enum ClosePolicyFlag {
         NoAutoClose = 0x00,
         OnPressOutside = 0x01,
@@ -235,6 +254,7 @@ public Q_SLOTS:
 Q_SIGNALS:
     void xChanged();
     void yChanged();
+    void zChanged();
     void widthChanged();
     void heightChanged();
     void implicitWidthChanged();
@@ -257,9 +277,13 @@ Q_SIGNALS:
     void backgroundChanged();
     void contentItemChanged();
     void contentChildrenChanged();
+    void clipChanged();
     void focusChanged();
+    void activeFocusChanged();
     void modalChanged();
     void visibleChanged();
+    void opacityChanged();
+    void scaleChanged();
     void closePolicyChanged();
     void enterChanged();
     void exitChanged();
diff --git a/src/templates/qquickslider.cpp b/src/templates/qquickslider.cpp
index b109fc5a..ae7d3508 100644
--- a/src/templates/qquickslider.cpp
+++ b/src/templates/qquickslider.cpp
@@ -247,6 +247,7 @@ void QQuickSlider::setValue(qreal value)
 
 /*!
     \qmlproperty real Qt.labs.controls::Slider::position
+    \readonly
 
     This property holds the logical position of the handle.
 
diff --git a/src/templates/qquickstackview.cpp b/src/templates/qquickstackview.cpp
index b338f3bf..e60e2dfd 100644
--- a/src/templates/qquickstackview.cpp
+++ b/src/templates/qquickstackview.cpp
@@ -931,6 +931,7 @@ QQuickStackAttached::~QQuickStackAttached()
 
 /*!
     \qmlattachedproperty int Qt.labs.controls::StackView::index
+    \readonly
 
     This attached property holds the stack index of the item it's
     attached to, or \c -1 if the item is not in a stack.
@@ -943,6 +944,7 @@ int QQuickStackAttached::index() const
 
 /*!
     \qmlattachedproperty StackView Qt.labs.controls::StackView::view
+    \readonly
 
     This attached property holds the stack view of the item it's
     attached to, or \c null if the item is not in a stack.
@@ -955,6 +957,7 @@ QQuickStackView *QQuickStackAttached::view() const
 
 /*!
     \qmlattachedproperty enumeration Qt.labs.controls::StackView::status
+    \readonly
 
     This attached property holds the stack status of the item it's
     attached to, or \c StackView.Inactive if the item is not in a stack.
diff --git a/src/templates/qquickswipeview.cpp b/src/templates/qquickswipeview.cpp
index b73a8ac0..f4481b31 100644
--- a/src/templates/qquickswipeview.cpp
+++ b/src/templates/qquickswipeview.cpp
@@ -133,6 +133,7 @@ void QQuickSwipeView::itemAdded(int, QQuickItem *item)
 
 /*!
     \qmlattachedproperty int Qt.labs.controls::SwipeView::index
+    \readonly
 
     This attached property holds the index of each child item in the SwipeView.
 
@@ -141,6 +142,7 @@ void QQuickSwipeView::itemAdded(int, QQuickItem *item)
 
 /*!
     \qmlattachedproperty bool Qt.labs.controls::SwipeView::isCurrentItem
+    \readonly
 
     This attached property is \c true if this child is the current item.
 
@@ -149,6 +151,7 @@ void QQuickSwipeView::itemAdded(int, QQuickItem *item)
 
 /*!
     \qmlattachedproperty SwipeView Qt.labs.controls::SwipeView::view
+    \readonly
 
     This attached property holds the view that manages this child item.
 
diff --git a/src/templates/qquickswitch.cpp b/src/templates/qquickswitch.cpp
index f5c1a605..05422d8d 100644
--- a/src/templates/qquickswitch.cpp
+++ b/src/templates/qquickswitch.cpp
@@ -167,6 +167,7 @@ QQuickSwitch::QQuickSwitch(QQuickItem *parent) :
 
 /*!
     \qmlproperty real Qt.labs.controls::Switch::position
+    \readonly
 
     This property holds the logical position of the thumb indicator.
 
@@ -196,6 +197,7 @@ void QQuickSwitch::setPosition(qreal position)
 
 /*!
     \qmlproperty real Qt.labs.controls::Switch::visualPosition
+    \readonly
 
     This property holds the visual position of the thumb indicator.
 
diff --git a/src/templates/qquicktumbler.cpp b/src/templates/qquicktumbler.cpp
index fcc443df..fc64fc01 100644
--- a/src/templates/qquicktumbler.cpp
+++ b/src/templates/qquicktumbler.cpp
@@ -221,6 +221,7 @@ void QQuickTumbler::setModel(const QVariant &model)
 
 /*!
     \qmlproperty int Qt.labs.controls::Tumbler::count
+    \readonly
 
     This property holds the number of items in the model.
 */
@@ -249,6 +250,7 @@ void QQuickTumbler::setCurrentIndex(int currentIndex)
 
 /*!
     \qmlproperty Item Qt.labs.controls::Tumbler::currentItem
+    \readonly
 
     This property holds the item at the current index.
 */