qt5base-lts/tests/auto/other/compiler
Liang Qi 57057f76ad Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
	.qmake.conf
	config.tests/unix/nis/nis.cpp
	mkspecs/unsupported/freebsd-g++/qplatformdefs.h
	src/corelib/tools/qdatetime.cpp
	src/corelib/tools/qsimd.cpp
	src/corelib/tools/qsimd_p.h
	src/network/access/access.pri
	src/network/access/qnetworkreplynsurlconnectionimpl.mm
	src/network/access/qnetworkreplynsurlconnectionimpl_p.h
	src/plugins/platforms/cocoa/qnsview.mm
	src/plugins/printsupport/windows/qwindowsprintdevice.cpp
	tests/auto/corelib/kernel/qobject/tst_qobject.cpp
	tests/auto/network/access/qnetworkreply/BLACKLIST
	tests/auto/widgets/widgets/qopenglwidget/BLACKLIST

Change-Id: I4b32055bbf922392ef0264fd403405416fffee57
2016-06-06 09:04:55 +02:00
..
.gitignore Moved autotests in category 'other' into new directory structure 2011-09-09 09:36:41 +02:00
baseclass.cpp Updated license headers 2016-01-21 18:55:18 +00:00
baseclass.h Updated license headers 2016-01-21 18:55:18 +00:00
compiler.pro Merge remote-tracking branch 'origin/5.6' into dev 2015-12-02 23:33:06 +01:00
derivedclass.cpp Updated license headers 2016-01-21 18:55:18 +00:00
derivedclass.h Updated license headers 2016-01-21 18:55:18 +00:00
othersource.cpp Updated license headers 2016-01-21 18:55:18 +00:00
tst_compiler.cpp Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-06 09:04:55 +02:00