diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-10-30 08:43:14 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-10-30 08:54:05 +0100 |
| commit | 17d51411132edef53e79dcbaf1046f06f79bed5d (patch) | |
| tree | 38398d448b30313f91960c70a3a28cce91293da9 /src/tools/qdbuscpp2xml | |
| parent | ea0e868c4881944207e9b3a77011e05a505ff3b7 (diff) | |
| parent | 9f0dda29d5d070f63b7f098139f01f07ec91ffdf (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
src/plugins/platforms/windows/qwindowswindow.cpp
tests/auto/widgets/kernel/qaction/tst_qaction.cpp
Change-Id: Ia017a825ed2ca2d53ac586f4ae48df6f65818d40
Diffstat (limited to 'src/tools/qdbuscpp2xml')
0 files changed, 0 insertions, 0 deletions