Merge branch 'stable' into dev

Change-Id: I9aad90d45302154fb831d8ce50dffdd7ae9d8318
Update module version to 5.2.0

Change-Id: I6faf0853c52cd7cbedb1a7f046961fd350e0aea5
Reviewed-by: David Faure (KDE) <faure@kde.org>
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I73c2bccfee6f3ea0099fa565bbf2e9d2c65096a8
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Icc39210a3f41d4ea35cb678a8b3a872052819b9b
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I63c17e85c104c7a01abd351a8fd80a194f16691c
Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
	.qmake.conf
	sync.profile

Change-Id: I5738cd6ace4c7896fae45d1922c9a6b44a8eac78
Doc: Setting navigation variables for the navigation bar.

Change-Id: I0c53e5e14f01f39ccefe9fdc38e0680d7691fcbe
Reviewed-by: David Faure (KDE) <faure@kde.org>
Reviewed-by: Martin Smith <martin.smith@digia.com>
Bump MODULE_VERSION to 5.1.2

Change-Id: Iaeb5409a4caf23533209425a07231da346570fce
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Merge remote-tracking branch 'origin/release' into stable

Change-Id: Ic32f2f1327095555b9694fffe960af4e27f5ce21
Doc: Setting \qtvariable in module page.

\qtvariable indicates the QT variable needed in .pro files.

Change-Id: I11a7cfa2d72f0dcc3056152c00283670ffcef947
Reviewed-by: Martin Smith <martin.smith@digia.com>
Merge branch 'stable' into dev

Conflicts:
	.qmake.conf

Change-Id: I3d5b05b358cd18ad85fa9ea42f94a312f81d91f5
Add convenient method getTimestamp to QX11Info

Provides access to the getTimestamp method in the XCB plugin which
allows users to retrieve the current X timestamp.

Change-Id: Ib6acd44c8ff899265ed6826f36b88fe427ff58c3
Reviewed-by: David Faure (KDE) <faure@kde.org>
Add a method to let users determine if the current platform is X11.

In order to know if the methods in QtX11Extras are usable the user should
have a way to tell if they're running on X11.

Change-Id: I096267eb1f1fe07ee11811574a96100389c33b7d
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Update the git-archive export options

The .gitattributes, .gitignore, .commit-template files do not need to be
present in packaged sources, as they are for people using the Git
repository.  People who download tarballs usually don't reimport into
Git -- they should just download the actual repositories.

Change-Id: I04d2ca436f5174c7820b42b6f5b2b9648c925fe3
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
Properly get X screen application is running on in appScreen

QDesktopWidget does not provide the X screen number. No matter on which
X screen an application is started, QDesktopWidget returns 0.

Therefore resolve the X screen through the native interface's x11
screen resource.

The documentation is improved to make it more obvious that this is
about the X screen and not the RandR screen.

Change-Id: I0f78a728769cbdfcac8b67b4fd5de0934f498027
Reviewed-by: Richard J. Moore <rich@kde.org>
Reviewed-by: David Faure <david.faure@kdab.com>
Doc: Updated url variable in qdocconf files.

In 5.2, the HTML output is in a flatter structure and when they are
hosted in qt-project.org/doc, the documentation will be found at
http://qt-project.org/doc/qt-$QT_VER

The url variable is used by projects outside of Qt 5 which need
to link to Qt 5 documentation, such as Qt Creator.

Task-number: QTBUG-34584
Change-Id: I9ec7609bfeae7bcf393b61941052f921fc328db7
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>