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
..
arch	Update copyright headers	2015-02-11 06:49:51 +00:00
common	Replace MAC OS X with OS X	2015-06-30 07:33:31 +00:00
mac/corewlan	Fixed license headers	2015-02-17 18:46:09 +00:00
qpa	Add QMAKE_LIBDIR_EGL only if it exists	2015-05-28 07:18:22 +00:00
unix	Haiku: Enable FreeType2/FontConfig support	2015-05-04 14:52:00 +00:00
x11	Update copyright headers	2015-02-11 06:49:51 +00:00
.gitignore	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
.qmake.conf	Handle INCLUDE and LIB environment variables in config.tests for MinGW	2013-11-22 07:30:57 +01:00