Simon Hausmann b7a8b5a284 Merge remote-tracking branch 'origin/5.7' into 5.8 ... Conflicts: src/qml/jsruntime/qv4string.cpp The conflict resolution for qv4tsring.cpp is to essentially omit the change of commit 64714ea431 as the code in 5.8 already uses the add/mul_overflow functions. This merge also reverts commit f4ac007f4a as we can deal with dead store elimination now. Change-Id: Iee08c87cbe1a2ff23a73ce621d56262b4e007c56		2016-11-15 16:44:16 +01:00
..
examples	Merge remote-tracking branch 'origin/dev' into HEAD	2016-05-24 21:50:29 +02:00
geometry	Fix enums in QSGGeometry	2016-10-12 09:57:43 +00:00
nodes	Enable building Qt Quick module with QT_NO_OPENGL defined	2016-03-22 09:51:54 +00:00
nokeywords	Add cross-backend simple rect, texture, and ninepatch nodes	2016-06-22 13:11:14 +00:00
qquickaccessible	…
qquickanchors	QML: Remove internal field padding from QQuickAnchorPrivate.	2016-05-10 08:17:00 +00:00
qquickanimatedimage	Skip mirroring tests with software adaptation	2016-06-07 09:18:08 +00:00
qquickanimatedsprite	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-06-29 10:11:25 +02:00
qquickanimationcontroller	…
qquickanimations	…
qquickanimators	…
qquickapplication	…
qquickbehaviors	…
qquickborderimage	Skip mirroring tests with software adaptation	2016-06-07 09:18:08 +00:00
qquickcanvasitem	Canvas test: make sure canvas is ready	2016-07-04 15:33:47 +00:00
qquickdesignersupport	…
qquickdrag	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-05-06 09:17:24 +02:00
qquickdroparea	…
qquickdynamicpropertyanimation	…
qquickflickable	Merge remote-tracking branch 'origin/5.7' into 5.8	2016-10-10 16:01:48 +02:00
qquickflipable	…
qquickfocusscope	…
qquickfontloader	…
qquickfontloader_static	…
qquickfontmetrics	…
qquickframebufferobject	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-08-05 09:02:17 +02:00
qquickgraphicsinfo	One GraphicsInfo to rule them all	2016-06-01 10:32:18 +00:00
qquickgridview	…
qquickimage	Fix some test failures with QT_NO_OPENGL builds	2016-05-06 19:17:28 +00:00
qquickimageprovider	…
qquickitem	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-10-27 09:56:20 +02:00
qquickitem2	Quick: Do not calculate the difference in a geometryChange	2016-11-10 14:53:34 +00:00
qquickitemlayer	QQuickItemLayer: Don't run tests with GLSL when OpenGL is not used	2016-06-10 12:20:07 +00:00
qquicklayouts	Fix crash on exit when using default property aliases with layouts	2016-09-15 13:20:42 +00:00
qquicklistview	Merge remote-tracking branch 'origin/5.7' into dev	2016-08-09 10:28:48 +02:00
qquickloader	Fix import with qualifier of remote directory with qmldir	2016-08-10 13:20:56 +00:00
qquickmousearea	Merge remote-tracking branch 'origin/5.7' into 5.8	2016-10-10 16:01:48 +02:00
qquickmultipointtoucharea	autotests: remove qWait(1) in touch sequences	2016-08-13 15:07:09 +00:00
qquickopenglinfo	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-08-05 09:02:17 +02:00
qquickpainteditem	Fix some test failures with QT_NO_OPENGL builds	2016-05-06 19:17:28 +00:00
qquickpath	…
qquickpathview	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-08-13 00:41:58 +02:00
qquickpincharea	Fix tst_QQuickPinchArea::cancel	2016-07-25 22:04:27 +00:00
qquickpixmapcache	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-04-08 13:03:25 +02:00
qquickpositioners	…
qquickrectangle	…
qquickrepeater	…
qquickscreen	…
qquickshadereffect	Merge remote-tracking branch 'origin/5.7' into dev	2016-08-02 18:34:30 +02:00
qquickshortcut	QQuickShortcut: allow setting a custom context matcher	2016-10-26 13:20:05 +00:00
qquicksmoothedanimation	…
qquickspringanimation	…
qquickspritesequence	…
qquickstates	QML: Remove internal field padding from QQuickAnchorPrivate.	2016-05-10 08:17:00 +00:00
qquickstyledtext	…
qquicksystempalette	…
qquicktext	Merge remote-tracking branch 'origin/5.7' into 5.8	2016-10-27 12:27:54 +02:00
qquicktextdocument	…
qquicktextedit	Merge remote-tracking branch 'origin/5.7' into 5.8	2016-11-15 16:44:16 +01:00
qquicktextinput	Merge remote-tracking branch 'origin/5.7' into dev	2016-08-17 10:57:38 +02:00
qquicktextmetrics	…
qquicktimeline	…
qquickview	Stabilize tst_QQuickView::resizemodeitem	2016-07-19 09:25:28 +00:00
qquickvisualdatamodel	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-09-16 23:21:16 +02:00
qquickwindow	Merge branch 'dev' into wip/pointerhandler	2016-08-04 13:15:54 +02:00
qquickxmllistmodel	…
rendernode	Merge remote-tracking branch 'origin/5.7' into 5.8	2016-10-20 08:28:16 +02:00
scenegraph	Merge remote-tracking branch 'origin/5.7' into dev	2016-08-09 10:28:48 +02:00
shared	Introduce BorderImageMesh.	2016-05-06 18:25:43 +00:00
touchmouse	Run tst_TouchMouse::buttonOnDelayedPressFlickable with both scenarios	2016-10-04 09:00:41 +00:00
quick.pro	Adjust decarative after qtConfig changes in qtbase	2016-08-19 11:16:18 +00:00