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
..
configure_pch.h	Update copyright headers	2015-02-11 06:49:51 +00:00
configure.pro	Merge remote-tracking branch 'origin/5.5' into dev	2015-06-03 10:23:56 +02:00
configureapp.cpp	configure: Show only LGPLv3 for WinRT & WinCE	2015-06-01 06:30:13 +00:00
configureapp.h	adjust configure's path output to relative paths	2015-03-06 19:08:37 +00:00
environment.cpp	remove $INCLUDE/$LIB hack for mingw	2015-05-12 09:10:18 +00:00
environment.h	Add mingw GCC Version to qconfig.pri	2015-03-25 11:13:19 +00:00
main.cpp	Update copyright headers	2015-02-11 06:49:51 +00:00
Makefile.mingw	Merge remote-tracking branch 'origin/5.5' into dev	2015-06-03 10:23:56 +02:00
Makefile.win32	Merge remote-tracking branch 'origin/5.5' into dev	2015-06-03 10:23:56 +02:00
tools.cpp	Run license checker in qmake	2015-05-27 10:23:10 +00:00
tools.h	Update copyright headers	2015-02-11 06:49:51 +00:00