aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/dialogs
diff options
context:
space:
mode:
authorShawn Rutledge <shawn.rutledge@digia.com>2013-07-18 08:09:54 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-07-18 08:19:26 +0200
commit17ded06804576dfde1b19f82f168f7ceb09ec92c (patch)
treeab5f3fd28f76f5b919a56ef76dac54ae47d096cb /src/imports/dialogs
parentd9751bc29d2f80b86eb237226ce832bf2e372f1d (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/dialogs')
-rw-r--r--src/imports/dialogs/qquickabstractfiledialog.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/imports/dialogs/qquickabstractfiledialog.cpp b/src/imports/dialogs/qquickabstractfiledialog.cpp
index d8a75feb53..ec5a7f6926 100644
--- a/src/imports/dialogs/qquickabstractfiledialog.cpp
+++ b/src/imports/dialogs/qquickabstractfiledialog.cpp
@@ -108,9 +108,12 @@ void QQuickAbstractFileDialog::setSelectFolder(bool selectFolder)
QUrl QQuickAbstractFileDialog::folder()
{
+ return QUrl();
+ /* TODO after dialog helper switches to URLs
if (m_dlgHelper && !m_dlgHelper->directory().isEmpty())
return QUrl::fromLocalFile(m_dlgHelper->directory());
return QUrl::fromLocalFile(m_options->initialDirectory());
+ */
}
void QQuickAbstractFileDialog::setFolder(const QUrl &f)
@@ -160,9 +163,11 @@ QUrl QQuickAbstractFileDialog::fileUrl()
QList<QUrl> QQuickAbstractFileDialog::fileUrls()
{
QList<QUrl> ret;
+ /* TODO after dialog helper switches to URLs
if (m_dlgHelper)
foreach (QString path, m_dlgHelper->selectedFiles())
ret << QUrl::fromLocalFile(path);
+ */
return ret;
}