AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5237b97f26
qt5base-lts/tests/auto/network/socket/qudpsocket
History
Frederik Gladhorn 77da617dc8 Merge remote-tracking branch 'origin/5.5' into dev 
Conflicts:
	doc/global/qt-cpp-defines.qdocconf
	src/3rdparty/forkfd/forkfd.c
	src/corelib/codecs/qtextcodec.cpp
	src/corelib/kernel/qmetatype.cpp
	src/corelib/tools/qset.qdoc
	src/gui/accessible/qaccessible.cpp
	src/gui/image/qpixmapcache.cpp
	src/opengl/qgl.cpp
	src/tools/qdoc/generator.cpp
	src/widgets/kernel/qwidget.cpp
	tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp

Change-Id: I4fbe1fa756a54c6843aa75f4ef70a1069ba7b085
2015-08-06 10:54:01 +02:00
..
clientserver Update copyright headers 2015-02-11 06:49:51 +00:00
test QtNetwork tests: Remove DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 2014-02-25 16:47:13 +01:00
udpServer Update copyright headers 2015-02-11 06:49:51 +00:00
.gitignore Moved network autotests into new directory structure 2011-09-09 09:32:17 +02:00
qudpsocket.pro Moved network autotests into new directory structure 2011-09-09 09:32:17 +02:00
tst_qudpsocket.cpp Merge remote-tracking branch 'origin/5.5' into dev 2015-08-06 10:54:01 +02:00