diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-21 08:33:50 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-21 08:33:50 +0200 |
| commit | 4e26a18ede1775ae06bef7c272994e84510ebd9a (patch) | |
| tree | 0543dca51dc0b4f7a42c755235db4b00d2f080b4 /src/dialogs/qquickplatformfontdialog.cpp | |
| parent | 271d1efc13d4534830e37fd12fa6202981da723c (diff) | |
| parent | 3b093789b07c670e29d3275e26c4e7122db042ae (diff) | |
| download | qtquickcontrols-4e26a18ede1775ae06bef7c272994e84510ebd9a.tar.gz | |
Merge remote-tracking branch 'origin/5.8' into dev
Change-Id: I20f0f7a50b55907f4a6e574bdfe92bc9538879d6
Diffstat (limited to 'src/dialogs/qquickplatformfontdialog.cpp')
| -rw-r--r-- | src/dialogs/qquickplatformfontdialog.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dialogs/qquickplatformfontdialog.cpp b/src/dialogs/qquickplatformfontdialog.cpp index 247e869e..2c501a1c 100644 --- a/src/dialogs/qquickplatformfontdialog.cpp +++ b/src/dialogs/qquickplatformfontdialog.cpp @@ -170,7 +170,7 @@ QPlatformFontDialogHelper *QQuickPlatformFontDialog::helper() return m_dlgHelper; connect(m_dlgHelper, SIGNAL(accept()), this, SLOT(accept())); connect(m_dlgHelper, SIGNAL(reject()), this, SLOT(reject())); - connect(m_dlgHelper, SIGNAL(currentFontChanged(QFont)), this, SLOT(setFont(QFont))); + connect(m_dlgHelper, SIGNAL(currentFontChanged(QFont)), this, SLOT(setCurrentFont(QFont))); connect(m_dlgHelper, SIGNAL(fontSelected(QFont)), this, SLOT(setFont(QFont))); } |