Liang Qi beb65dcd79 Merge remote-tracking branch 'origin/5.6' into dev ... Conflicts: src/gui/painting/painting.pri src/plugins/platforms/xcb/qxcbconnection.cpp tests/auto/corelib/thread/qthreadstorage/qthreadstorage.pro tests/auto/corelib/tools/qlocale/test/test.pro tests/auto/gui/kernel/qwindow/tst_qwindow.cpp tools/configure/environment.cpp Change-Id: I9c40f458b89b2c206de2d2c24e90b5f679c93495		2015-12-18 08:37:31 +01:00
..
.gitignore	Moving relevant tests to corelib/tools	2011-09-01 13:07:23 +02:00
double_data.h	Update copyright headers	2015-02-11 06:49:51 +00:00
qstring.pro	Replace qdtoa and qstrtod implementation by a 3rdparty library	2015-11-02 17:00:50 +00:00
tst_qstring_mac.mm	Add shared implementation of a NSAutoreleasePool wrapper to qglobal	2015-05-27 18:45:29 +00:00
tst_qstring.cpp	Merge remote-tracking branch 'origin/5.6' into dev	2015-12-18 08:37:31 +01:00