whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
qt6-bb10/tests/auto
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
..
bic/data Add binary compatibility files for qtbase 5.14 branch 2019-12-20 10:41:11 +02:00
cmake CMake: Add support for auto-importing plugins in CMake 2019-08-12 18:23:58 +02:00
concurrent Remove QLinkedList 2020-02-19 21:01:07 +01:00
corelib Merge remote-tracking branch 'origin/5.15' into dev 2020-02-26 18:39:21 +01:00
dbus New QMetaType representation 2020-02-20 16:11:02 +01:00
gui Merge remote-tracking branch 'origin/5.15' into dev 2020-02-26 18:39:21 +01:00
guiapplauncher Fix path to examples part of tst_GuiAppLauncher 2015-02-13 07:28:15 +00:00
installed_cmake
…
network Merge remote-tracking branch 'origin/5.15' into dev 2020-02-26 18:39:21 +01:00
opengl Post Merge Fixes 2020-01-24 12:29:18 +00:00
other Regenerate projects one last time before merge 2020-02-12 17:30:49 +00:00
printsupport Regenerate projects one last time before merge 2020-02-12 17:30:49 +00:00
shared QWindowsFontDatabase: Check preferred family names for all fonts 2019-11-29 09:31:21 +01:00
sql Merge "Merge remote-tracking branch 'origin/wip/cmake' into dev" 2020-02-14 14:55:04 +01:00
testlib Normalize types at compile time 2020-02-20 16:11:02 +01:00
tools Merge remote-tracking branch 'origin/5.15' into dev 2020-02-26 18:39:21 +01:00
widgets Merge remote-tracking branch 'origin/5.15' into dev 2020-02-26 18:39:21 +01:00
xml Merge remote-tracking branch 'origin/dev' into merge-dev 2020-01-24 13:17:33 +01:00
CMakeLists.txt Relax rules about not having dbus session 2020-01-27 13:09:40 +00:00
auto.pro Disable tests with qemu-arm & developer-build configurations in the CI 2019-10-03 15:12:33 +00:00
network-settings.h Merge remote-tracking branch 'origin/5.14' into 5.15 2020-02-18 09:26:53 +01:00