AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
75c0ffaf6d
qt5base-lts/tests/auto/widgets/kernel
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
..
qaction Regenerate projects one last time before merge 2020-02-12 17:30:49 +00:00
qactiongroup Merge remote-tracking branch 'origin/dev' into wip/cmake 2019-11-19 13:53:21 +01:00
qapplication Regenerate projects one last time before merge 2020-02-12 17:30:49 +00:00
qboxlayout Regenerate projects one last time before merge 2020-02-12 17:30:49 +00:00
qdesktopwidget cmake: add widgets/kernel tests 2019-10-31 09:49:03 +00:00
qformlayout Regenerate projects one last time before merge 2020-02-12 17:30:49 +00:00
qgesturerecognizer Regenerate projects one last time before merge 2020-02-12 17:30:49 +00:00
qgridlayout Regenerate projects one last time before merge 2020-02-12 17:30:49 +00:00
qlayout Regenerate projects one last time before merge 2020-02-12 17:30:49 +00:00
qshortcut Merge remote-tracking branch 'origin/dev' into merge-dev 2020-01-24 13:17:33 +01:00
qsizepolicy Regenerate projects one last time before merge 2020-02-12 17:30:49 +00:00
qstackedlayout Merge remote-tracking branch 'origin/dev' into wip/cmake 2019-11-19 13:53:21 +01:00
qtooltip Merge remote-tracking branch 'origin/dev' into wip/cmake 2019-11-19 13:53:21 +01:00
qwidget Merge remote-tracking branch 'origin/5.15' into dev 2020-02-26 18:39:21 +01:00
qwidget_window Merge remote-tracking branch 'origin/5.15' into dev 2020-02-26 18:39:21 +01:00
qwidgetaction Regenerate projects one last time before merge 2020-02-12 17:30:49 +00:00
qwidgetmetatype cmake: add widgets/kernel tests 2019-10-31 09:49:03 +00:00
qwidgetsvariant cmake: add widgets/kernel tests 2019-10-31 09:49:03 +00:00
qwindowcontainer Merge remote-tracking branch 'origin/dev' into wip/cmake 2019-11-19 13:53:21 +01:00
CMakeLists.txt cmake: add widgets/kernel tests 2019-10-31 09:49:03 +00:00
kernel.pro Fix inversed qmake logic for widget action tests 2020-02-20 09:05:28 +01:00