Simon Hausmann e2f66f9215 Merge remote-tracking branch 'origin/5.5' into dev ... Conflicts: src/corelib/global/qnamespace.qdoc src/corelib/io/qwindowspipereader.cpp src/corelib/io/qwindowspipereader_p.h src/corelib/statemachine/qstatemachine.cpp src/corelib/statemachine/qstatemachine_p.h src/plugins/platforms/xcb/qxcbconnection.h tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp tests/auto/tools/qmake/tst_qmake.cpp tests/manual/touch/main.cpp Change-Id: I917d694890e79ee3da7d65134b5b085e23e0dd62		2015-06-03 10:23:56 +02:00
..
arch	Update copyright headers	2015-02-11 06:49:51 +00:00
common	Update copyright headers	2015-02-11 06:49:51 +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