Liang Qi 0aa2d318b1 Merge remote-tracking branch 'origin/5.5' into dev ... Conflicts: src/corelib/global/qglobal.cpp src/corelib/global/qglobal.h src/corelib/global/qsysinfo.h src/corelib/global/qsystemdetection.h src/corelib/kernel/qobjectdefs.h src/plugins/plugins.pro tests/auto/widgets/itemviews/qlistview/qlistview.pro Change-Id: Ib55aa79d707c4c1453fb9d697f6cf92211ed665c		2015-07-01 11:05:26 +02:00
..
highlighter.cpp	Updated BSD licensed file headers	2015-02-15 07:41:17 +00:00
highlighter.h	Updated BSD licensed file headers	2015-02-15 07:41:17 +00:00
main.cpp	Updated BSD licensed file headers	2015-02-15 07:41:17 +00:00
mainwindow.cpp	Updated BSD licensed file headers	2015-02-15 07:41:17 +00:00
mainwindow.h	Updated BSD licensed file headers	2015-02-15 07:41:17 +00:00
syntaxhighlighter.pro	Merge remote-tracking branch 'origin/5.5' into dev	2015-07-01 11:05:26 +02:00