Lars Knoll 96232be146 Merge remote-tracking branch 'origin/api_changes' ... Conflicts: dist/changes-5.0.0 mkspecs/features/qt_module_config.prf qmake/project.cpp qmake/property.cpp Change-Id: I6e4af40743a9aeff8ed18533a48036e332acc296		2012-03-04 21:45:05 +01:00
..
stressTest	Remove "All rights reserved" line from license headers.	2012-01-30 03:54:59 +01:00
test	Remove QtWidgets dependency from QTcpSocket autotest	2011-12-09 12:25:14 +01:00
.gitignore	Moved network autotests into new directory structure	2011-09-09 09:32:17 +02:00
qtcpsocket.pro	Flag test as expected failure for Ubuntu 11.10 x64.	2012-01-12 06:25:25 +01:00
tst_qtcpsocket.cpp	Merge remote-tracking branch 'origin/api_changes'	2012-03-04 21:45:05 +01:00