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
..
bundle-spaces	remove nonsense DEFINES	2013-07-03 21:38:37 +02:00
duplicateLibraryEntries	remove nonsense DEFINES	2013-07-03 21:38:37 +02:00
export_across_file_boundaries	de-noise test	2015-02-04 16:33:51 +00:00
findDeps	Update copyright headers	2015-02-11 06:49:51 +00:00
findMocs	Update copyright headers	2015-02-11 06:49:51 +00:00
include_dir	Update copyright headers	2015-02-11 06:49:51 +00:00
include_dir_build	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
include_pwd	Fix semantics of the src dir in the include search paths with MinGW	2012-09-10 14:09:45 +02:00
install_depends	Update copyright headers	2015-02-11 06:49:51 +00:00
one_space	Update copyright headers	2015-02-11 06:49:51 +00:00
pro_file_cache	Fix qmake's pro file cache to interact correctly with write_file	2012-10-25 16:22:00 +02:00
project	Update copyright headers	2015-02-11 06:49:51 +00:00
prompt	remove nonsense DEFINES	2013-07-03 21:38:37 +02:00
quotedfilenames	more autotests for spaces, destdirs and library linking	2015-02-17 18:27:40 +00:00
resources	Allow RESOURCES to contain standalone files and collections of files	2015-05-18 15:49:56 +00:00
shadow_files	Update copyright headers	2015-02-11 06:49:51 +00:00
shadow_files_build	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
simple_app	more autotests for spaces, destdirs and library linking	2015-02-17 18:27:40 +00:00
simple_app_build	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
simple_dll	more autotests for spaces, destdirs and library linking	2015-02-17 18:27:40 +00:00
simple_lib	more autotests for spaces, destdirs and library linking	2015-02-17 18:27:40 +00:00
subdir_via_pro_file_extra_target	Update copyright headers	2015-02-11 06:49:51 +00:00
subdirs	more autotests for spaces, destdirs and library linking	2015-02-17 18:27:40 +00:00
substitutes	remove nonsense DEFINES	2013-07-03 21:38:37 +02:00
substitutes_build	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00