whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
qt6-bb10/tests/auto/gui
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
..
image Merge remote-tracking branch 'origin/5.15' into dev 2020-02-26 18:39:21 +01:00
itemmodels Merge remote-tracking branch 'origin/dev' into merge-dev 2020-01-24 13:17:33 +01:00
kernel CMake: Fix tst_qguiapplication test 2020-02-25 16:47:08 +01:00
math3d Merge remote-tracking branch 'origin/dev' into wip/cmake 2020-01-29 16:57:27 +01:00
painting Merge remote-tracking branch 'origin/5.15' into dev 2020-02-13 18:31:40 +01:00
qopengl Move QOpenGLBuffer from QtGui to QtOpenGL 2020-02-22 02:08:26 +01:00
qopenglconfig Regenerate projects one last time before merge 2020-02-12 17:30:49 +00:00
qvulkan Regenerate projects one last time before merge 2020-02-12 17:30:49 +00:00
rhi Merge remote-tracking branch 'origin/5.15' into dev 2020-02-26 18:39:21 +01:00
text Merge remote-tracking branch 'origin/5.15' into dev 2020-02-26 18:39:21 +01:00
util Merge remote-tracking branch 'origin/5.15' into dev 2020-02-26 18:39:21 +01:00
.prev_CMakeLists.txt Regenerate some of the test projects that do SUBDIRS += foo 2019-08-07 11:55:38 +00:00
CMakeLists.txt cmake: add tests/auto/gui/text 2019-11-01 13:28:59 +00:00
gui.pro Introduce the Qt graphics abstraction as private QtGui helpers 2019-06-13 10:13:45 +02:00