Simon Hausmann 407302fb1b Merge remote-tracking branch 'origin/5.9' into dev ... Conflicts: src/corelib/io/qwindowspipewriter.cpp src/widgets/styles/qcommonstyle.cpp Change-Id: I0d33efdc4dc256e234abc490a18ccda72cd1d9e6		2017-07-19 09:47:29 +02:00
..
qmake-manual.qdoc	Merge remote-tracking branch 'origin/5.9' into dev	2017-07-19 09:47:29 +02:00