whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
qt6-bb10/tests/auto/tools
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
..
moc Merge remote-tracking branch 'origin/5.15' into dev 2020-02-26 18:39:21 +01:00
qdbuscpp2xml Regenerate tests/auto/tools 2019-11-12 17:25:41 +00:00
qdbusxml2cpp Regenerate tests/auto/tools 2019-11-12 17:25:41 +00:00
qmake Regenerate Tests 2020-01-16 08:16:17 +00:00
qmakelib Regenerate tests/auto/tools 2019-11-12 17:25:41 +00:00
rcc rcc: Add -d option to output a Makefile-syntax depfile 2019-06-29 02:26:23 +02:00
uic Merge remote-tracking branch 'origin/5.15' into dev 2020-02-13 18:31:40 +01:00
CMakeLists.txt Fix for getting windows running tests 2019-09-17 17:11:59 +00:00
tools.pro add test for the qmake library 2015-02-25 13:54:33 +00:00