diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-08-05 09:28:48 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-08-05 09:28:48 +0200 |
| commit | f3b28e80211881ab78879eb5acbf5de5d1b1e38c (patch) | |
| tree | cf283c7a44bdfc4113d48ec12daa0c3d711aae99 /src/widgets/styles | |
| parent | 4d7271087e84096abd75fa806bea234daee0cd94 (diff) | |
| parent | 8c0787cfa1a906ebe25907515d86050303b127e7 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
qmake/generators/unix/unixmake2.cpp
src/plugins/platforms/cocoa/qcocoawindow.mm
Change-Id: Iba7aa7324f35543e0297a3680956420058cd3630
Diffstat (limited to 'src/widgets/styles')
0 files changed, 0 insertions, 0 deletions