Frederik Gladhorn 6aa09bbce5 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: src/plugins/platforms/android/qandroidplatformtheme.h Change-Id: I541bd3069df3ab54c7942d5f4a9e155e3b6566a0		2014-02-18 14:19:36 +01: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	Merge remote-tracking branch 'origin/stable' into dev	2014-02-12 16:28:07 +01:00
io	Merge remote-tracking branch 'origin/stable' into dev	2014-02-18 14:19:36 +01:00
itemmodels	Merge remote-tracking branch 'origin/stable' into dev	2014-02-07 13:07:25 +01:00
json	Remove a not required whitespace when writing JSON in compact format	2014-02-16 16:56:10 +01:00
kernel	tst_qsignalblocker: simplify test	2014-02-16 00:18:32 +01: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	Add a testAndSet overload to the atomics that returns the current value	2014-02-16 05:12:26 +01:00
tools	Add qHash() overloads for floating-point types	2014-02-16 00:18:32 +01: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