From ba60722b46bc120b149a15eb8a9c6a57d5dbe140 Mon Sep 17 00:00:00 2001 From: Richard Moe Gustavsen Date: Thu, 19 Feb 2015 13:50:57 +0100 Subject: iOS: convert directory in qiosfiledialog to local file before checking filename MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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ø --- src/plugins/platforms/ios/qiosfiledialog.mm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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(parent->winId()).window : [UIApplication sharedApplication].keyWindow; -- cgit v1.2.3