Allan Sandfeld Jensen fa9d12f4a2 Merge remote-tracking branch 'origin/5.10' into dev ... Conflicts: src/plugins/platforms/windows/qwindowsmousehandler.cpp src/plugins/platforms/xcb/qxcbimage.cpp tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp tests/manual/qtabletevent/regular_widgets/main.cpp Done-with: Friedemann Kleint<Friedemann.Kleint@qt.io> Done-with: Mårten Nordheim<marten.nordheim@qt.io> Change-Id: I5b2499513a92c590ed0756f7d2e93c35a64b7f30		2017-10-24 13:40:55 +02:00
..
effects.pri	…
qgraphicseffect.cpp	Convert features.graphicseffect to QT_[REQUIRE_]CONFIG	2017-07-11 02:52:03 +00:00
qgraphicseffect.h	Replace Q_NULLPTR with nullptr where possible	2017-09-19 11:53:55 +00:00
qgraphicseffect_p.h	Convert features.graphicseffect to QT_[REQUIRE_]CONFIG	2017-07-11 02:52:03 +00:00
qpixmapfilter.cpp	Remove some unused, local variables	2017-10-14 07:04:39 +00:00
qpixmapfilter_p.h	Replace Q_DECL_OVERRIDE with override where possible	2017-09-19 11:53:42 +00:00