whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
qt6-bb10/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark
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
..
resources Benchmark: move widgets benchmarks still in gui subdirectory to widgets 2018-03-27 16:50:44 +00:00
widgets Merge remote-tracking branch 'origin/5.15' into dev 2020-04-22 15:28:01 +02:00
CMakeLists.txt CMake: Regenerate tests projects 2020-03-12 11:41:39 +01:00
GraphicsViewBenchmark.pro Fix build errors for GraphicsViewBenchmark 2020-02-28 12:03:48 +01:00
GraphicsViewBenchmark.qrc Benchmark: move widgets benchmarks still in gui subdirectory to widgets 2018-03-27 16:50:44 +00:00
main.cpp Fix build errors for GraphicsViewBenchmark 2020-02-28 12:03:48 +01:00