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
..
testdata	Merge remote-tracking branch 'origin/5.5' into dev	2015-06-03 10:23:56 +02:00
.gitignore	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
qmake.pro	Allow RESOURCES to contain standalone files and collections of files	2015-05-18 15:49:56 +00:00
testcompiler.cpp	Update copyright headers	2015-02-11 06:49:51 +00:00
testcompiler.h	Update copyright headers	2015-02-11 06:49:51 +00:00
tst_qmake.cpp	Merge remote-tracking branch 'origin/5.5' into dev	2015-06-03 10:23:56 +02:00