Liang Qi 60fefff22f 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		2018-05-03 14:50:22 +02:00
..
.gitignore
qprinter.pro	Remove QT_DISABLE_DEPRECATED_BEFORE=0 from tests not using deprecated API.	2015-09-01 16:57:46 +00:00
tst_qprinter.cpp	Merge remote-tracking branch 'origin/5.11' into dev	2018-05-03 14:50:22 +02:00