AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
a4eea312ed
qt5base-lts/tests/benchmarks/network/access/qnetworkreply
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
..
CMakeLists.txt Regenerate projects one last time before merge 2020-02-12 17:30:49 +00:00
qnetworkreply.pro Remove QT_DISABLE_DEPRECATED_BEFORE=0 from tests not using deprecated API. 2015-09-01 16:57:46 +00:00
tst_qnetworkreply.cpp Merge remote-tracking branch 'origin/5.15' into dev 2020-04-22 15:28:01 +02:00