New upstream version 25.0.8+dfsg1

This commit is contained in:
Sebastian Ramacher 2020-05-27 22:57:19 +02:00
parent 8b2e5f2130
commit 8e020cdacb
115 changed files with 1767 additions and 10949 deletions

View file

@ -1694,7 +1694,7 @@ bool WidgetInfo::ColorChanged(const char *setting)
* other open QDialogs on exit, and
* https://bugreports.qt-project.org/browse/QTBUG-34532
*/
#ifdef __APPLE__
#ifndef _WIN32
options |= QColorDialog::DontUseNativeDialog;
#endif
@ -1728,7 +1728,7 @@ bool WidgetInfo::FontChanged(const char *setting)
QFontDialog::FontDialogOptions options;
#ifdef __APPLE__
#ifndef _WIN32
options = QFontDialog::DontUseNativeDialog;
#endif