Gabriel de Dietrich 8ab25620d3 Merge remote-tracking branch 'origin/5.3' into 5.4 ... Conflicts: src/network/socket/qnativesocketengine_unix.cpp src/widgets/kernel/qwidget_qpa.cpp Change-Id: I6f1aa320d5ca66cd92d601a95885aeaab0abb191		2014-09-29 13:38:11 +02:00
..
qnetworkaccessmanager.pro	QtNetwork tests: Remove DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0	2014-02-25 16:47:13 +01:00
tst_qnetworkaccessmanager.cpp	Merge remote-tracking branch 'origin/5.3' into 5.4	2014-09-29 13:38:11 +02:00