diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-13 03:00:42 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-13 03:00:43 +0100 |
| commit | 7d11f3c452d1d864caab54375a8ed17c0c607a26 (patch) | |
| tree | e1a76d9f33853a25be395c569c456d155b504622 /src/dialogs/qquickplatformmessagedialog.cpp | |
| parent | f74c888ae8d0c04d9b1d944fe61dc9a7e86b5420 (diff) | |
| parent | 710058343297bba7cc44fa2369b7cec742f34cb2 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ieb311191b4af384a81673b5ed69c32b3b9853c9c
Diffstat (limited to 'src/dialogs/qquickplatformmessagedialog.cpp')
| -rw-r--r-- | src/dialogs/qquickplatformmessagedialog.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/dialogs/qquickplatformmessagedialog.cpp b/src/dialogs/qquickplatformmessagedialog.cpp index 2e3afa481..8ba1ea6ae 100644 --- a/src/dialogs/qquickplatformmessagedialog.cpp +++ b/src/dialogs/qquickplatformmessagedialog.cpp @@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE /*! \qmltype MessageDialog - \instantiates QQuickPlatformMessageDialog + \instantiates QQuickPlatformMessageDialog1 \inqmlmodule QtQuick.Dialogs \ingroup qtquickdialogs \brief Dialog component for displaying popup messages. @@ -184,11 +184,11 @@ QT_BEGIN_NAMESPACE */ /*! - \class QQuickPlatformMessageDialog + \class QQuickPlatformMessageDialog1 \inmodule QtQuick.Dialogs \internal - \brief The QQuickPlatformMessageDialog class provides a message dialog + \brief The QQuickPlatformMessageDialog1 class provides a message dialog The dialog is implemented via the QPlatformMessageDialogHelper when possible; otherwise it falls back to a QMessageBox or a QML implementation. @@ -199,7 +199,7 @@ QT_BEGIN_NAMESPACE /*! Constructs a file dialog with parent window \a parent. */ -QQuickPlatformMessageDialog::QQuickPlatformMessageDialog(QObject *parent) : +QQuickPlatformMessageDialog1::QQuickPlatformMessageDialog1(QObject *parent) : QQuickAbstractMessageDialog(parent) { } @@ -207,14 +207,14 @@ QQuickPlatformMessageDialog::QQuickPlatformMessageDialog(QObject *parent) : /*! Destroys the file dialog. */ -QQuickPlatformMessageDialog::~QQuickPlatformMessageDialog() +QQuickPlatformMessageDialog1::~QQuickPlatformMessageDialog1() { if (m_dlgHelper) m_dlgHelper->hide(); delete m_dlgHelper; } -QPlatformMessageDialogHelper *QQuickPlatformMessageDialog::helper() +QPlatformMessageDialogHelper *QQuickPlatformMessageDialog1::helper() { QQuickItem *parentItem = qobject_cast<QQuickItem *>(parent()); if (parentItem) |