Liang Qi 905329200f Merge remote-tracking branch 'origin/5.7' into 5.8 ... Conflicts: src/gui/image/qpixmap.cpp src/widgets/kernel/qformlayout.cpp Change-Id: I8a8391a202adf7f18464a22ddf0a6c4974eab692		2016-10-11 07:40:32 +02:00
..
qmake.conf	Add QMAKE_LFLAGS_SONAME to linker flags for Android plugins	2016-10-06 13:33:08 +00:00
qplatformdefs.h	Clean up QT_QPA_DEFAULT_PLATFORM handling	2016-10-05 19:07:30 +00:00