qt5base-lts/tests/auto/network
Edward Welbourne f6fc34294f Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
	configure
5.7 now supports clang on android; but dev re-worked configure

	src/gui/kernel/qevent.h
One side renamed a parameter of a constructor; the other added an
alternate constructor on the next line.  Applied the rename to both
for consistency.

	tests/auto/tools/moc/tst_moc.cpp
Each side added a new test at the end.

	.qmake.conf
Ignored 5.7's change to MODULE_VERSION.

	configure.json
No conflict noticed by git; but changes in 5.7 were needed for the
re-worked configure to accommodate 5.7's stricter handling of C++11.

Change-Id: I9cda53836a32d7bf83828212c7ea00b1de3e09d2
2016-08-01 18:20:00 +02:00
..
access Merge remote-tracking branch 'origin/5.7' into dev 2016-07-19 20:14:40 +02:00
bearer Updated license headers 2016-01-21 18:55:18 +00:00
kernel Long live QNetworkDatagram! 2016-06-20 16:11:35 +00:00
socket Merge remote-tracking branch 'origin/5.7' into dev 2016-08-01 18:20:00 +02:00
ssl Store QSslKey in specific key format to provide more details for key 2016-07-28 14:32:05 +00:00
network.pro Re-enable network tests on Mac OS. 2012-04-24 16:06:28 +02:00