qt6-bb10/tests/auto/corelib
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
..
animation qevent.h: Add fixme comments to remove include directives for Qt 6. 2015-10-02 06:37:03 +00:00
codecs Tests: Fix single-character string literals. 2015-10-13 18:14:27 +00:00
global Merge remote-tracking branch 'origin/5.6' into dev 2015-12-18 08:37:31 +01:00
io Merge remote-tracking branch 'origin/5.6' into dev 2015-12-18 08:37:31 +01:00
itemmodels Merge remote-tracking branch 'origin/5.6' into dev 2015-12-02 23:33:06 +01:00
json Sanitize JSON test data 2015-12-16 08:54:57 +00:00
kernel Merge remote-tracking branch 'origin/5.6' into dev 2015-12-18 08:37:31 +01:00
mimetypes Merge remote-tracking branch 'origin/5.6' into dev 2015-10-14 15:45:35 +02:00
plugin Merge "Merge remote-tracking branch 'origin/5.6' into dev" into refs/staging/dev 2015-11-05 08:27:56 +00:00
statemachine Add PointerToMemberFunction for ctor of QSignalTransition 2015-12-08 17:07:04 +00:00
thread Merge remote-tracking branch 'origin/5.6' into dev 2015-12-18 08:37:31 +01:00
tools Merge remote-tracking branch 'origin/5.6' into dev 2015-12-18 08:37:31 +01:00
xml tests/auto/corelib: Remove some placeholder formatting. 2015-10-22 03:54:29 +00:00
corelib.pro