src/imports/controls/doc/src/qtquickcontrols2-configuration.qdoc

@@ -53,16 +53,43 @@
     Primary=BlueGrey
     \endcode
 
-    \l {Material style} specific values that can be specified in a \c Material
+    \section1 Controls Section
+
+    The following values can be specified in a \c Controls section of the
+    configuration file:
+
+    \table
+        \header
+            \li Variable
+            \li Description
+        \row
+            \li \c Style
+            \li Specifies the style to run the application with.
+                The value can be the name of one of the \l {Available Styles}{built-in styles}
+                or a \l {Creating a Custom Style}{custom style}.
+        \row
+            \li \c FallbackStyle
+            \li Specifies the style to use for controls that are not implemented.
+                The style must be one of the \l {Available Styles}{built-in styles}.
+                By default, the \l {Default Style}{Default} style is used.
+    \endtable
+
+    \section1 Material Section
+
+    The following \l {Material style} specific values can be specified in a \c Material
     section of the configuration file:
 
     \include qquickmaterialstyle.qdocinc conf
 
-    \l {Universal style} specific values that can be specified in a \c Universal
+    \section1 Universal Section
+
+    The following \l {Universal style} specific values can be specified in a \c Universal
     section of the configuration file:
 
     \include qquickuniversalstyle.qdocinc conf
 
+    \section1 Using the Configuration File in a Project
+
     In order to make it possible for Qt Quick Controls 2 to find the configuration file,
     it must be built into application's resources using the \l {The Qt Resource System}.
     Here's an example \c .qrc file:

src/imports/controls/doc/src/qtquickcontrols2-index.qdoc

@@ -103,6 +103,19 @@
         \li ...
     \endtable
 
+    \section1 License and Attributions
+
+    Qt Quick Controls 2 is available under commercial licenses from \l{The Qt Company}.
+    In addition, it is available under the
+    \l{GNU Lesser General Public License, version 3}, or
+    the \l{GNU General Public License, version 2}.
+    See \l{Qt Licensing} for further details.
+
+    Furthermore Qt Quick Controls 2 potentially contains third party
+    modules under following permissive licenses:
+
+    \generatelist{groupsbymodule attributions-qtquickcontrols2}
+
     \section1 Topics
 
     \list

src/imports/controls/material/LICENSE_ANGULARJS.txt

+Copyright (c) 2014-2016 Google, Inc. http://angularjs.org
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

src/imports/controls/material/qt_attribution.json

+{
+    "Id": "shadow_angular_material",
+    "Name": "Shadow values from Angular Material",
+    "QDocModule": "qtquickcontrols2",
+    "QtUsage": "Used in the Material Style of Qt Quick Controls 2.",
+    "Files": "ElevationEffect.qml",
+    "Description": "Shadow values for the elevation effect.",
+    "Homepage": "https://angularjs.org/",
+    "License": "MIT License",
+    "LicenseId": "MIT",
+    "LicenseFile": "LICENSE_ANGULARJS.txt",
+    "Copyright": "Copyright (c) 2014-2016 Google, Inc"
+}

src/imports/templates/qtquicktemplates2plugin.cpp

@@ -226,7 +226,7 @@ void QtQuickTemplates2Plugin::registerTypes(const char *uri)
     qmlRegisterType<QQuickPage, 1>(uri, 2, 1, "Page");
     qmlRegisterType<QQuickPopup, 1>(uri, 2, 1, "Popup");
     qmlRegisterType<QQuickRangeSlider, 1>(uri, 2, 1, "RangeSlider");
-    qmlRegisterType<QQuickRoundButton, 1>(uri, 2, 1, "RoundButton");
+    qmlRegisterType<QQuickRoundButton>(uri, 2, 1, "RoundButton");
     qmlRegisterType<QQuickSlider, 1>(uri, 2, 1, "Slider");
     qmlRegisterType<QQuickSpinBox, 1>(uri, 2, 1, "SpinBox");
     qmlRegisterType<QQuickStackView, 1>(uri, 2, 1, "StackView");

src/quickcontrols2/qquickstyle.cpp

@@ -343,6 +343,8 @@ QString QQuickStyle::path()
 
     \note The style must be configured \b before loading QML that imports Qt Quick Controls 2.
           It is not possible to change the style after the QML types have been registered.
+
+    \sa setFallbackStyle(), {Using Styles in Qt Quick Controls 2}
 */
 void QQuickStyle::setStyle(const QString &style)
 {
@@ -365,6 +367,8 @@ void QQuickStyle::setStyle(const QString &style)
 
     The fallback style can be also specified by setting the \c QT_QUICK_CONTROLS_FALLBACK_STYLE
     \l {Supported Environment Variables in Qt Quick Controls 2}{environment variable}.
+
+    \sa setStyle(), {Using Styles in Qt Quick Controls 2}
 */
 void QQuickStyle::setFallbackStyle(const QString &style)
 {