[qt5-qtbase] Fix build

Jan Grulich jgrulich at fedoraproject.org
Mon Oct 13 10:37:17 UTC 2014


commit fd495c7f18b49c0d5db34c5f86e23c3ccce5f9f7
Author: Jan Grulich <jgrulich at redhat.com>
Date:   Mon Oct 13 12:37:03 2014 +0200

    Fix build

 ...alog-implement-getopenfileurl-and-friends.patch |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/qtbase-qfiledialog-implement-getopenfileurl-and-friends.patch b/qtbase-qfiledialog-implement-getopenfileurl-and-friends.patch
index f5820ac..e9d2c60 100644
--- a/qtbase-qfiledialog-implement-getopenfileurl-and-friends.patch
+++ b/qtbase-qfiledialog-implement-getopenfileurl-and-friends.patch
@@ -1,5 +1,5 @@
 diff --git a/src/widgets/dialogs/qfiledialog.cpp b/src/widgets/dialogs/qfiledialog.cpp
-index 9219757..9c2956a 100644
+index 9219757..4464b94 100644
 --- a/src/widgets/dialogs/qfiledialog.cpp
 +++ b/src/widgets/dialogs/qfiledialog.cpp
 @@ -2100,35 +2100,9 @@ QString QFileDialog::getOpenFileName(QWidget *parent,
@@ -51,8 +51,8 @@ index 9219757..9c2956a 100644
 +    QFileDialogArgs args;
 +    args.parent = parent;
 +    args.caption = caption;
-+    args.directory = QFileDialogPrivate::workingDirectory(dir);
-+    args.selection = QFileDialogPrivate::initialSelection(dir);
++    args.directory = QFileDialogPrivate::workingDirectory(QUrl::fromLocalFile(dir));
++    args.selection = QFileDialogPrivate::initialSelection(QUrl::fromLocalFile(dir));
 +    args.filter = filter;
 +    args.mode = ExistingFile;
 +    args.options = options;
@@ -122,8 +122,8 @@ index 9219757..9c2956a 100644
 +    QFileDialogArgs args;
 +    args.parent = parent;
 +    args.caption = caption;
-+    args.directory = QFileDialogPrivate::workingDirectory(dir);
-+    args.selection = QFileDialogPrivate::initialSelection(dir);
++    args.directory = QFileDialogPrivate::workingDirectory(QUrl::fromLocalFile(dir));
++    args.selection = QFileDialogPrivate::initialSelection(QUrl::fromLocalFile(dir));
 +    args.filter = filter;
 +    args.mode = ExistingFiles;
 +    args.options = options;
@@ -187,8 +187,8 @@ index 9219757..9c2956a 100644
 +    QFileDialogArgs args;
 +    args.parent = parent;
 +    args.caption = caption;
-+    args.directory = QFileDialogPrivate::workingDirectory(dir);
-+    args.selection = QFileDialogPrivate::initialSelection(dir);
++    args.directory = QFileDialogPrivate::workingDirectory(QUrl::fromLocalFile(dir));
++    args.selection = QFileDialogPrivate::initialSelection(QUrl::fromLocalFile(dir));
 +    args.filter = filter;
 +    args.mode = AnyFile;
 +    args.options = options;
@@ -248,7 +248,7 @@ index 9219757..9c2956a 100644
 +    QFileDialogArgs args;
 +    args.parent = parent;
 +    args.caption = caption;
-+    args.directory = QFileDialogPrivate::workingDirectory(dir);
++    args.directory = QFileDialogPrivate::workingDirectory(QUrl::fromLocalFile(dir));
 +    args.mode = (options & ShowDirsOnly ? DirectoryOnly : Directory);
 +    args.options = options;
 +


More information about the scm-commits mailing list