diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-08-13 16:58:44 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-08-17 08:31:20 +0000 |
| commit | efdd81ce80b018b7b5779876e94f1b722af7fb9a (patch) | |
| tree | e1bf8151431f64f54707157b8f62823374e373bb /src/dialogs/qquickplatformfontdialog.cpp | |
| parent | 22fab1502f562bccb3c16dde0288aa867e3b094a (diff) | |
| download | qtquickcontrols-efdd81ce80b018b7b5779876e94f1b722af7fb9a.tar.gz | |
Fix ColorDialog.color and FontDialog.font update on accept
When using native dialogs, ColorDialog.color was not updated at all,
and FontDialog.font was incorrectly following FontDialog.currentFont.
Promote the overridden accept() methods to the abstract base classes
so the native dialogs get the appropriate property updates on accept
the same way compared to the non-native dialogs.
Task-number: QTBUG-55298
Change-Id: I9ac8f5ecc60884cd98b58d09ef3dcb4baf47772d
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
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))); } |