summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@kdab.com>2016-02-11 21:24:31 +0100
committerShawn Rutledge <shawn.rutledge@theqtcompany.com>2016-02-29 12:37:55 +0000
commit22b02df3b2b898630bc043fc8a18559e8e6c73ce (patch)
tree222f868112fe4b3301016331786de26d71f49dff
parentee8bfc3eaa49595bce559f89ea2cf33067a91475 (diff)
downloadqtquickcontrols-22b02df3b2b898630bc043fc8a18559e8e6c73ce.tar.gz
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 <shawn.rutledge@theqtcompany.com>
-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, 20 insertions, 0 deletions
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<QFontDialogOptions>(new QFontDialogOptions()))
+#endif
{}
QQuickFontListModel *q_ptr;
diff --git a/src/dialogs/qquickabstractcolordialog.cpp b/src/dialogs/qquickabstractcolordialog.cpp
index 2101fe0e..fddf1cf1 100644
--- a/src/dialogs/qquickabstractcolordialog.cpp
+++ b/src/dialogs/qquickabstractcolordialog.cpp
@@ -49,7 +49,11 @@ 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 3bc79570..be4b03c3 100644
--- a/src/dialogs/qquickabstractfiledialog.cpp
+++ b/src/dialogs/qquickabstractfiledialog.cpp
@@ -51,7 +51,11 @@ 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 fb715c35..a1b26f73 100644
--- a/src/dialogs/qquickabstractfontdialog.cpp
+++ b/src/dialogs/qquickabstractfontdialog.cpp
@@ -49,7 +49,11 @@ 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 8d80bb3a..901587de 100644
--- a/src/dialogs/qquickabstractmessagedialog.cpp
+++ b/src/dialogs/qquickabstractmessagedialog.cpp
@@ -45,7 +45,11 @@ 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)
{
}