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

Conflicts:
	src/plugins/gamepads/evdev/qevdevgamepadbackend.cpp

Change-Id: I7ca2964746f7a63634529bfe119f68ee796ff22c

20 files changed, 317 insertions, 162 deletions

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..1a045fa
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,4 @@
+.tag                    export-subst
+.gitignore              export-ignore
+.gitattributes          export-ignore
+.commit-template        export-ignore
diff --git a/.tag b/.tag
new file mode 100644
index 0000000..6828f88
--- /dev/null
+++ b/.tag
@@ -0,0 +1 @@
+$Format:%H$
diff --git a/examples/configureButtons/doc/images/configuregamepadbuttons-example.png b/examples/configureButtons/doc/images/configuregamepadbuttons-example.png
new file mode 100644
index 0000000..408f7a6
--- /dev/null
+++ b/examples/configureButtons/doc/images/configuregamepadbuttons-example.png
diff --git a/examples/configureButtons/doc/src/configbuttonsexample.qdoc b/examples/configureButtons/doc/src/configbuttonsexample.qdoc
new file mode 100644
index 0000000..c2c0517
--- /dev/null
+++ b/examples/configureButtons/doc/src/configbuttonsexample.qdoc
@@ -0,0 +1,35 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: http://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 http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://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: http://www.gnu.org/copyleft/fdl.html.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+\example configureButtons
+\ingroup qtgamepad-examples
+\title Qt Gamepad Configure Buttons Example
+\brief Enables configuring the gamepad buttons
+\image configuregamepadbuttons-example.png
+\include examples-run.qdocinc
+*/
diff --git a/examples/keyNavigation/deployment.pri b/examples/keyNavigation/deployment.pri
index 839b3b5..0d58a25 100644
--- a/examples/keyNavigation/deployment.pri
+++ b/examples/keyNavigation/deployment.pri
@@ -1,8 +1,4 @@
-android-no-sdk {
-    target.path = /data/user/qt
-    export(target.path)
-    INSTALLS += target
-} else:android {
+android {
     x86 {
         target.path = /libs/x86
     } else: armeabi-v7a {
diff --git a/examples/keyNavigation/doc/images/keynavigationgamepad-example.png b/examples/keyNavigation/doc/images/keynavigationgamepad-example.png
new file mode 100644
index 0000000..fa2fa1c
--- /dev/null
+++ b/examples/keyNavigation/doc/images/keynavigationgamepad-example.png
diff --git a/examples/keyNavigation/doc/src/keynaviexample.qdoc b/examples/keyNavigation/doc/src/keynaviexample.qdoc
new file mode 100644
index 0000000..4226438
--- /dev/null
+++ b/examples/keyNavigation/doc/src/keynaviexample.qdoc
@@ -0,0 +1,35 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: http://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 http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://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: http://www.gnu.org/copyleft/fdl.html.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+\example keyNavigation
+\ingroup qtgamepad-examples
+\title Qt Gamepad Key Navigation Example
+\brief Demonstrates how to use navigation keys on the gamepad.
+\image keynavigationgamepad-example.png
+\include examples-run.qdocinc
+*/
diff --git a/examples/mouseItem/deployment.pri b/examples/mouseItem/deployment.pri
index 839b3b5..0d58a25 100644
--- a/examples/mouseItem/deployment.pri
+++ b/examples/mouseItem/deployment.pri
@@ -1,8 +1,4 @@
-android-no-sdk {
-    target.path = /data/user/qt
-    export(target.path)
-    INSTALLS += target
-} else:android {
+android {
     x86 {
         target.path = /libs/x86
     } else: armeabi-v7a {
diff --git a/examples/mouseItem/doc/src/mouseitemexample.qdoc b/examples/mouseItem/doc/src/mouseitemexample.qdoc
new file mode 100644
index 0000000..80f8357
--- /dev/null
+++ b/examples/mouseItem/doc/src/mouseitemexample.qdoc
@@ -0,0 +1,34 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: http://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 http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://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: http://www.gnu.org/copyleft/fdl.html.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+\example mouseItem
+\ingroup qtgamepad-examples
+\title Qt Gamepad Mouse Item Example
+\brief Depicts joystick movement using a pointer.
+\include examples-run.qdocinc
+*/
diff --git a/examples/quickGamepad/deployment.pri b/examples/quickGamepad/deployment.pri
index 839b3b5..0d58a25 100644
--- a/examples/quickGamepad/deployment.pri
+++ b/examples/quickGamepad/deployment.pri
@@ -1,8 +1,4 @@
-android-no-sdk {
-    target.path = /data/user/qt
-    export(target.path)
-    INSTALLS += target
-} else:android {
+android {
     x86 {
         target.path = /libs/x86
     } else: armeabi-v7a {
diff --git a/examples/quickGamepad/doc/images/qtquickgamepad-example.png b/examples/quickGamepad/doc/images/qtquickgamepad-example.png
new file mode 100644
index 0000000..9f46e4d
--- /dev/null
+++ b/examples/quickGamepad/doc/images/qtquickgamepad-example.png
diff --git a/examples/quickGamepad/doc/src/quickgamepadexample.qdoc b/examples/quickGamepad/doc/src/quickgamepadexample.qdoc
new file mode 100644
index 0000000..b96c419
--- /dev/null
+++ b/examples/quickGamepad/doc/src/quickgamepadexample.qdoc
@@ -0,0 +1,35 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: http://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 http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://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: http://www.gnu.org/copyleft/fdl.html.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+\example quickGamepad
+\ingroup qtgamepad-examples
+\title Qt Gamepad Qt Quick Example
+\brief Demonstrates how to interact with the gamepad using QML.
+\image qtquickgamepad-example.png
+\include examples-run.qdocinc
+*/
diff --git a/examples/simple/doc/src/simpleexample.qdoc b/examples/simple/doc/src/simpleexample.qdoc
new file mode 100644
index 0000000..67bb07b
--- /dev/null
+++ b/examples/simple/doc/src/simpleexample.qdoc
@@ -0,0 +1,34 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: http://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 http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://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: http://www.gnu.org/copyleft/fdl.html.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+\example simple
+\ingroup qtgamepad-examples
+\title Qt Gamepad Simple Example
+\brief A simple example demonstrating the APIs in use.
+\include examples-run.qdocinc
+*/
diff --git a/examples/simple/gamepadmonitor.h b/examples/simple/gamepadmonitor.h
index c0ab12b..8c3fb4a 100644
--- a/examples/simple/gamepadmonitor.h
+++ b/examples/simple/gamepadmonitor.h
@@ -44,7 +44,9 @@
 #include <QtCore/QObject>
 #include <QtCore/QTimer>
 
+QT_BEGIN_NAMESPACE
 class QGamepad;
+QT_END_NAMESPACE
 
 class GamepadMonitor : public QObject
 {
diff --git a/src/gamepad/doc/qtgamepad.qdocconf b/src/gamepad/doc/qtgamepad.qdocconf
index 9aa005f..013bf7d 100644
--- a/src/gamepad/doc/qtgamepad.qdocconf
+++ b/src/gamepad/doc/qtgamepad.qdocconf
@@ -1,29 +1,26 @@
-include($QT_INSTALL_DOCS/global/macros.qdocconf)
-include($QT_INSTALL_DOCS/global/qt-cpp-defines.qdocconf)
-include($QT_INSTALL_DOCS/global/compat.qdocconf)
-include($QT_INSTALL_DOCS/global/fileextensions.qdocconf)
-include($QT_INSTALL_DOCS/global/qt-html-templates-offline.qdocconf)
+include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
 
-project                                            = QtGamepad
-description                                        = Qt Gamepad Reference Documentation
-url                                                = http://doc.qt.digia.com/QtGamepad/
-version                                            = 1.0
+project                                         = QtGamepad
+description                                     = Qt Gamepad Reference Documentation
+version                                         = $QT_VERSION
+
+examplesinstallpath                             = qtgamepad
 
 qhp.projects                                       = QtGamepad
 
 qhp.QtGamepad.file                              = qtgamepad.qhp
-qhp.QtGamepad.namespace                         = com.digia.qtgamepad.1.0
+qhp.QtGamepad.namespace                         = org.qt-project.qtgamepad.$QT_VERSION_TAG
 qhp.QtGamepad.virtualFolder                     = qtgamepad
 qhp.QtGamepad.indexTitle                        = Qt Gamepad
 qhp.QtGamepad.indexRoot                         =
-qhp.QtGamepad.filterAttributes                  = qtgamepad 1.0 qtrefdoc
-qhp.QtGamepad.customFilters.Qt.name             = QtGamepad 1.0
-qhp.QtGamepad.customFilters.Qt.filterAttributes = qtgamepad 1.0
+qhp.QtGamepad.filterAttributes                  = qtgamepad $QT_VERSION qtrefdoc
+qhp.QtGamepad.customFilters.Qt.name             = QtGamepad $QT_VERSION
+qhp.QtGamepad.customFilters.Qt.filterAttributes = qtgamepad $QT_VERSION
 
 qhp.QtGamepad.subprojects                       = qmltypes classes examples
 qhp.QtGamepad.subprojects.qmltypes.title        = QML Types
 qhp.QtGamepad.subprojects.qmltypes.indexTitle   = Qt Gamepad QML Types
-qhp.QtGamepad.subprojects.qmltypes.selectors    = fake:qmlclass
+qhp.QtGamepad.subprojects.qmltypes.selectors    = qmlclass
 qhp.QtGamepad.subprojects.qmltypes.sortPages    = true
 qhp.QtGamepad.subprojects.classes.title         = C++ Classes
 qhp.QtGamepad.subprojects.classes.indexTitle    = Qt Gamepad C++ Classes
@@ -32,34 +29,22 @@ qhp.QtGamepad.subprojects.classes.sortPages     = true
 qhp.QtGamepad.subprojects.examples.title        = Examples
 qhp.QtGamepad.subprojects.examples.indexTitle   = Qt Gamepad Examples
 qhp.QtGamepad.subprojects.examples.selectors    = fake:example
+qhp.QtGamepad.subprojects.examples.sortPages    = true
+
 
-HTML.footer = \
-    "<div class=\"footer\">\n" \
-    "    <p>\n" \
-    "      <acronym title=\"Copyright\">&copy;</acronym> 2014 Digia. Qt and Qt logos are\n" \
-    "      trademarks of of Digia Corporation in Finland and/or other countries worldwide.\n" \
-    "    </p>\n" \
-    "      All other trademarks are property of their respective owners.\n" \
-    "    <br />\n" \
-    "    <p>\n" \
-    "      Licensees holding valid Qt Enterprise licenses may use this document in accordance\n" \
-    "      with the Qt Enterprise License Agreement provided with the Software or,\n" \
-    "      alternatively, in accordance with the terms contained in a written agreement\n" \
-    "      between you and Digia.\n" \
-    "    </p>\n" \
-    "</div>\n"
+headerdirs += ../ \
+              ../../plugins
 
-indexes +=  $QT_INSTALL_DOCS/qtqml/qtqml.index \
-            $QT_INSTALL_DOCS/qtquick/qtquick.index \
-            $QT_INSTALL_DOCS/qtdoc/qtdoc.index \
-            $QT_INSTALL_DOCS/qtquickcontrols/qtquickcontrols.index
+sourcedirs += ../ \
+              ../../plugins
+
+exampledirs += ../../../examples
 
-headerdirs += ../
-sourcedirs += ../
-exampledirs += ../../../examples/
 imagedirs  += images
 
+Cpp.ignoretokens         += Q_GAMEPAD_EXPORT
+Cpp.ignoredirectives     += Q_DECLARE_LOGGING_CATEGORY
+
 navigation.landingpage    = "Qt Gamepad"
 navigation.qmltypespage   = "Qt Gamepad QML Types"
 navigation.cppclassespage = "Qt Gamepad C++ Classes"
-buildversion              = "Qt Gamepad 1.0"
diff --git a/src/gamepad/doc/src/qtgamepad-cpp.qdoc b/src/gamepad/doc/src/qtgamepad-cpp.qdoc
index 171d9cf..ba017ec 100644
--- a/src/gamepad/doc/src/qtgamepad-cpp.qdoc
+++ b/src/gamepad/doc/src/qtgamepad-cpp.qdoc
@@ -1,11 +1,11 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
 ** Contact: http://www.qt.io/licensing/
 **
-** This file is part of the Qt Gamepad module
+** This file is part of the documentation of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** $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
@@ -14,22 +14,13 @@
 ** and conditions see http://www.qt.io/terms-conditions. For further
 ** information use the contact form at http://www.qt.io/contact-us.
 **
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
+** 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: http://www.gnu.org/copyleft/fdl.html.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -38,8 +29,9 @@
   \module QtGamepad
   \title Qt Gamepad C++ Classes
   \ingroup modules
+  \qtvariable gamepad
 
-  \brief Provides C++ classes for using Gamepad hardware.
+  \brief Provides C++ classes for using gamepads.
 
   To include the definitions of the module's classes, use the following directive:
 
diff --git a/src/gamepad/doc/src/qtgamepad-examples.qdoc b/src/gamepad/doc/src/qtgamepad-examples.qdoc
index 8504990..808ecad 100644
--- a/src/gamepad/doc/src/qtgamepad-examples.qdoc
+++ b/src/gamepad/doc/src/qtgamepad-examples.qdoc
@@ -1,11 +1,11 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
 ** Contact: http://www.qt.io/licensing/
 **
-** This file is part of the Qt Gamepad module
+** This file is part of the documentation of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** $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
@@ -14,22 +14,13 @@
 ** and conditions see http://www.qt.io/terms-conditions. For further
 ** information use the contact form at http://www.qt.io/contact-us.
 **
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
+** 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: http://www.gnu.org/copyleft/fdl.html.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -38,6 +29,7 @@
     \group qtgamepad-examples
     \title Qt Gamepad Examples
     \brief Examples for the Qt Gamepad module
+    \ingroup all-examples
 
     These are the Qt Gamepad examples.
 
diff --git a/src/gamepad/doc/src/qtgamepad-index.qdoc b/src/gamepad/doc/src/qtgamepad-index.qdoc
new file mode 100644
index 0000000..5fcd7b0
--- /dev/null
+++ b/src/gamepad/doc/src/qtgamepad-index.qdoc
@@ -0,0 +1,79 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: http://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 http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://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: http://www.gnu.org/copyleft/fdl.html.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+  \page qtgamepad-index.html
+  \title Qt Gamepad
+  \brief A cross-platform library to facilitate the use of gamepad hardware in Qt and Qt Quick applications.
+
+  Qt Gamepad is an add-on library that enables Qt applications to support
+  the use of gamepad hardware. The module provides both QML and C++ interfaces.
+
+  \section1 Getting Started
+
+  Before you start using the APIs provided by this module, ensure that the
+  gamepad is detected by your development environment.
+
+  \section2 Linux/X11
+
+  On standard Linux distributions such as Ubuntu, gamepads such as XBox or
+  PlayStaion controllers are detected out-of-the-box. To check if the
+  gamepad is detected, \c grep the \c dmesg logs using:
+
+  \badcode
+  dmesg | grep "<gamepad-make>"
+  \endcode
+
+  If you do not see the entries for the gamepad you are using, check if
+  the \c joystick package is installed. If not, install the package and \c grep
+  the \c dmesg logs again.
+
+  \section2 Windows
+
+  The Windows Plug-n-Play service automatically installs the necessary drivers
+  when the gamepad is connected through a USB port for the first time. Once the
+  drivers are installed, select \uicontrol{Control Panel > Device and Printers}
+  and check if the gamepad is listed under the \uicontrol Devices section.
+
+  To test whether gamepad input is detected, select
+  \uicontrol {Gamepad Controller Settings} from the context menu, select
+  \uicontrol {Properties > Test}, and start testing. You can also run the
+  \l{Qt Gamepad Configure Buttons Example}{configureButtons} example to test.
+
+  \section1 Examples
+
+  The \l{Qt Gamepad Examples}{examples} demonstrate how to handle input from a
+  gamepad using the QML and C++ APIs.
+
+  \section1 API Reference
+
+  \list
+  \li \l{Qt Gamepad QML Types}
+  \li \l{Qt Gamepad C++ Classes}
+  \endlist
+
+*/
diff --git a/src/gamepad/doc/src/qtgamepad-overview.qdoc b/src/gamepad/doc/src/qtgamepad-overview.qdoc
deleted file mode 100644
index 08c7c85..0000000
--- a/src/gamepad/doc/src/qtgamepad-overview.qdoc
+++ /dev/null
@@ -1,52 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the Qt Gamepad module
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** 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 http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/*!
-  \page qtgamepad-index.html
-  \title Qt Gamepad
-  \brief A cross-platform library to facilitate the use of gamepad hardware in Qt and Qt Quick applications
-
-  Qt Gamepad is an add-on library that enables Qt applications to support
-  the use of gamepad hardware.
-
-  \section1 API Reference
-
-  \list
-  \li \l{Qt Gamepad QML Types}
-  \li \l{Qt Gamepad C++ Classes}
-  \endlist
-
-*/
diff --git a/src/gamepad/doc/src/qtgamepad-qmltypes.qdoc b/src/gamepad/doc/src/qtgamepad-qmltypes.qdoc
index a0205d5..a4c2647 100644
--- a/src/gamepad/doc/src/qtgamepad-qmltypes.qdoc
+++ b/src/gamepad/doc/src/qtgamepad-qmltypes.qdoc
@@ -1,11 +1,11 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
 ** Contact: http://www.qt.io/licensing/
 **
-** This file is part of the Qt Gamepad module
+** This file is part of the documentation of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** $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
@@ -14,22 +14,13 @@
 ** and conditions see http://www.qt.io/terms-conditions. For further
 ** information use the contact form at http://www.qt.io/contact-us.
 **
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
+** 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: http://www.gnu.org/copyleft/fdl.html.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/