diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2016-02-11 21:24:31 +0100 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2016-03-03 14:30:17 +0000 |
| commit | 0b18f262816a165a900da6b764261c5c0553fa1e (patch) | |
| tree | 0953974a9c7600974fa51eb59fc02779bf1bf5ae /src/dialogs/qquickabstractfontdialog.cpp | |
| parent | 22b02df3b2b898630bc043fc8a18559e8e6c73ce (diff) | |
Port to new Q*DialogOptions API (II)
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 removes the #ifdefs for the old-style API
again, leaving only the new API use.
Change-Id: I1441ca4010c4654fcaf114a2c96bf99cdc38e93f
Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com>
Diffstat (limited to 'src/dialogs/qquickabstractfontdialog.cpp')
| -rw-r--r-- | src/dialogs/qquickabstractfontdialog.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/dialogs/qquickabstractfontdialog.cpp b/src/dialogs/qquickabstractfontdialog.cpp index a1b26f735..9b0f0ec6e 100644 --- a/src/dialogs/qquickabstractfontdialog.cpp +++ b/src/dialogs/qquickabstractfontdialog.cpp @@ -49,11 +49,7 @@ QT_BEGIN_NAMESPACE QQuickAbstractFontDialog::QQuickAbstractFontDialog(QObject *parent) : QQuickAbstractDialog(parent) , m_dlgHelper(0) -#ifdef QPLATFORMDIALOGHELPERS_HAS_CREATE , m_options(QFontDialogOptions::create()) -#else - , m_options(QSharedPointer<QFontDialogOptions>(new QFontDialogOptions())) -#endif { // On the Mac, modality doesn't work unless you call exec(). But this is a reasonable default anyway. m_modality = Qt::NonModal; |