Liang Qi 17198e03ab Merge remote-tracking branch 'origin/5.7' into dev ... Conflicts: qmake/doc/src/qmake-manual.qdoc src/corelib/global/qglobal.cpp src/corelib/tools/qstring.cpp src/network/socket/qabstractsocket.cpp src/network/socket/qnativesocketengine_unix.cpp src/plugins/platforms/eglfs/api/qeglfsglobal.h Change-Id: Id5dfdbd30fa996f9b4b66a0b030b7d3b8c0ef288		2016-08-16 07:58:32 +02:00
..
.gitignore	Moving relevant tests to corelib/tools	2011-09-01 13:07:23 +02:00
double_data.h	Updated license headers	2016-01-21 18:55:18 +00:00
qstring.pro	Replace qdtoa and qstrtod implementation by a 3rdparty library	2015-11-02 17:00:50 +00:00
tst_qstring.cpp	Merge remote-tracking branch 'origin/5.7' into dev	2016-08-16 07:58:32 +02:00
tst_qstring_mac.mm	Updated license headers	2016-01-21 18:55:18 +00:00