diff options
| author | Andy Shaw <andy.shaw@qt.io> | 2018-03-12 10:28:42 +0100 |
|---|---|---|
| committer | Andy Shaw <andy.shaw@qt.io> | 2018-03-12 10:05:16 +0000 |
| commit | 710058343297bba7cc44fa2369b7cec742f34cb2 (patch) | |
| tree | e5ea30909a51467de811a8ebce632215b032ddc9 /src/dialogs/qquickplatformcolordialog.cpp | |
| parent | 949884153ae14724c30f17c75656aa0c6f072559 (diff) | |
| download | qtquickcontrols-710058343297bba7cc44fa2369b7cec742f34cb2.tar.gz | |
Don't conflict with Qt Quick Controls 2 when using the platform dialogs
Change-Id: I7ca87ee59c8d65537713d5d912fdb3ec5bd7dcdb
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/dialogs/qquickplatformcolordialog.cpp')
| -rw-r--r-- | src/dialogs/qquickplatformcolordialog.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/dialogs/qquickplatformcolordialog.cpp b/src/dialogs/qquickplatformcolordialog.cpp index c002f322..4fe834ca 100644 --- a/src/dialogs/qquickplatformcolordialog.cpp +++ b/src/dialogs/qquickplatformcolordialog.cpp @@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE /*! \qmltype ColorDialog - \instantiates QQuickPlatformColorDialog + \instantiates QQuickPlatformColorDialog1 \inqmlmodule QtQuick.Dialogs \ingroup qtquickdialogs \brief Dialog component for choosing a color. @@ -124,11 +124,11 @@ QT_BEGIN_NAMESPACE */ /*! - \class QQuickPlatformColorDialog + \class QQuickPlatformColorDialog1 \inmodule QtQuick.Dialogs \internal - \brief The QQuickPlatformColorDialog class provides a color dialog + \brief The QQuickPlatformColorDialog1 class provides a color dialog The dialog is implemented via the QPlatformColorDialogHelper when possible; otherwise it falls back to a QColorDialog or a QML implementation. @@ -139,7 +139,7 @@ QT_BEGIN_NAMESPACE /*! Constructs a color dialog with parent window \a parent. */ -QQuickPlatformColorDialog::QQuickPlatformColorDialog(QObject *parent) : +QQuickPlatformColorDialog1::QQuickPlatformColorDialog1(QObject *parent) : QQuickAbstractColorDialog(parent) { } @@ -147,14 +147,14 @@ QQuickPlatformColorDialog::QQuickPlatformColorDialog(QObject *parent) : /*! Destroys the color dialog. */ -QQuickPlatformColorDialog::~QQuickPlatformColorDialog() +QQuickPlatformColorDialog1::~QQuickPlatformColorDialog1() { if (m_dlgHelper) m_dlgHelper->hide(); delete m_dlgHelper; } -QPlatformColorDialogHelper *QQuickPlatformColorDialog::helper() +QPlatformColorDialogHelper *QQuickPlatformColorDialog1::helper() { QQuickItem *parentItem = qobject_cast<QQuickItem *>(parent()); if (parentItem) |