rpms/qt5-qtbase
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix build

Browse Source
This commit is contained in:
Jan Grulich 2014-10-13 12:37:03 +02:00
parent ab7b18b9ea
commit fd495c7f18
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
qtbase-qfiledialog-implement-getopenfileurl-and-friends.patch
View File

@ -1,5 +1,5 @@
diff --git a/src/widgets/dialogs/qfiledialog.cpp b/src/widgets/dialogs/qfiledialog.cpp 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 --- a/src/widgets/dialogs/qfiledialog.cpp
+++ b/src/widgets/dialogs/qfiledialog.cpp +++ b/src/widgets/dialogs/qfiledialog.cpp
@@ -2100,35 +2100,9 @@ QString QFileDialog::getOpenFileName(QWidget *parent, @@ -2100,35 +2100,9 @@ QString QFileDialog::getOpenFileName(QWidget *parent,
@ -51,8 +51,8 @@ index 9219757..9c2956a 100644
+ QFileDialogArgs args; + QFileDialogArgs args;
+ args.parent = parent; + args.parent = parent;
+ args.caption = caption; + args.caption = caption;
+ args.directory = QFileDialogPrivate::workingDirectory(dir); + args.directory = QFileDialogPrivate::workingDirectory(QUrl::fromLocalFile(dir));
+ args.selection = QFileDialogPrivate::initialSelection(dir); + args.selection = QFileDialogPrivate::initialSelection(QUrl::fromLocalFile(dir));
+ args.filter = filter; + args.filter = filter;
+ args.mode = ExistingFile; + args.mode = ExistingFile;
+ args.options = options; + args.options = options;
@ -122,8 +122,8 @@ index 9219757..9c2956a 100644
+ QFileDialogArgs args; + QFileDialogArgs args;
+ args.parent = parent; + args.parent = parent;
+ args.caption = caption; + args.caption = caption;
+ args.directory = QFileDialogPrivate::workingDirectory(dir); + args.directory = QFileDialogPrivate::workingDirectory(QUrl::fromLocalFile(dir));
+ args.selection = QFileDialogPrivate::initialSelection(dir); + args.selection = QFileDialogPrivate::initialSelection(QUrl::fromLocalFile(dir));
+ args.filter = filter; + args.filter = filter;
+ args.mode = ExistingFiles; + args.mode = ExistingFiles;
+ args.options = options; + args.options = options;
@ -187,8 +187,8 @@ index 9219757..9c2956a 100644
+ QFileDialogArgs args; + QFileDialogArgs args;
+ args.parent = parent; + args.parent = parent;
+ args.caption = caption; + args.caption = caption;
+ args.directory = QFileDialogPrivate::workingDirectory(dir); + args.directory = QFileDialogPrivate::workingDirectory(QUrl::fromLocalFile(dir));
+ args.selection = QFileDialogPrivate::initialSelection(dir); + args.selection = QFileDialogPrivate::initialSelection(QUrl::fromLocalFile(dir));
+ args.filter = filter; + args.filter = filter;
+ args.mode = AnyFile; + args.mode = AnyFile;
+ args.options = options; + args.options = options;
@ -248,7 +248,7 @@ index 9219757..9c2956a 100644
+ QFileDialogArgs args; + QFileDialogArgs args;
+ args.parent = parent; + args.parent = parent;
+ args.caption = caption; + args.caption = caption;
+ args.directory = QFileDialogPrivate::workingDirectory(dir); + args.directory = QFileDialogPrivate::workingDirectory(QUrl::fromLocalFile(dir));
+ args.mode = (options & ShowDirsOnly ? DirectoryOnly : Directory); + args.mode = (options & ShowDirsOnly ? DirectoryOnly : Directory);
+ args.options = options; + args.options = options;
+ +