Frederik Gladhorn 98d3e40fb7 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: mkspecs/qnx-armv7le-qcc/qplatformdefs.h src/printsupport/kernel/qcups.cpp src/widgets/styles/qstyle.h tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp Change-Id: Ia41e13051169a6d4a8a1267548e7d47b859bb267		2014-04-11 14:36:55 +02:00
..
animation	tst_qpauseanimation: Fix condition in QEXPECT_FAIL.	2014-01-30 22:10:22 +01:00
codecs	Fix compilation after b0afad8f0b	2014-02-07 04:47:12 +01:00
global	Mark some tests as XFAIL on QNX	2014-03-27 08:21:14 +01:00
io	Merge remote-tracking branch 'origin/stable' into dev	2014-04-11 14:36:55 +02:00
itemmodels	tests: Remove superfluous gui additions to QT	2014-02-28 17:59:29 +01:00
json	Mark some tests as XFAIL on QNX	2014-03-27 08:21:14 +01:00
kernel	Re-add missing test to kernel.pro	2014-04-02 03:07:12 +02:00
mimetypes	test: Don't build qmimedatabase-cache for QNX	2014-01-16 16:11:04 +01:00
plugin	qcompilerdetection.h: add Q_COMPILER_UNIFORM_INIT	2013-11-15 06:30:53 +01:00
statemachine	don't erroneously claim that gui support is needed	2013-10-16 17:10:15 +02:00
thread	Fix tst_qthreadpool under high load.	2014-03-14 22:38:49 +01:00
tools	Merge remote-tracking branch 'origin/stable' into dev	2014-04-11 14:36:55 +02:00
xml	Check for network module when building according auto tests	2013-02-19 19:20:53 +01:00
corelib.pro	iOS: Enable building of basic tests	2014-01-22 12:35:17 +01:00