Frederik Gladhorn 5c23199d4e Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: configure mkspecs/macx-xcode/Info.plist.app mkspecs/macx-xcode/Info.plist.lib qmake/doc/qmake.qdocconf src/corelib/global/qglobal.h tests/auto/other/exceptionsafety/exceptionsafety.pro tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp Change-Id: I3c769a4a82dc2e99a12c69123fbf17613fd2ac2a		2013-08-14 09:06:31 +02:00
..
access	Merge remote-tracking branch 'origin/stable' into dev	2013-08-14 09:06:31 +02:00
bearer	Whitespace cleanup: remove trailing whitespace	2013-03-16 20:22:50 +01:00
kernel	Further followup to Q_OS_MACX changes.	2013-06-24 15:49:31 +02:00
socket	Include sockLib header to enable usage of socket functions on VxWorks	2013-08-06 11:00:23 +02:00
ssl	test: Skip some more qsslsocket flaky tests	2013-08-13 17:08:13 +02:00
network.pro	Re-enable network tests on Mac OS.	2012-04-24 16:06:28 +02:00