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
..
.gitignore	Moved tests into integrationtests/ and widgets/	2011-10-20 19:45:41 +02:00
CMakeLists.txt	Regenerate projects one last time before merge	2020-02-12 17:30:49 +00:00
qfontdialog.pro	Link to AppKit instead of Cocoa.	2015-09-05 11:49:17 +00:00
testfonts.qrc	QStyleSheetStyle: Don't interfere with QFontDialog	2014-10-24 16:59:26 +02:00
tst_qfontdialog_mac_helpers.mm	macOS: Remove a bunch of dead (forward) declarations	2020-04-15 17:33:06 +02:00
tst_qfontdialog.cpp	Merge remote-tracking branch 'origin/5.14' into 5.15	2019-11-08 09:11:02 +01:00