Frederik Gladhorn 66646dd8c3 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: .qmake.conf src/plugins/accessible/quick/quick.pro src/quick/items/qquickpincharea.cpp src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp src/quick/scenegraph/qsgthreadedrenderloop.cpp Manually adjusted for TestHTTPServer constructor change: tests/auto/quick/qquickimage/tst_qquickimage.cpp Change-Id: I5e58a7c08ea92d6fc5e3bce98571c54f7b2ce08f		2014-05-10 11:53:47 +02:00
..
data	Stabilize tst_qqmlxmlhttprequest::stateChangeCallingContext() on Mac.	2014-04-15 14:28:59 +02:00
.gitattributes	Fix data file checkout formats in Windows for some declarative tests	2012-03-19 16:58:21 +01:00
qqmlxmlhttprequest.pro	Fix XHR auto tests always failing	2014-04-08 17:38:39 +02:00
tst_qqmlxmlhttprequest.cpp	TestHTTPServer: Make listening an explicit operation that reports failure.	2014-03-21 00:09:29 +01:00