diff options
author | Richard Moe Gustavsen <richard.gustavsen@theqtcompany.com> | 2015-02-19 13:50:57 +0100 |
---|---|---|
committer | Richard Moe Gustavsen <richard.gustavsen@theqtcompany.com> | 2015-03-15 23:05:18 +0000 |
commit | ba60722b46bc120b149a15eb8a9c6a57d5dbe140 (patch) | |
tree | 35ed7c6429c4dcdc49d8f29948edcd7674b95efa /src | |
parent | a273ca9c439b515358607acd05fd90346b49a448 (diff) |
iOS: convert directory in qiosfiledialog to local file before checking filename
The directory URL will now have the scheme "file". So we need to convert
it to a local file before we inspect the file name
Change-Id: Ib50f879501f560a4d0fec41dce6d7d9f78f06a3c
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/plugins/platforms/ios/qiosfiledialog.mm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/platforms/ios/qiosfiledialog.mm b/src/plugins/platforms/ios/qiosfiledialog.mm index 28b9c0d883..0e12da9d57 100644 --- a/src/plugins/platforms/ios/qiosfiledialog.mm +++ b/src/plugins/platforms/ios/qiosfiledialog.mm @@ -95,7 +95,8 @@ bool QIOSFileDialog::show(Qt::WindowFlags windowFlags, Qt::WindowModality window Q_UNUSED(windowFlags); Q_UNUSED(windowModality); - if (options()->initialDirectory().scheme() == QLatin1String("assets-library")) { + QString directory = options()->initialDirectory().toLocalFile(); + if (directory.startsWith(QLatin1String("assets-library:"))) { m_viewController = [[QIOSImagePickerController alloc] initWithQIOSFileDialog:this]; UIWindow *window = parent ? reinterpret_cast<UIView *>(parent->winId()).window : [UIApplication sharedApplication].keyWindow; |