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
..
qfactoryloader	don't erroneously claim that gui support is needed	2013-10-16 17:10:15 +02:00
qlibrary	tests: Make the QT assignments more explicit	2013-08-21 19:05:52 +02:00
qplugin	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qpluginloader	Merge remote-tracking branch 'origin/5.3' into dev	2014-07-01 16:25:19 +02:00
quuid	qcompilerdetection.h: add Q_COMPILER_UNIFORM_INIT	2013-11-15 06:30:53 +01:00
plugin.pro