FontDialog: replace fontSelected() with a declarative property

This is consistent with the QML FontDialog from QtQuick Dialogs 1.

Change-Id: I14a5a313be5ba9a9e0fb1645fe272cf9c2cdd389
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>

1 files changed, 8 insertions, 2 deletions

diff --git a/src/imports/platform/qquickplatformfontdialog_p.h b/src/imports/platform/qquickplatformfontdialog_p.h
index 0c4f64ee..920628ed 100644
--- a/src/imports/platform/qquickplatformfontdialog_p.h
+++ b/src/imports/platform/qquickplatformfontdialog_p.h
@@ -57,6 +57,7 @@ QT_BEGIN_NAMESPACE
 class QQuickPlatformFontDialog : public QQuickPlatformDialog
 {
     Q_OBJECT
+    Q_PROPERTY(QFont font READ font WRITE setFont NOTIFY fontChanged FINAL)
     Q_PROPERTY(QFont currentFont READ currentFont WRITE setCurrentFont NOTIFY currentFontChanged FINAL)
     Q_PROPERTY(QFontDialogOptions::FontDialogOptions options READ options WRITE setOptions NOTIFY optionsChanged FINAL)
     Q_FLAGS(QFontDialogOptions::FontDialogOptions)
@@ -64,6 +65,9 @@ class QQuickPlatformFontDialog : public QQuickPlatformDialog
 public:
     explicit QQuickPlatformFontDialog(QObject *parent = nullptr);
 
+    QFont font() const;
+    void setFont(const QFont &font);
+
     QFont currentFont() const;
     void setCurrentFont(const QFont &font);
 
@@ -71,15 +75,17 @@ public:
     void setOptions(QFontDialogOptions::FontDialogOptions options);
 
 Q_SIGNALS:
-    void optionsChanged();
+    void fontChanged();
     void currentFontChanged();
-    void fontSelected(const QFont &font);
+    void optionsChanged();
 
 protected:
     QPlatformDialogHelper *createHelper() override;
     void applyOptions() override;
+    void accept() override;
 
 private:
+    QFont m_font;
     QSharedPointer<QFontDialogOptions> m_options;
 };