Liang Qi d456f87ece Merge remote-tracking branch 'origin/5.6' into dev ... Conflicts: src/corelib/io/qfilesystemwatcher_win.cpp src/corelib/plugin/plugin.pri src/plugins/platforms/cocoa/qcocoaaccessibility.mm tests/auto/corelib/tools/qlocale/tst_qlocale.cpp Change-Id: Id6824631252609a75eff8b68792e4d10095c8fc1		2016-02-11 08:25:04 +01:00
..
plugin.pri	Merge remote-tracking branch 'origin/5.6' into dev	2016-02-11 08:25:04 +01:00
qelfparser_p.cpp	Updated license headers	2016-01-15 12:25:24 +00:00
qelfparser_p.h	Updated license headers	2016-01-15 12:25:24 +00:00
qfactoryinterface.cpp	Updated license headers	2016-01-15 12:25:24 +00:00
qfactoryinterface.h	Updated license headers	2016-01-15 12:25:24 +00:00
qfactoryloader_p.h	Updated license headers	2016-01-15 12:25:24 +00:00
qfactoryloader.cpp	Updated license headers	2016-01-15 12:25:24 +00:00
qlibrary_p.h	Add Intel copyright to files that Intel has had non-trivial contribution	2016-01-21 22:44:21 +00:00
qlibrary_unix.cpp	Merge remote-tracking branch 'origin/5.6' into dev	2016-02-11 08:25:04 +01:00
qlibrary_win.cpp	Updated license headers	2016-01-15 12:25:24 +00:00
qlibrary.cpp	Update the Intel copyright year	2016-01-21 22:44:16 +00:00
qlibrary.h	Updated license headers	2016-01-15 12:25:24 +00:00
qmachparser_p.h	Update the Intel copyright year	2016-01-21 22:44:16 +00:00
qmachparser.cpp	Update the Intel copyright year	2016-01-21 22:44:16 +00:00
qplugin.h	Updated license headers	2016-01-15 12:25:24 +00:00
qplugin.qdoc	Doc: corrected error in doc static plugins	2015-11-13 20:33:44 +00:00
qpluginloader.cpp	Updated license headers	2016-01-15 12:25:24 +00:00
qpluginloader.h	Updated license headers	2016-01-15 12:25:24 +00:00
qsystemlibrary_p.h	Updated license headers	2016-01-15 12:25:24 +00:00
qsystemlibrary.cpp	Updated license headers	2016-01-15 12:25:24 +00:00
quuid_darwin.mm	Updated license headers	2016-01-15 12:25:24 +00:00
quuid.cpp	Updated license headers	2016-01-15 12:25:24 +00:00
quuid.h	Updated license headers	2016-01-15 12:25:24 +00:00