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
..
qmake.conf	Require -fPIC instead of just -fPIE for -reduce-relocations	2015-05-07 19:42:43 +00:00
qplatformdefs.h	Update copyright headers	2015-02-11 06:49:51 +00:00