Frederik Gladhorn 34b14a8472 Merge remote-tracking branch 'origin/5.4' into 5.5 ... Conflicts: examples/xml/htmlinfo/simpleexample.html examples/xml/rsslisting/rsslisting.cpp qmake/generators/win32/msbuild_objectmodel.cpp src/3rdparty/harfbuzz-ng/src/hb-private.hh src/corelib/global/qlogging.cpp src/corelib/io/qstorageinfo_unix.cpp src/corelib/thread/qwaitcondition_unix.cpp src/gui/kernel/qguiapplication.cpp src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp src/testlib/doc/src/qt-webpages.qdoc tests/auto/other/qaccessibility/tst_qaccessibility.cpp Change-Id: Ib272ff0bc30a1a5d51275eb3cd2f201dc82c11ff		2015-02-24 21:02:08 +01:00
..
access	QUrl effective TLDs: update table	2015-02-13 07:28:17 +00:00
bearer	Update copyright headers	2015-02-11 06:49:51 +00:00
kernel	Update copyright headers	2015-02-11 06:49:51 +00:00
socket	Merge remote-tracking branch 'origin/5.4' into 5.5	2015-02-24 21:02:08 +01:00
ssl	QSslSocket test - adapt 'verifyClientCertificate' for Secure Transport	2015-02-13 20:43:09 +00:00
network.pro	Re-enable network tests on Mac OS.	2012-04-24 16:06:28 +02:00