Liang Qi 0aa2d318b1 Merge remote-tracking branch 'origin/5.5' into dev ... Conflicts: src/corelib/global/qglobal.cpp src/corelib/global/qglobal.h src/corelib/global/qsysinfo.h src/corelib/global/qsystemdetection.h src/corelib/kernel/qobjectdefs.h src/plugins/plugins.pro tests/auto/widgets/itemviews/qlistview/qlistview.pro Change-Id: Ib55aa79d707c4c1453fb9d697f6cf92211ed665c		2015-07-01 11:05:26 +02:00
..
qfactoryloader	Update copyright headers	2015-02-11 06:49:51 +00:00
qlibrary	fix usage of wince scope	2015-06-05 10:29:10 +00:00
qplugin	Update copyright headers	2015-02-11 06:49:51 +00:00
qpluginloader	Fix building tst_QPluginLoader on OS X, non-devel builds	2015-05-13 06:15:28 +00:00
quuid	QUuid: add missing relational operators	2015-04-04 06:40:27 +00:00
plugin.pro	Fix a crash in QFactoryLoader	2012-03-29 13:58:13 +02:00