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
Bump MODULE_VERSION to 5.1.2

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

Change-Id: I025901e52747805c61dc7edd40d5f2d067291bd0
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
test: Fix XPASS for tst_QScriptJsTestSuite::ecma/Math(Math.pow()

This tests seem to be passing on MinGW 4.8, so removing them
from the expect_fail.txt file.

Change-Id: I3786d410f1e0937ddc1ceedd8ffd3c07d2619c40
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
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>
exclude WebKit/JavaScriptCore from lupdate scan

there is no point in scanning it, and it's incredibly slow.

Change-Id: Ife2fe879b8285f18bb714804c532a68ed64f84d8
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>