Liang Qi 9808b53fde Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: configure src/plugins/platforms/eglfs/qeglfsintegration.cpp src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp Change-Id: Id2da7c775439adb62646d5b741ee7c638042b34b		2016-11-15 09:58:16 +01:00
..
.gitignore
qtextlayout.pro	QtGui tests: Remove DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0	2013-03-27 03:54:42 +01:00
tst_qtextlayout.cpp	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-11-15 09:58:16 +01:00