diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-10 01:00:41 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-07-10 10:39:33 +0200 |
| commit | 6fd20defb95f0f3a7d1162641bd4ae9e0ed91bcc (patch) | |
| tree | 2d8c70bc359810f926374ffebd649576345a9c7f /src/android | |
| parent | d72ea9cbd3c2bde4645745c5aeba7cc052d87f0d (diff) | |
| parent | 4bb975717b0ba2c7b41e1a44192c2d54c919cfee (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
src/corelib/time/qdatetime.cpp
src/widgets/widgets/qcombobox.h
Change-Id: Ib84352e8fe34aed2986a1c94e7346a46a71c803b
Diffstat (limited to 'src/android')
| -rw-r--r-- | src/android/jar/src/org/qtproject/qt5/android/QtNative.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/android/jar/src/org/qtproject/qt5/android/QtNative.java b/src/android/jar/src/org/qtproject/qt5/android/QtNative.java index 9679fd40f4..c33d5016ce 100644 --- a/src/android/jar/src/org/qtproject/qt5/android/QtNative.java +++ b/src/android/jar/src/org/qtproject/qt5/android/QtNative.java @@ -178,6 +178,9 @@ public class QtNative return fdDesc.detachFd(); } catch (FileNotFoundException e) { return -1; + } catch (SecurityException e) { + Log.e(QtTAG, "Exception when opening file", e); + return -1; } } |