AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge integration refs/builds/qtci/dev/1617030826

Browse Source
This commit is contained in:
Qt CI Bot 2021-03-29 17:36:45 +00:00
commit 3e6b7b3bf6
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/kernel/qproperty_p.h
View File

@ -45,8 +45,8 @@
// -------------
//
// This file is not part of the Qt API. It exists for the convenience
// of qapplication_*.cpp, qwidget*.cpp and qfiledialog.cpp. This header
// file may change from version to version without notice, or even be removed.
// of a number of Qt sources files. This header file may change from
// version to version without notice, or even be removed.
//
// We mean it.
//

6
src/corelib/kernel/qpropertyprivate.h
View File

@ -44,9 +44,9 @@
// W A R N I N G
// -------------
//
// This file is not part of the Qt API. It exists for the convenience
// of qapplication_*.cpp, qwidget*.cpp and qfiledialog.cpp. This header
// file may change from version to version without notice, or even be removed.
// This file is not part of the Qt API. It exists purely as an
// implementation detail. This header file may change from version to
// version without notice, or even be removed.
//
// We mean it.
//

2
src/widgets/dialogs/qfontdialog.cpp
View File

@ -812,7 +812,7 @@ void QFontDialog::changeEvent(QEvent *e)
void QFontDialog::setCurrentFont(const QFont &font)
{
Q_D(QFontDialog);
d->family = font.families().first();
d->family = font.families().value(0);
d->style = QFontDatabase::styleString(font);
d->size = font.pointSize();
if (d->size == -1) {