whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
qt6-bb10/tests/auto/corelib/thread/qthreadstorage
History
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
..
crashonexit Remove QT_DISABLE_DEPRECATED_BEFORE=0 from tests not using deprecated API. 2015-09-01 16:57:46 +00:00
test Merge remote-tracking branch 'origin/5.6' into dev 2015-12-18 08:37:31 +01:00
.gitignore Moving relevant tests to corelib/thread 2011-09-01 12:54:58 +02:00
qthreadstorage.pro Merge remote-tracking branch 'origin/5.6' into dev 2015-12-18 08:37:31 +01:00
tst_qthreadstorage.cpp Fix tst_qthreadstorage 2015-09-24 07:34:06 +00:00