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/qquickplatformfiledialog.cpp | |
| parent | 949884153ae14724c30f17c75656aa0c6f072559 (diff) | |
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/qquickplatformfiledialog.cpp')
| -rw-r--r-- | src/dialogs/qquickplatformfiledialog.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/dialogs/qquickplatformfiledialog.cpp b/src/dialogs/qquickplatformfiledialog.cpp index b30f2b2bc..aaf15197c 100644 --- a/src/dialogs/qquickplatformfiledialog.cpp +++ b/src/dialogs/qquickplatformfiledialog.cpp @@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE /*! \qmltype FileDialog - \instantiates QQuickPlatformFileDialog + \instantiates QQuickPlatformFileDialog1 \inqmlmodule QtQuick.Dialogs \ingroup qtquickdialogs \brief Dialog component for choosing files from a local filesystem. @@ -149,12 +149,12 @@ QT_BEGIN_NAMESPACE */ /*! - \class QQuickPlatformFileDialog + \class QQuickPlatformFileDialog1 \inmodule QtQuick.Dialogs \internal \since 5.1 - \brief The QQuickPlatformFileDialog class provides a file dialog + \brief The QQuickPlatformFileDialog1 class provides a file dialog The dialog is implemented via the QPlatformFileDialogHelper when possible; otherwise it falls back to a QFileDialog or a QML implementation. @@ -163,7 +163,7 @@ QT_BEGIN_NAMESPACE /*! Constructs a file dialog with parent window \a parent. */ -QQuickPlatformFileDialog::QQuickPlatformFileDialog(QObject *parent) : +QQuickPlatformFileDialog1::QQuickPlatformFileDialog1(QObject *parent) : QQuickFileDialog(parent) { } @@ -171,21 +171,21 @@ QQuickPlatformFileDialog::QQuickPlatformFileDialog(QObject *parent) : /*! Destroys the file dialog. */ -QQuickPlatformFileDialog::~QQuickPlatformFileDialog() +QQuickPlatformFileDialog1::~QQuickPlatformFileDialog1() { if (m_dlgHelper) m_dlgHelper->hide(); delete m_dlgHelper; } -QList<QUrl> QQuickPlatformFileDialog::fileUrls() const +QList<QUrl> QQuickPlatformFileDialog1::fileUrls() const { if (m_dialogHelperInUse) return m_dlgHelper->selectedFiles(); return QQuickFileDialog::fileUrls(); } -void QQuickPlatformFileDialog::setModality(Qt::WindowModality m) +void QQuickPlatformFileDialog1::setModality(Qt::WindowModality m) { #ifdef Q_OS_WIN // A non-modal native file dialog is not possible on Windows, so @@ -200,7 +200,7 @@ void QQuickPlatformFileDialog::setModality(Qt::WindowModality m) QQuickAbstractFileDialog::setModality(m); } -QPlatformFileDialogHelper *QQuickPlatformFileDialog::helper() +QPlatformFileDialogHelper *QQuickPlatformFileDialog1::helper() { QQuickItem *parentItem = qobject_cast<QQuickItem *>(parent()); if (parentItem) @@ -221,7 +221,7 @@ QPlatformFileDialogHelper *QQuickPlatformFileDialog::helper() return m_dlgHelper; } -void QQuickPlatformFileDialog::accept() +void QQuickPlatformFileDialog1::accept() { updateFolder(folder()); QQuickFileDialog::accept(); |