From 22b02df3b2b898630bc043fc8a18559e8e6c73ce Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Thu, 11 Feb 2016 21:24:31 +0100 Subject: Port to new Q*DialogOptions API Q*DialogOptions are no longer value types, but are held only in QSharedPointers. Consequently, all special member function have been hidden from clients and create() and clone() methods have been added. This change uses a macro defined by the QtBase change to select the API variant. This is needed for the QtBase change to integrate, and needed for as long as the QtBase change hasn't been integrated, yet. A follow-up commit will remove the scaffolding again. Change-Id: I20c1d75fcaa42323862599f2a35b815bc67b39dd Reviewed-by: Shawn Rutledge --- src/dialogs/Private/qquickfontlistmodel.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/dialogs/Private') diff --git a/src/dialogs/Private/qquickfontlistmodel.cpp b/src/dialogs/Private/qquickfontlistmodel.cpp index af318f3b..530d0c2c 100644 --- a/src/dialogs/Private/qquickfontlistmodel.cpp +++ b/src/dialogs/Private/qquickfontlistmodel.cpp @@ -52,7 +52,11 @@ class QQuickFontListModelPrivate public: QQuickFontListModelPrivate(QQuickFontListModel *q) : q_ptr(q), ws(QFontDatabase::Any) +#ifdef QPLATFORMDIALOGHELPERS_HAS_CREATE + , options(QFontDialogOptions::create()) +#else , options(QSharedPointer(new QFontDialogOptions())) +#endif {} QQuickFontListModel *q_ptr; -- cgit v1.2.1