16 files changed, 42 insertions, 23 deletions
diff --git a/src/controls/ApplicationWindow.qml b/src/controls/ApplicationWindow.qml
index c8e374ad..ff8b0728 100644
--- a/src/controls/ApplicationWindow.qml
+++ b/src/controls/ApplicationWindow.qml
@@ -118,7 +118,7 @@ Window {
     // The below documentation was supposed to be written as a grouped property, but qdoc would
     // not render it correctly due to a bug (https://bugreports.qt-project.org/browse/QTBUG-34206)
     /*!
-        \qmlproperty ApplicationWindow::contentItem
+        \qmlproperty ContentItem ApplicationWindow::contentItem
 
         This group holds the size constraints of the content item. This is the area between the
         \l ToolBar and the \l StatusBar.
diff --git a/src/controls/Private/qquickabstractstyle.cpp b/src/controls/Private/qquickabstractstyle.cpp
index eba57b03..404e7bb1 100644
--- a/src/controls/Private/qquickabstractstyle.cpp
+++ b/src/controls/Private/qquickabstractstyle.cpp
@@ -51,6 +51,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
+    \qmlpropertygroup QtQuick.Controls.Styles::AbstractStyle::padding
     \qmlproperty int AbstractStyle::padding.top
     \qmlproperty int AbstractStyle::padding.left
     \qmlproperty int AbstractStyle::padding.right
diff --git a/src/controls/Private/qquickstyleitem.cpp b/src/controls/Private/qquickstyleitem.cpp
index 49baa1fd..4a90e60b 100644
--- a/src/controls/Private/qquickstyleitem.cpp
+++ b/src/controls/Private/qquickstyleitem.cpp
@@ -104,6 +104,8 @@ public:
     {
         m_geometry.setDrawingMode(GL_TRIANGLE_STRIP);
         setGeometry(&m_geometry);
+        // The texture material has mipmap filtering set to Nearest by default. This is not ideal.
+        m_material.setMipmapFiltering(QSGTexture::None);
         setMaterial(&m_material);
     }
 
diff --git a/src/controls/Private/qquickstyleitem_p.h b/src/controls/Private/qquickstyleitem_p.h
index 8d296f25..9146ad52 100644
--- a/src/controls/Private/qquickstyleitem_p.h
+++ b/src/controls/Private/qquickstyleitem_p.h
@@ -91,8 +91,8 @@ class QQuickStyleItem: public QQuickItem
     Q_PROPERTY( int step READ step WRITE setStep NOTIFY stepChanged)
     Q_PROPERTY( int paintMargins READ paintMargins WRITE setPaintMargins NOTIFY paintMarginsChanged)
 
-    Q_PROPERTY( int contentWidth READ contentWidth() WRITE setContentWidth NOTIFY contentWidthChanged)
-    Q_PROPERTY( int contentHeight READ contentHeight() WRITE setContentHeight NOTIFY contentHeightChanged)
+    Q_PROPERTY( int contentWidth READ contentWidth WRITE setContentWidth NOTIFY contentWidthChanged)
+    Q_PROPERTY( int contentHeight READ contentHeight WRITE setContentHeight NOTIFY contentHeightChanged)
 
     Q_PROPERTY( int textureWidth READ textureWidth WRITE setTextureWidth NOTIFY textureWidthChanged)
     Q_PROPERTY( int textureHeight READ textureHeight WRITE setTextureHeight NOTIFY textureHeightChanged)
diff --git a/src/controls/Styles/Base/BusyIndicatorStyle.qml b/src/controls/Styles/Base/BusyIndicatorStyle.qml
index d9f0fdb4..6a6b36c0 100644
--- a/src/controls/Styles/Base/BusyIndicatorStyle.qml
+++ b/src/controls/Styles/Base/BusyIndicatorStyle.qml
@@ -54,7 +54,7 @@ import QtQuick.Controls.Private 1.0
     Example:
     \qml
     BusyIndicator {
-        style: BusyIndicatorStyle
+        style: BusyIndicatorStyle {
             indicator: Image {
                 visible: control.running
                 source: "spinner.png"
diff --git a/src/controls/Styles/Base/ButtonStyle.qml b/src/controls/Styles/Base/ButtonStyle.qml
index 35f6bd9b..92ee6395 100644
--- a/src/controls/Styles/Base/ButtonStyle.qml
+++ b/src/controls/Styles/Base/ButtonStyle.qml
@@ -76,7 +76,7 @@ import QtQuick.Controls.Private 1.0
 Style {
     id: buttonstyle
 
-    /*! The \l Button attached to this style. */
+    /*! The \l {QtQuick.Controls::}{Button} attached to this style. */
     readonly property Button control: __control
 
     /*! \internal */
diff --git a/src/controls/Styles/Base/MenuBarStyle.qml b/src/controls/Styles/Base/MenuBarStyle.qml
index 050367c3..396f3541 100644
--- a/src/controls/Styles/Base/MenuBarStyle.qml
+++ b/src/controls/Styles/Base/MenuBarStyle.qml
@@ -113,7 +113,7 @@ Style {
 
     /*! The style component for the menubar's own menus and their submenus.
 
-        \sa MenuStyle
+        \sa {QtQuick.Controls.Styles::}{MenuStyle}
     */
     property Component menuStyle: MenuStyle { }
 }
diff --git a/src/controls/Styles/Base/TableViewStyle.qml b/src/controls/Styles/Base/TableViewStyle.qml
index 0c01cfee..bf8af48a 100644
--- a/src/controls/Styles/Base/TableViewStyle.qml
+++ b/src/controls/Styles/Base/TableViewStyle.qml
@@ -48,7 +48,7 @@ import QtQuick.Controls.Private 1.0
     \ingroup viewsstyling
     \brief Provides custom styling for TableView
 
-    Note that this class derives from \l ScrollViewStyle
+    \note This class derives from \l {QtQuick.Controls.Styles::}{ScrollViewStyle}
     and supports all of the properties defined there.
 */
 ScrollViewStyle {
diff --git a/src/controls/TableView.qml b/src/controls/TableView.qml
index 3eb73cf6..8006c443 100644
--- a/src/controls/TableView.qml
+++ b/src/controls/TableView.qml
@@ -160,7 +160,15 @@ ScrollView {
             text: styleData.value
         }
     }
-    \endcode */
+    \endcode
+
+    \note For performance reasons, created delegates can be recycled
+    across multiple table rows. This implies that when you make use of implicit
+    properties such as \c styledata.row or \c model, these values can change also
+    after the delegate has been constructed. In practice this means you should not assume
+    that content is fixed when \c Component.onCompleted happens, but instead rely on
+    bindings to such properties.
+    */
     property Component itemDelegate: __style ? __style.itemDelegate : null
 
     /*! This property defines a delegate to draw a row.
@@ -171,6 +179,13 @@ ScrollView {
     \li  styleData.selected - true when the row is currently selected
     \li  styleData.row - the index of the row
     \endlist
+
+    \note For performance reasons, created delegates can be recycled
+    across multiple table rows. This implies that when you make use of implicit
+    properties such as \c styledata.row or \c model, these values can change also
+    after the delegate has been constructed. In practice this means you should not assume
+    that content is fixed when \c Component.onCompleted happens, but instead rely on
+    bindings to such properties.
     */
     property Component rowDelegate: __style ? __style.rowDelegate : null
 
diff --git a/src/controls/ToolButton.qml b/src/controls/ToolButton.qml
index 0ff62ec4..24ca162c 100644
--- a/src/controls/ToolButton.qml
+++ b/src/controls/ToolButton.qml
@@ -49,8 +49,8 @@ import QtQuick.Controls.Private 1.0
     \ingroup controls
     \brief Provides a button type that is typically used within a ToolBar.
 
-     ToolButton is functionally similar to \l Button, but can provide a look that is more
-     suitable within a \l ToolBar.
+     ToolButton is functionally similar to \l {QtQuick.Controls::}{Button}, but
+     can provide a look that is more suitable within a \l ToolBar.
 
      \code
      ToolButton {
diff --git a/src/controls/doc/qtquickcontrols.qdocconf b/src/controls/doc/qtquickcontrols.qdocconf
index 4306477c..b3219d90 100644
--- a/src/controls/doc/qtquickcontrols.qdocconf
+++ b/src/controls/doc/qtquickcontrols.qdocconf
@@ -34,8 +34,8 @@ depends = qtqml qtquick qtgui qtwidgets qtdoc qtquicklayouts
 # Specify the install path under QT_INSTALL_EXAMPLES
 # Examples will be installed under quick/controls - 'controls' subdirectory
 # is given as part of \example commands
-exampledirs += ../../../examples/quick
-examplesinstallpath = quick
+exampledirs += ../../../examples/quick/controls
+examplesinstallpath = quick/controls
 
 headerdirs += ../ \
               Styles/Base
diff --git a/src/controls/doc/src/qtquickcontrols-examples.qdoc b/src/controls/doc/src/qtquickcontrols-examples.qdoc
index 1531e3ff..45b61598 100644
--- a/src/controls/doc/src/qtquickcontrols-examples.qdoc
+++ b/src/controls/doc/src/qtquickcontrols-examples.qdoc
@@ -36,7 +36,7 @@
 */
 
 /*!
-    \example controls/gallery
+    \example gallery
     \title Qt Quick Controls - Gallery
     \ingroup qtquickcontrols_examples
     \brief A collection of components for a classic desktop-style UI.
@@ -47,7 +47,7 @@
 */
 
 /*!
-    \example controls/basiclayouts
+    \example basiclayouts
     \title Qt Quick Controls - Basic Layouts Example
     \ingroup qtquickcontrols_examples
     \brief Demonstrates how to use layout types to arrange a UI
@@ -59,7 +59,7 @@
 */
 
 /*!
-    \example controls/splitview
+    \example splitview
     \title Qt Quick Controls - Split View Example
     \ingroup qtquickcontrols_examples
     \brief An example for the SplitView UI control.
@@ -71,7 +71,7 @@
 */
 
 /*!
-    \example controls/tableview
+    \example tableview
     \title Qt Quick Controls - Table View Example
     \ingroup qtquickcontrols_examples
     \brief An example for the TableView control.
@@ -84,7 +84,7 @@
 */
 
 /*!
-    \example controls/texteditor
+    \example texteditor
     \title Qt Quick Controls - Text Editor Example
     \ingroup qtquickcontrols_examples
     \brief A text editor application.
@@ -95,7 +95,7 @@
 */
 
 /*!
-    \example controls/touch
+    \example touch
     \title Qt Quick Controls - Touch Gallery
     \ingroup qtquickcontrols_examples
     \brief Demonstrates UI controls for a touch interface
@@ -106,7 +106,7 @@
 */
 
 /*!
-    \example controls/calendar
+    \example calendar
     \title Qt Quick Controls - Calendar Example
     \ingroup qtquickcontrols_examples
     \brief Demonstrates the use of Calendar to display events
diff --git a/src/controls/plugin.cpp b/src/controls/plugin.cpp
index 40cc38e3..dc7ee0b5 100644
--- a/src/controls/plugin.cpp
+++ b/src/controls/plugin.cpp
@@ -132,7 +132,8 @@ void QtQuickControlsPlugin::initializeEngine(QQmlEngine *engine, const char *uri
 {
     Q_UNUSED(uri);
 
-    // Register private API
+    // Register private API. Note that to use these types outside of the
+    // Qt Quick Controls module, both the public and private imports must be used.
     const char *private_uri = "QtQuick.Controls.Private";
     qmlRegisterType<QQuickAbstractStyle>(private_uri, 1, 0, "AbstractStyle");
     qmlRegisterType<QQuickCalendarModel>(private_uri, 1, 0, "CalendarModel");
diff --git a/src/controls/qquickaction.cpp b/src/controls/qquickaction.cpp
index 541e9a5d..3d13f90b 100644
--- a/src/controls/qquickaction.cpp
+++ b/src/controls/qquickaction.cpp
@@ -66,7 +66,7 @@ QT_BEGIN_NAMESPACE
     For example, in a word processor, if the user presses a Bold toolbar button, the Bold menu item will
     automatically be checked.
 
-    QtQuick Controls supports actions in \l Button, \l ToolButton, and \l MenuItem.
+    QtQuick Controls supports actions in \l {QtQuick.Controls::}{Button}, \l ToolButton, and \l MenuItem.
 
     Example:
     \qml
diff --git a/src/controls/qquickexclusivegroup.cpp b/src/controls/qquickexclusivegroup.cpp
index bf7a3844..7e991123 100644
--- a/src/controls/qquickexclusivegroup.cpp
+++ b/src/controls/qquickexclusivegroup.cpp
@@ -97,7 +97,7 @@ static bool isChecked(const QObject *o)
     }
     \endcode
 
-    Several controls already support ExclusiveGroup, e.g. \l Action, \l MenuItem, \l Button, and \l RadioButton.
+    Several controls already support ExclusiveGroup, e.g. \l Action, \l MenuItem, \l {QtQuick.Controls::}{Button}, and \l RadioButton.
 
     Since ExclusiveGroup only supports \l Action as child items, we need to manually assign the \c exclusiveGroup
     property for other objects.
diff --git a/src/dialogs/DefaultFileDialog.qml b/src/dialogs/DefaultFileDialog.qml
index 90016860..aa9efddf 100644
--- a/src/dialogs/DefaultFileDialog.qml
+++ b/src/dialogs/DefaultFileDialog.qml
@@ -83,7 +83,7 @@ AbstractFileDialog {
 
     function dirDown(path) {
         view.selection.clear()
-        root.folder = path
+        root.folder = "file://" + path
     }
     function dirUp() {
         view.selection.clear()