Frederik Gladhorn 3d4aeb7919 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: src/gui/kernel/qguiapplication.cpp Change-Id: Ibe75603dc8a51769db6550ea3f07bc8d19b0be85		2014-05-13 22:19:10 +02:00
..
animation	Updated corelib's unit tests to use QSignalSpy's functor constructor	2014-05-08 04:22:54 +02:00
codecs	Ensure we try the UTF-8 conversions with longer strings	2014-04-25 01:27:33 +02:00
global	Add a more reliable replacement for qt_add/removeObject().	2014-04-15 17:50:20 +02:00
io	Merge remote-tracking branch 'origin/stable' into dev	2014-05-13 22:19:10 +02:00
itemmodels	Updated corelib's unit tests to use QSignalSpy's functor constructor	2014-05-08 04:22:54 +02:00
json	Mark some tests as XFAIL on QNX	2014-03-27 08:21:14 +01:00
kernel	Updated corelib's unit tests to use QSignalSpy's functor constructor	2014-05-08 04:22:54 +02:00
mimetypes	test: Don't build qmimedatabase-cache for QNX	2014-01-16 16:11:04 +01:00
plugin	Updated corelib's unit tests to use QSignalSpy's functor constructor	2014-05-08 04:22:54 +02:00
statemachine	Updated corelib's unit tests to use QSignalSpy's functor constructor	2014-05-08 04:22:54 +02:00
thread	Updated corelib's unit tests to use QSignalSpy's functor constructor	2014-05-08 04:22:54 +02:00
tools	Merge remote-tracking branch 'origin/stable' into dev	2014-05-13 22:19:10 +02:00
xml	Include the duplicated attribute name in the error message	2014-05-06 01:20:19 +02:00
corelib.pro	iOS: Enable building of basic tests	2014-01-22 12:35:17 +01:00