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
..
dialogs	Do not clear default button in QMessageBox::setDetailedText().	2014-06-04 14:43:02 +02:00
effects	QtWidgets tests: Remove DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0	2013-03-28 02:02:14 +01:00
graphicsview	Merge remote-tracking branch 'origin/stable' into dev	2014-06-05 22:26:44 +02:00
itemviews	Fix crash when inserting the same instance widget more than once	2014-06-26 10:17:36 +02:00
kernel	Merge remote-tracking branch 'origin/5.3' into dev	2014-07-01 16:25:19 +02:00
styles	Remove the widget from the stylesheet cache before polishing	2014-06-20 07:10:21 +02:00
util	QNX: Fix QCompleter autotest	2014-04-09 20:53:06 +02:00
widgets	Merge remote-tracking branch 'origin/5.3' into dev	2014-07-01 16:25:19 +02:00
widgets.pro