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
..
image	Merge remote-tracking branch 'origin/5.3' into dev	2014-07-01 16:25:19 +02:00
itemmodels	tests: Remove superfluous gui additions to QT	2014-02-28 17:59:29 +01:00
kernel	Windows: Fix setting of geometries in minimized state.	2014-06-27 11:29:44 +02:00
math3d	Add viewport transform to QMatrix4x4	2014-05-16 09:53:58 +02:00
painting	QPainter on QBitmap: make setBrush(NoBrush) work as expected.	2014-05-17 08:59:08 +02:00
qopengl	Remove direct OpenGL calls from QtOpenGL	2014-04-28 18:19:34 +02:00
text	Merge remote-tracking branch 'origin/stable' into dev	2014-06-05 22:26:44 +02:00
util	Bugfix QDesktopServices on Windows	2013-07-11 10:56:49 +02:00
gui.pro	purge vestiges of opengl es 1 support	2014-04-04 19:32:21 +02:00