diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-05-03 14:26:01 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-05-03 14:50:22 +0200 |
| commit | 60fefff22f7fa259a8bdb023d1ec9a57cfd34bfb (patch) | |
| tree | ab33ab6eeb08f7a72e0196ee5025790aaa01b1dd /src/testlib/qtestlog_p.h | |
| parent | b1e0a71997111fc296001bc94e0da8342cf0ac97 (diff) | |
| parent | da32360ffc3c7b677355c37ae54c89637c18047f (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
examples/widgets/graphicsview/elasticnodes/graphwidget.cpp
examples/widgets/graphicsview/elasticnodes/node.cpp
examples/widgets/graphicsview/elasticnodes/node.h
src/plugins/platforms/cocoa/qnsview.mm
src/plugins/platforms/cocoa/qnsview_drawing.mm
src/widgets/kernel/qmacgesturerecognizer_p.h
Change-Id: I13cf06bac75d48d779d8ee7b5c91bfc976f2a32c
Diffstat (limited to 'src/testlib/qtestlog_p.h')
0 files changed, 0 insertions, 0 deletions