diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-06-20 07:50:44 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-06-20 07:50:44 +0200 |
| commit | bd9959bde290168b0635cb878d7d189e1f9c4b4f (patch) | |
| tree | 1a4d5a0eff8d6acaff26ae4ff4ded8ca71b76a06 /dist/changes-1.31 | |
| parent | b877285694501d16b2bb0dc8d1a92e185b079b87 (diff) | |
| parent | 6398588338dfea4161704e01216ba70b216a7a0b (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
.qmake.conf
src/gui/painting/qdrawhelper.cpp
src/network/ssl/qsslsocket_openssl.cpp
src/widgets/styles/qstylesheetstyle.cpp
Change-Id: Ibe1cd40f46a823c9e5edbe0a3cd16be1e1686b17
Diffstat (limited to 'dist/changes-1.31')
0 files changed, 0 insertions, 0 deletions