J-P Nurmi 0fcce50af0 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: mkspecs/features/qt.prf src/plugins/platforms/xcb/qxcbwindow.h src/tools/qdoc/qdocindexfiles.cpp src/widgets/kernel/qwidget_qpa.cpp Change-Id: I214f57b03bc2ff86cf3b7dfe2966168af93a5a67		2014-06-05 22:26:44 +02:00
..
animation	Updated corelib's unit tests to use QSignalSpy's functor constructor	2014-05-08 04:22:54 +02:00
codecs	Merge remote-tracking branch 'origin/release' into stable	2014-05-14 12:37:34 +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-06-05 22:26:44 +02:00
itemmodels	Merge remote-tracking branch 'origin/stable' into dev	2014-06-05 22:26:44 +02:00
json	Mark some tests as XFAIL on QNX	2014-03-27 08:21:14 +01:00
kernel	QTimer: add convenience singleShot methods for functors	2014-05-28 11:45:48 +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-22 07:46:17 +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