whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
qt6-bb10/tests/auto/corelib
History
Qt Forward Merge Bot 75c0ffaf6d Merge remote-tracking branch 'origin/5.15' into dev 
Conflicts:
	examples/network/bearermonitor/CMakeLists.txt
	examples/network/CMakeLists.txt
	src/corelib/tools/qlinkedlist.h
	src/sql/kernel/qsqldriver_p.h
	src/sql/kernel/qsqlresult_p.h
	src/widgets/kernel/qwidget.cpp
	src/widgets/kernel/qwidget_p.h
	tests/auto/network/socket/platformsocketengine/tst_platformsocketengine.cpp
	tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
	tests/auto/tools/moc/allmocs_baseline_in.json

Change-Id: I21a3c34570ae79ea9d30107fae71759d7eac17d9
 		2020-02-26 18:39:21 +01:00
..
animation Regenerate projects one last time before merge 2020-02-12 17:30:49 +00:00
codecs Regenerate tests/auto/corelib/codecs 2019-11-12 17:26:41 +00:00
global Remove QLinkedList 2020-02-19 21:01:07 +01:00
io Add QDebug::toString() 2020-02-22 14:16:59 +01:00
itemmodels Merge remote-tracking branch 'origin/dev' into merge-dev 2020-01-24 13:17:33 +01:00
kernel MetaObject: store the QMetaType of the properties 2020-02-25 15:43:15 +01:00
mimetypes Regenerate projects one last time before merge 2020-02-12 17:30:49 +00:00
plugin CMake: Fix tst_plugin 2020-02-20 15:11:01 +00:00
serialization Remove QLinkedList 2020-02-19 21:01:07 +01:00
statemachine Merge remote-tracking branch 'origin/5.15' into dev 2020-02-13 18:31:40 +01:00
text Merge remote-tracking branch 'origin/5.15' into dev 2020-02-26 18:39:21 +01:00
thread Merge remote-tracking branch 'origin/wip/cmake' into dev 2020-02-13 23:29:51 +01:00
time Merge remote-tracking branch 'origin/wip/cmake' into dev 2020-02-13 23:29:51 +01:00
tools Remove QLinkedList 2020-02-19 21:01:07 +01:00
.prev_CMakeLists.txt Merge branch 'wip/qt6' into wip/cmake 2019-08-15 16:53:19 +02:00
CMakeLists.txt Convert corelib plugin tests 2019-10-21 11:17:20 +00:00
corelib.pro Move text-related code out of corelib/tools/ to corelib/text/ 2019-07-10 17:05:30 +02:00