Say hello to the Fusion style

[ChangeLog][Controls] Introduced a Fusion style that offers
a platform agnostic desktop-oriented look'n'feel.

Change-Id: Id1c1baf10f4b3a79e89bcc72f6d170ed0b2cc8b0
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

6 files changed, 129 insertions, 11 deletions

diff --git a/src/imports/controls/doc/images/qtquickcontrols2-fusion-palettes.png b/src/imports/controls/doc/images/qtquickcontrols2-fusion-palettes.png
new file mode 100644
index 00000000..d649e137
--- /dev/null
+++ b/src/imports/controls/doc/images/qtquickcontrols2-fusion-palettes.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-fusion-violet.png b/src/imports/controls/doc/images/qtquickcontrols2-fusion-violet.png
new file mode 100644
index 00000000..4186a78f
--- /dev/null
+++ b/src/imports/controls/doc/images/qtquickcontrols2-fusion-violet.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-fusion.png b/src/imports/controls/doc/images/qtquickcontrols2-fusion.png
new file mode 100644
index 00000000..037069b5
--- /dev/null
+++ b/src/imports/controls/doc/images/qtquickcontrols2-fusion.png
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-fusion.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-fusion.qdoc
new file mode 100644
index 00000000..d5d6657a
--- /dev/null
+++ b/src/imports/controls/doc/src/qtquickcontrols2-fusion.qdoc
@@ -0,0 +1,93 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Free Documentation License Usage
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file. Please review the following information to ensure
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page qtquickcontrols2-fusion.html
+    \title Fusion Style
+
+    The Fusion style is a desktop-oriented style.
+
+    The Fusion style is a platform-agnostic style that offers a desktop-oriented
+    look'n'feel. It implements the same design language as the \l {Fusion Style Widget Gallery}
+    {Fusion style for Qt Widgets}.
+
+    \image qtquickcontrols2-fusion.png
+
+    To run an application with the Fusion style, see
+    \l {Using Styles in Qt Quick Controls 2}.
+
+    \note The Fusion style is not a native desktop style. The style runs on any
+    platform, and looks similar everywhere. Minor differences may occur due to
+    differences in the standard system palettes, available fonts, and font
+    rendering engines.
+
+    \section2 Customization
+
+    The Fusion style uses the standard system \l {Control::palette}{palettes}
+    to provide colors that match the desktop environment.
+
+    \image qtquickcontrols2-fusion-palettes.png
+
+    Custom palettes can be specified for any \l {Control::palette}{control},
+    \l {Popup::palette}{popup}, or \l {ApplicationWindow::palette}{application window}.
+    Explicit palette attributes are automatically propagated from parent to children,
+    overriding any system defaults for that attribute. In the following example,
+    the window and all three switches appear with a violet highlight color:
+
+    \table
+        \row
+            \li
+                \qml
+                import QtQuick 2.7
+                import QtQuick.Controls 2.3
+
+                ApplicationWindow {
+                    visible: true
+
+                    palette.highlight: "violet"
+
+                    Column {
+                        anchors.centerIn: parent
+
+                        Switch { text: qsTr("First"); checked: true }
+                        Switch { text: qsTr("Second"); checked: true }
+                        Switch { text: qsTr("Third") }
+                    }
+                }
+                \endqml
+            \li
+                \image qtquickcontrols2-fusion-violet.png
+    \endtable
+
+    \b {See also} \l {Default Style}, \l {Material Style}, \l {Universal Style}
+
+    \section1 Related Information
+
+    \list
+      \li \l{Styling Qt Quick Controls 2}
+    \endlist
+*/
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc
index 703c5d33..81318cde 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc
@@ -46,21 +46,31 @@
             <img src="images/qtquickcontrols2-default.png" alt="Default" width="100%"/>
           </a>
         </td>
-        <td style="border:0px; padding-right:25px;">
+        <td style="border:0px">
           <a href="qtquickcontrols2-material.html">
             <img src="images/qtquickcontrols2-material.png" alt="Material" width="100%"/>
           </a>
         </td>
-        <td style="border:0px;">
+      </tr>
+      <tr>
+        <td style="border:0px">Default Style</td>
+        <td style="border:0px">Material Style</td>
+      </tr>
+      <tr>
+        <td style="border:0px; padding-top:45px; padding-right:25px;">
+          <a href="qtquickcontrols2-fusion.html">
+            <img src="images/qtquickcontrols2-fusion.png" alt="Fusion" width="100%"/>
+          </a>
+        </td>
+        <td style="border:0px; padding-top:45px; ">
           <a href="qtquickcontrols2-universal.html">
             <img src="images/qtquickcontrols2-universal.png" alt="Universal" width="100%"/>
           </a>
         </td>
       </tr>
       <tr>
-        <td style="border:0px">Default</td>
-        <td style="border:0px">Material</td>
-        <td style="border:0px">Universal</td>
+        <td style="border:0px">Fusion Style</td>
+        <td style="border:0px">Universal Style</td>
       </tr>
     </table>
     \endraw
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc
index 42d8bc62..472b02c9 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc
@@ -34,7 +34,7 @@
     \raw HTML
     <table style="background:transparent; border:0px">
       <tr>
-        <td style="border:0px">
+        <td style="border:0px; padding-right:25px">
           <a href="qtquickcontrols2-default.html">
             <img src="images/qtquickcontrols2-default.png" width="45%"/>
           </a>
@@ -44,11 +44,6 @@
             <img src="images/qtquickcontrols2-material.png" width="75%"/>
           </a>
         </td>
-        <td style="border:0px">
-          <a href="qtquickcontrols2-universal.html">
-            <img src="images/qtquickcontrols2-universal.png" width="75%"/>
-          </a>
-        </td>
       </tr>
       <tr>
         <td style="border:0px">
@@ -61,6 +56,25 @@
           based on the <a href="https://www.google.com/design/spec/material-design/introduction.html">
           Google Material Design Guidelines</a>, but requires more system resources than the Default style.
         </td>
+      </tr>
+      <tr>
+        <td style="border:0px; padding-top:45px; padding-right:25px;">
+          <a href="qtquickcontrols2-fusion.html">
+            <img src="images/qtquickcontrols2-fusion.png" width="75%"/>
+          </a>
+        </td>
+        <td style="border:0px; padding-top:45px;">
+          <a href="qtquickcontrols2-universal.html">
+            <img src="images/qtquickcontrols2-universal.png" width="75%"/>
+          </a>
+        </td>
+      </tr>
+      <tr>
+        <td style="border:0px">
+          The <a href="qtquickcontrols2-fusion.html">Fusion</a> style is
+          a platform-agnostic style that offers a desktop-oriented look'n'feel
+          for Qt Quick Controls 2.
+        </td>
         <td style="border:0px">
           The <a href="qtquickcontrols2-universal.html">Universal</a> style offers an appealing design
           based on the <a href="https://dev.windows.com/design">Microsoft Universal Design Guidelines</a>,
@@ -136,6 +150,7 @@
     \section1 Related Information
     \list
     \li \l {Default Style}
+    \li \l {Fusion Style}
     \li \l {Material Style}
     \li \l {Universal Style}
     \li \l {Using File Selectors with Qt Quick Controls 2}