diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-05-14 14:51:46 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-05-14 14:51:46 +0200 |
| commit | 7e1b504f31dcdad0b055c1532209e44f81033bc9 (patch) | |
| tree | b7ab4b258a50af69179fa6efb4871c7218e475e1 /src/corelib/global/qfloat16.h | |
| parent | 432df3f8c8504b333ecc76df4ce19a7b2c04ae77 (diff) | |
| parent | 627de835b1b87280741eb96ae77ea42b1f6ef5dc (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
mkspecs/features/qt_module_headers.prf
tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp
tests/auto/widgets/kernel/qwidget/BLACKLIST
Change-Id: I2a08952d28d1d0e3d73f521a3d44700ce79ff16c
Diffstat (limited to 'src/corelib/global/qfloat16.h')
0 files changed, 0 insertions, 0 deletions