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
..
almostplugin	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
elftest	Moving relevant tests to corelib/plugin	2011-09-01 12:42:51 +02:00
lib	Make sure that the reference count for plugins is kept correctly	2013-02-27 07:09:18 +01:00
machtest	OSX: Make machtest compile on 10.9	2013-08-05 17:58:24 +02:00
theplugin	Make sure that the reference count for plugins is kept correctly	2013-02-27 07:09:18 +01:00
tst	Add a Mach-O decoder to the QPluginLoader	2013-07-20 02:09:26 +02:00
.gitignore	Moving relevant tests to corelib/plugin	2011-09-01 12:42:51 +02:00
empty.json	Use new plugin system in plugin autotest.	2012-02-23 16:38:45 +01:00
fakeplugin.cpp	Add a Mach-O decoder to the QPluginLoader	2013-07-20 02:09:26 +02:00
qpluginloader.pro	Android: Fix compilation of qpluginloader test	2014-06-30 08:59:35 +02:00
tst_qpluginloader.cpp	Updated corelib's unit tests to use QSignalSpy's functor constructor	2014-05-08 04:22:54 +02:00