diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-30 07:10:33 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-30 07:10:37 +0200 |
| commit | e516c88c485d17e25a55b63d579fe90f9a529afa (patch) | |
| tree | 3a1fd2e10e8e537821e3bf64b5e0c2a78e81e6ac /src/dialogs/qquickplatformfontdialog.cpp | |
| parent | df14928f12fc04857448a3ab883ffccf199e7c51 (diff) | |
| parent | abe319c9cb811832bb4c9c95290564dfa7b3603a (diff) | |
| download | qtquickcontrols-e516c88c485d17e25a55b63d579fe90f9a529afa.tar.gz | |
Merge remote-tracking branch 'origin/5.7' into 5.8v5.8.0-alpha1
Change-Id: I4f85412071d34b44f76870753e171e0beae2e7b9
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))); } |