summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/dialogs/Private/qquickfontlistmodel.cpp4
-rw-r--r--src/dialogs/qquickabstractcolordialog.cpp4
-rw-r--r--src/dialogs/qquickabstractfiledialog.cpp4
-rw-r--r--src/dialogs/qquickabstractfontdialog.cpp4
-rw-r--r--src/dialogs/qquickabstractmessagedialog.cpp4
5 files changed, 0 insertions, 20 deletions
diff --git a/src/dialogs/Private/qquickfontlistmodel.cpp b/src/dialogs/Private/qquickfontlistmodel.cpp
index 530d0c2c..18bcd884 100644
--- a/src/dialogs/Private/qquickfontlistmodel.cpp
+++ b/src/dialogs/Private/qquickfontlistmodel.cpp
@@ -52,11 +52,7 @@ class QQuickFontListModelPrivate
public:
QQuickFontListModelPrivate(QQuickFontListModel *q)
: q_ptr(q), ws(QFontDatabase::Any)
-#ifdef QPLATFORMDIALOGHELPERS_HAS_CREATE
, options(QFontDialogOptions::create())
-#else
- , options(QSharedPointer<QFontDialogOptions>(new QFontDialogOptions()))
-#endif
{}
QQuickFontListModel *q_ptr;
diff --git a/src/dialogs/qquickabstractcolordialog.cpp b/src/dialogs/qquickabstractcolordialog.cpp
index fddf1cf1..ee9e4023 100644
--- a/src/dialogs/qquickabstractcolordialog.cpp
+++ b/src/dialogs/qquickabstractcolordialog.cpp
@@ -49,11 +49,7 @@ QT_BEGIN_NAMESPACE
QQuickAbstractColorDialog::QQuickAbstractColorDialog(QObject *parent)
: QQuickAbstractDialog(parent)
, m_dlgHelper(0)
-#ifdef QPLATFORMDIALOGHELPERS_HAS_CREATE
, m_options(QColorDialogOptions::create())
-#else
- , m_options(QSharedPointer<QColorDialogOptions>(new QColorDialogOptions()))
-#endif
{
// On the Mac, modality doesn't work unless you call exec(). But this is a reasonable default anyway.
m_modality = Qt::NonModal;
diff --git a/src/dialogs/qquickabstractfiledialog.cpp b/src/dialogs/qquickabstractfiledialog.cpp
index be4b03c3..6bfc1db0 100644
--- a/src/dialogs/qquickabstractfiledialog.cpp
+++ b/src/dialogs/qquickabstractfiledialog.cpp
@@ -51,11 +51,7 @@ QT_BEGIN_NAMESPACE
QQuickAbstractFileDialog::QQuickAbstractFileDialog(QObject *parent)
: QQuickAbstractDialog(parent)
, m_dlgHelper(0)
-#ifdef QPLATFORMDIALOGHELPERS_HAS_CREATE
, m_options(QFileDialogOptions::create())
-#else
- , m_options(QSharedPointer<QFileDialogOptions>(new QFileDialogOptions()))
-#endif
, m_selectExisting(true)
, m_selectMultiple(false)
, m_selectFolder(false)
diff --git a/src/dialogs/qquickabstractfontdialog.cpp b/src/dialogs/qquickabstractfontdialog.cpp
index a1b26f73..9b0f0ec6 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;
diff --git a/src/dialogs/qquickabstractmessagedialog.cpp b/src/dialogs/qquickabstractmessagedialog.cpp
index 901587de..ce0b17ea 100644
--- a/src/dialogs/qquickabstractmessagedialog.cpp
+++ b/src/dialogs/qquickabstractmessagedialog.cpp
@@ -45,11 +45,7 @@ QT_BEGIN_NAMESPACE
QQuickAbstractMessageDialog::QQuickAbstractMessageDialog(QObject *parent)
: QQuickAbstractDialog(parent)
, m_dlgHelper(0)
-#ifdef QPLATFORMDIALOGHELPERS_HAS_CREATE
, m_options(QMessageDialogOptions::create())
-#else
- , m_options(QSharedPointer<QMessageDialogOptions>(new QMessageDialogOptions()))
-#endif
, m_clickedButton(NoButton)
{
}