qt5base-lts/tests/auto/other/networkselftest
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
..
networkselftest.pro Introduce qt_subtract_from_timeout to reduce code duplication. 2015-03-09 17:11:54 +00:00
tst_networkselftest.cpp Merge remote-tracking branch 'origin/5.4' into 5.5 2015-03-31 10:03:31 +02:00