diff options
| author | Shawn Rutledge <shawn.rutledge@digia.com> | 2013-07-18 08:09:54 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-18 08:19:26 +0200 |
| commit | 17ded06804576dfde1b19f82f168f7ceb09ec92c (patch) | |
| tree | ab5f3fd28f76f5b919a56ef76dac54ae47d096cb /src/imports/widgets | |
| parent | d9751bc29d2f80b86eb237226ce832bf2e372f1d (diff) | |
Disable dialogs to allow changes in qtbase (use urls internally)
Followup to I9ae09416acdbe437acbe9672d0ecfc42059695ae so qtbase change
I61e99d498252241f38ec05724702a90ba050c4bb can get through CI.
Change-Id: I8bf3bca9b2a3b00b2471045cdc73f20329f99d9d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'src/imports/widgets')
| -rw-r--r-- | src/imports/widgets/qquickqfiledialog.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/imports/widgets/qquickqfiledialog.cpp b/src/imports/widgets/qquickqfiledialog.cpp index 498e34a24c..6aab2adbb9 100644 --- a/src/imports/widgets/qquickqfiledialog.cpp +++ b/src/imports/widgets/qquickqfiledialog.cpp @@ -67,9 +67,11 @@ public: virtual bool defaultNameFilterDisables() const { return true; } virtual void setDirectory(const QString &dir) { m_dialog.setDirectory(dir); } - virtual QString directory() const { return m_dialog.directory().absolutePath(); } virtual void selectFile(const QString &f) { m_dialog.selectFile(f); } + /* TODO after dialog helper switches to URLs + virtual QString directory() const { return m_dialog.directory().absolutePath(); } virtual QStringList selectedFiles() const { return m_dialog.selectedFiles(); } + */ virtual void setFilter() { m_dialog.setWindowTitle(QPlatformFileDialogHelper::options()->windowTitle()); @@ -188,6 +190,7 @@ QPlatformFileDialogHelper *QQuickQFileDialog::helper() if (parentItem) m_parentWindow = parentItem->window(); + /* TODO after dialog helper switches to URLs if (!m_dlgHelper) { m_dlgHelper = new QFileDialogHelper(); connect(m_dlgHelper, SIGNAL(directoryEntered(QString)), this, SIGNAL(folderChanged())); @@ -195,6 +198,7 @@ QPlatformFileDialogHelper *QQuickQFileDialog::helper() connect(m_dlgHelper, SIGNAL(accept()), this, SLOT(accept())); connect(m_dlgHelper, SIGNAL(reject()), this, SLOT(reject())); } + */ return m_dlgHelper; } |