Frederik Gladhorn a09a8d509a Merge remote-tracking branch 'origin/5.3' into dev ... Conflicts: mkspecs/qnx-x86-qcc/qplatformdefs.h src/corelib/global/qglobal.h src/network/socket/qnativesocketengine_winrt.cpp src/plugins/platforms/android/androidjniaccessibility.cpp src/plugins/platforms/windows/qwindowswindow.cpp Manually adjusted: mkspecs/qnx-armle-v7-qcc/qplatformdefs.h to include 9ce697f2d5 Thanks goes to Sergio for the qnx mkspecs adjustments. Change-Id: I53b1fd6bc5bc884e5ee2c2b84975f58171a1cb8e		2014-07-01 16:25:19 +02:00
..
qicoimageformat	Make the ICO image handler capable of reading CUR files too.	2014-06-05 19:10:58 +02:00
qicon	tst_qicon: Resolve all files using QFINDTESTDATA().	2014-06-22 09:41:06 +02:00
qimage	Merge remote-tracking branch 'origin/5.3' into dev	2014-07-01 16:25:19 +02:00
qimageiohandler	QtGui tests: Remove DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0	2013-03-27 03:54:42 +01:00
qimagereader	Remove qSort usages from gui tests	2014-02-20 08:10:19 +01:00
qimagewriter	Remove qSort usages from gui tests	2014-02-20 08:10:19 +01:00
qmovie	QtGui tests: Remove DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0	2013-03-27 03:54:42 +01:00
qpicture	Serialize QPicture using the latest QDataStream version.	2014-04-02 15:18:11 +02:00
qpixmap	Add missing detach() in QPixmap::convertFromImage()	2014-06-11 23:06:01 +02:00
qpixmapcache	QtGui tests: Remove DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0	2013-03-27 03:54:42 +01:00
image.pro	Check for network module when building according auto tests	2013-02-19 19:20:53 +01:00