qt5base-lts/tests/benchmarks/network/access
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
..
qfile_vs_qnetworkaccessmanager Merge remote-tracking branch 'origin/5.15' into dev 2020-04-22 15:28:01 +02:00
qnetworkdiskcache Convert remaining tests/benchmarks 2019-11-04 15:48:51 +00:00
qnetworkreply Merge remote-tracking branch 'origin/5.15' into dev 2020-04-22 15:28:01 +02:00
qnetworkreply_from_cache Convert remaining tests/benchmarks 2019-11-04 15:48:51 +00:00
access.pro
CMakeLists.txt Convert remaining tests/benchmarks 2019-11-04 15:48:51 +00:00