whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
qt6-bb10/tests/benchmarks/corelib
History
Qt Forward Merge Bot efd7757154 Merge remote-tracking branch 'origin/5.15' into dev 
Conflicts:
	src/widgets/widgets/qabstractbutton.cpp
	src/widgets/widgets/qbuttongroup.cpp
	src/widgets/widgets/qbuttongroup.h
	src/widgets/widgets/qsplashscreen.cpp
	tests/auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp
        tests/benchmarks/opengl/main.cpp

  Needed update:
	src/plugins/platforms/cocoa/CMakeLists.txt

Change-Id: I7be4baebb63844ec2b3e0de859ca9de1bc730bb5
 		2020-04-22 15:28:01 +02:00
..
codecs Merge remote-tracking branch 'origin/5.15' into dev 2020-04-08 20:11:39 +02:00
io Merge remote-tracking branch 'origin/5.15' into dev 2020-04-22 15:28:01 +02:00
json Merge remote-tracking branch 'origin/5.15' into dev 2020-04-08 20:11:39 +02:00
kernel Merge remote-tracking branch 'origin/5.15' into dev 2020-04-08 20:11:39 +02:00
mimetypes Merge remote-tracking branch 'origin/5.15' into dev 2020-04-08 20:11:39 +02:00
plugin Merge remote-tracking branch 'origin/5.15' into dev 2020-04-08 20:11:39 +02:00
text Merge remote-tracking branch 'origin/5.15' into dev 2020-04-08 20:11:39 +02:00
thread Merge remote-tracking branch 'origin/5.15' into dev 2020-04-08 20:11:39 +02:00
time Merge remote-tracking branch 'origin/5.15' into dev 2020-04-08 20:11:39 +02:00
tools Merge remote-tracking branch 'origin/5.15' into dev 2020-04-08 20:11:39 +02:00
CMakeLists.txt Convert remaining tests/benchmarks 2019-11-04 15:48:51 +00:00
corelib.pro Move text-related code out of corelib/tools/ to corelib/text/ 2019-07-10 17:05:30 +02:00