Liang Qi f82e508516 Merge remote-tracking branch 'origin/5.11' into dev ... Conflicts: mkspecs/features/qt_common.prf src/corelib/tools/qstring.cpp src/plugins/platforms/windows/qwindowsmousehandler.cpp src/widgets/widgets/qmainwindowlayout_p.h Change-Id: I5df613008f6336f69b257d08e49a133d033a9d65		2018-05-24 16:29:14 +02:00
..
resources
.gitignore
qfiledialog.pro	Don't mark tst_QFiledialog as insignificant_test	2018-04-12 12:21:55 +00:00
tst_qfiledialog.cpp	Merge remote-tracking branch 'origin/5.11' into dev	2018-05-24 16:29:14 +02:00