diff options
| author | Oliver Eftevaag <oliver.eftevaag@qt.io> | 2021-03-15 16:05:11 +0100 |
|---|---|---|
| committer | Oliver Eftevaag <oliver.eftevaag@qt.io> | 2021-06-04 18:02:30 +0200 |
| commit | c830979fbb176e6e48b3ff45c84fa0742aaa186e (patch) | |
| tree | b594ec6b742a2155113f766d6eaac76c2f2f6ec6 /src/quickdialogs2/quickdialogs2quickimpl/qquickdialogimplfactory.cpp | |
| parent | 4ab599b2058949e18ac3fcdf71f9204f307d93ef (diff) | |
Add FontDialog to QtQuick.Dialogs
Adding non-native FontDialog to QtQuick.
This is a native FontDialog on platforms
that support it, and a non-native
Qt Quick FontDialog on platforms that don't.
Fixes: QTBUG-87799
Change-Id: I43a59e3668a8a40f1d0c04a3c2506283d552a22b
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/quickdialogs2/quickdialogs2quickimpl/qquickdialogimplfactory.cpp')
| -rw-r--r-- | src/quickdialogs2/quickdialogs2quickimpl/qquickdialogimplfactory.cpp | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qquickdialogimplfactory.cpp b/src/quickdialogs2/quickdialogs2quickimpl/qquickdialogimplfactory.cpp index f56466e063..1523154b0b 100644 --- a/src/quickdialogs2/quickdialogs2quickimpl/qquickdialogimplfactory.cpp +++ b/src/quickdialogs2/quickdialogs2quickimpl/qquickdialogimplfactory.cpp @@ -39,6 +39,7 @@ #include <QtCore/qloggingcategory.h> #include "qquickplatformfiledialog_p.h" +#include "qquickplatformfontdialog_p.h" QT_BEGIN_NAMESPACE @@ -63,7 +64,17 @@ QPlatformDialogHelper *QQuickDialogImplFactory::createPlatformDialogHelper( } return dialog; - } default: + } + case QPlatformTheme::FontDialog: { + auto dialog = new QQuickPlatformFontDialog(parent); + + if (!dialog->isValid()) { + delete dialog; + return nullptr; + } + return dialog; + } + default: break; } |