Allan Sandfeld Jensen 1fce111809 Merge remote-tracking branch 'origin/5.4' into merge5.5 ... Conflicts: src/corelib/global/qglobal.h src/corelib/io/qnoncontiguousbytedevice_p.h src/gui/image/qjpeghandler.cpp src/network/access/qhttpthreaddelegate_p.h tests/auto/corelib/io/qlockfile/tst_qlockfile.cpp tests/auto/widgets/widgets/qmenubar/BLACKLIST Change-Id: I01de8c1c28efcedfd7953d05025f54802dc08ab3		2015-05-08 13:26:44 +02:00
..
moc	Merge remote-tracking branch 'origin/5.4' into merge5.5	2015-05-08 13:26:44 +02:00
qdbuscpp2xml	Update copyright headers	2015-02-11 06:49:51 +00:00
qdbusxml2cpp	Update copyright headers	2015-02-11 06:49:51 +00:00
qmake	more autotests for spaces, destdirs and library linking	2015-02-17 18:27:40 +00:00
qmakelib	add autotest for qmake parser	2015-02-25 13:55:12 +00:00
rcc	Update copyright headers	2015-02-11 06:49:51 +00:00
uic	uic: Delay the setting of QPushButton::default.	2015-04-23 09:59:51 +00:00
tools.pro	add test for the qmake library	2015-02-25 13:54:33 +00:00