diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-16 07:30:02 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-06-16 07:30:02 +0200 |
| commit | c4e472ea1037afde7b99d9132a49eb616cad240e (patch) | |
| tree | c9e66fdda63a2e5c3f5a944d711e5c9845de33ac /src/corelib/plugin/qfactoryloader.cpp | |
| parent | 7b23ebefb2360feb139ff6e10d2253396e58721e (diff) | |
| parent | 6c1e352803a6efbd8b14e5296434e22165b65084 (diff) | |
Merge remote-tracking branch 'origin/5.7.0' into 5.7
Conflicts:
src/corelib/tools/qsimd_p.h
Change-Id: I7c6bfc5873d97ad7f51a540dd9c18b9359dde59f
Diffstat (limited to 'src/corelib/plugin/qfactoryloader.cpp')
0 files changed, 0 insertions, 0 deletions