Frederik Gladhorn 3f3be55835 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: src/gui/kernel/qplatformtheme.h tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp Change-Id: Iecd3343d6a050b8764f78d809c4a1532aeba69e5		2013-12-16 16:59:33 +01:00
..
animation	don't erroneously claim that gui support is needed	2013-10-16 17:10:15 +02:00
codecs	Replace use of putenv in test case	2013-11-04 11:16:16 +01:00
global	Remove trailing space from QDebug stream	2013-12-06 13:33:10 +01:00
io	Merge remote-tracking branch 'origin/stable' into dev	2013-12-16 16:59:33 +01:00
itemmodels	Remove trailing space from QDebug stream	2013-12-06 13:33:10 +01:00
json	Remove trailing space from QDebug stream	2013-12-06 13:33:10 +01:00
kernel	Merge remote-tracking branch 'origin/stable' into dev	2013-12-16 16:59:33 +01:00
mimetypes	Add QT_NO_PROCESS guards in tests where they are missing	2013-09-03 08:42:24 +02: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	tst_qthreadpool: fix memory leak	2013-11-28 09:14:11 +01:00
tools	Merge remote-tracking branch 'origin/stable' into dev	2013-12-16 16:59:33 +01:00
xml	Check for network module when building according auto tests	2013-02-19 19:20:53 +01:00
corelib.pro	Import QMimeType / QMimeDatabase into QtCore.	2012-02-18 22:19:43 +01:00