qt6-bb10/tests/auto/corelib/codecs/qtextcodec
Liang Qi 158a3a4159 Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
	src/corelib/io/qiodevice_p.h
	src/corelib/kernel/qvariant_p.h
	src/corelib/tools/qsimd.cpp
	src/gui/kernel/qguiapplication.cpp
	tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp

Change-Id: I742a093cbb231b282b43e463ec67173e0d29f57a
2016-01-21 08:17:21 +01:00
..
echo Remove QT_DISABLE_DEPRECATED_BEFORE=0 from tests not using deprecated API. 2015-09-01 16:57:46 +00:00
test Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
.gitattributes Moving relevant tests to corelib/codecs 2011-08-26 08:49:59 +02:00
.gitignore Moving relevant tests to corelib/codecs 2011-08-26 08:49:59 +02:00
QT4-crashtest.txt Moving relevant tests to corelib/codecs 2011-08-26 08:49:59 +02:00
korean.txt Moving relevant tests to corelib/codecs 2011-08-26 08:49:59 +02:00
qtextcodec.pro fix usage of wince scope 2015-06-05 10:29:10 +00:00
tst_qtextcodec.cpp Merge remote-tracking branch 'origin/5.6' into dev 2016-01-21 08:17:21 +01:00
utf8.txt Moving relevant tests to corelib/codecs 2011-08-26 08:49:59 +02:00