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

Change-Id: I8c0dee8be48be8fb623c0df4bbdec6fd1bcd66dc
Update module version to 5.2.0

Change-Id: I5ddeaa45f53d2a899f65325db2ddd4fdaa2c1be1
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I8bce6e1fdfd4a70bf60d1303982ea61e076683a7
Merge branch 'stable' into dev

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

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

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

Conflicts:
	.qmake.conf
	sync.profile

Change-Id: I0c7564e03a51df9aba7dd53640802e318417bd0e
Don't remove milliseconds now that toString() includes them.

This patch fixes a test failure introduced by
15da0a5af20fe6771bcb94ef8d46edbd5c8fb64c.

tst_QScriptEngine::dateConversionJSQt and
tst_QScriptEngine::dateConversionQtJS
removed milliseconds from the JS-converted datetime, as
QTime::toString() previously did not include them. Now it does, so we
can remove this code.

Change-Id: Iaddfc050adf8360bee776086b27de001702d221d
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Id041591bce92162e8c615034c24c56199064e76d
Doc: Setting navigation variables for Qt Script and Qt Script Tools

-also enabled linking to 'qtdoc' for the homepage link

Change-Id: I74781effabac4c73c8a286347e5aa0821d5931f0
Reviewed-by: Martin Smith <martin.smith@digia.com>
Merge remote-tracking branch 'origin/stable' into dev

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

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

Change-Id: I018b00a19c3bbd2aa4bf34712f414569dd50775b
Reviewed-by: Martin Smith <martin.smith@digia.com>
Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
	.qmake.conf

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

Change-Id: I98df818f6411c38a6ad8a8efaf6b6a0203dbb958
QtScript: Fix header guard

Change-Id: Ib8db978f3f5414fccfcf772f7fa9b2b7ddbc761c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Merge remote-tracking branch 'origin/stable' into dev

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

Change-Id: Ia10bb1e8b5fa8bb93e76bf2e295df5c10336e582