Liang Qi b894a8def5 Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: mkspecs/features/qml_module.prf mkspecs/features/qt_common.prf src/gui/text/qzip.cpp src/plugins/platforms/cocoa/qnsview.mm src/plugins/platforms/windows/array.h src/testlib/qtestcase.cpp src/widgets/dialogs/qfilesystemmodel.h Change-Id: Ie41c5868415b81f7693c80e045497035504bb210		2016-04-29 17:55:20 +02:00
..
.gitignore
baseclass.cpp	Updated license headers	2016-01-21 18:55:18 +00:00
baseclass.h	Updated license headers	2016-01-21 18:55:18 +00:00
compiler.pro	Merge remote-tracking branch 'origin/5.6' into dev	2015-12-02 23:33:06 +01:00
derivedclass.cpp	Updated license headers	2016-01-21 18:55:18 +00:00
derivedclass.h	Updated license headers	2016-01-21 18:55:18 +00:00
othersource.cpp	Updated license headers	2016-01-21 18:55:18 +00:00
tst_compiler.cpp	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-04-29 17:55:20 +02:00