diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-09-23 08:35:49 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-09-23 08:35:49 +0200 |
| commit | 6572650641a2f64f0dd4f41b0426bbd3698f6530 (patch) | |
| tree | b28400a2983e044dc7911607ff57b27a9c8cd1bc /src/sql/models/qsqlrelationaltablemodel.h | |
| parent | 60e20abf19f58c34cb3a878636d955993b81cf2e (diff) | |
| parent | ac5e198db4eea4670a5a4a22fb44eb8a6acc4c47 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
src/widgets/styles/qstylesheetstyle.cpp
Change-Id: If11da7799075cc2d5768da5603c5fc46773c4eae
Diffstat (limited to 'src/sql/models/qsqlrelationaltablemodel.h')
0 files changed, 0 insertions, 0 deletions