Frederik Gladhorn a1fe728fa5 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: src/gui/kernel/qguiapplication.cpp src/plugins/platforms/android/androidjnimain.cpp src/plugins/platforms/android/qandroidplatformintegration.cpp src/plugins/platforms/android/qandroidplatformintegration.h src/plugins/platforms/android/qandroidplatformopenglcontext.cpp src/plugins/platforms/cocoa/qcocoawindow.h src/plugins/platforms/cocoa/qcocoawindow.mm src/plugins/platforms/xcb/qxcbconnection_xi2.cpp src/sql/doc/src/sql-driver.qdoc src/widgets/widgets/qtoolbararealayout.cpp Change-Id: Ifd7e58760c3cb6bd8a7d1dd32ef83b7ec190d41e		2014-02-07 13:07:25 +01:00
..
animation	tst_qpauseanimation: Fix condition in QEXPECT_FAIL.	2014-01-30 22:10:22 +01:00
codecs	Add a new UTF-8 decoder, similar to the encoder we've just added	2014-01-09 22:34:54 +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	2014-02-07 13:07:25 +01:00
itemmodels	Merge remote-tracking branch 'origin/stable' into dev	2014-02-07 13:07:25 +01:00
json	Added constructor to QJsonValue for const char *	2014-01-16 21:49:26 +01:00
kernel	Fix MSVC-warning about unused variable eventdispatcher.	2014-01-31 10:21:50 +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	Replace the type-based QAtomicIntegerTraits with a size-based one	2014-01-30 18:06:27 +01:00
tools	Merge remote-tracking branch 'origin/stable' into dev	2014-02-07 13:07:25 +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