Liang Qi ce9519593a Merge remote-tracking branch 'origin/5.4' into 5.5 ... Conflicts: mkspecs/android-g++/qmake.conf qmake/generators/unix/unixmake2.cpp src/gui/image/qimage_conversions.cpp Change-Id: Ib76264b8c2d29a0228438ec02bd97d4b97545be0		2015-03-31 10:03:31 +02:00
..
qauthenticator	Update copyright headers	2015-02-11 06:49:51 +00:00
qdnslookup	Merge remote-tracking branch 'origin/5.4' into 5.5	2015-03-31 10:03:31 +02:00
qdnslookup_appless	Merge remote-tracking branch 'origin/5.4' into 5.5	2015-03-02 09:23:07 +01:00
qhostaddress	Add a QHostAddress::toIPv4Address overload taking a bool *ok	2015-03-06 07:53:59 +00:00
qhostinfo	Merge remote-tracking branch 'origin/5.4' into 5.5	2015-03-02 09:23:07 +01:00
qnetworkaddressentry	Update copyright headers	2015-02-11 06:49:51 +00:00
qnetworkinterface	Update copyright headers	2015-02-11 06:49:51 +00:00
qnetworkproxy	Update copyright headers	2015-02-11 06:49:51 +00:00
qnetworkproxyfactory	Update copyright headers	2015-02-11 06:49:51 +00:00
kernel.pro	Disable tst_qhostinfo on OS X.	2014-10-10 13:15:43 +02:00