Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
BC
public
external
Qt
QtAndroidExtras
Commits
b2e2e76b
Commit
b2e2e76b
authored
6 years ago
by
Qt Forward Merge Bot
Browse files
Options
Download
Plain Diff
Merge remote-tracking branch 'origin/5.11' into 5.12
Change-Id: I88b7094f8b625c14f2524576e73cf7fc3f807a1d
parents
467eacf0
f7df383a
dev
5.12
5.12.1
5.12.10
5.12.11
5.12.12
5.12.2
5.12.3
5.12.4
5.12.5
5.12.6
5.12.7
5.12.8
5.12.9
5.13
5.13.0
5.13.1
5.13.2
5.14
5.14.0
5.14.1
5.14.2
5.15
5.15.0
5.15.1
5.15.2
6.2
wip/cmake
v5.15.0-alpha1
v5.14.1
v5.14.0
v5.14.0-rc2
v5.14.0-rc1
v5.14.0-beta3
v5.14.0-beta2
v5.14.0-beta1
v5.14.0-alpha1
v5.13.2
v5.13.1
v5.13.0
v5.13.0-rc3
v5.13.0-rc2
v5.13.0-rc1
v5.13.0-beta4
v5.13.0-beta3
v5.13.0-beta2
v5.13.0-beta1
v5.13.0-alpha1
v5.12.7
v5.12.6
v5.12.5
v5.12.4
v5.12.3
v5.12.2
v5.12.1
v5.12.0
v5.12.0-rc2
v5.12.0-rc1
v5.12.0-beta4
v5.12.0-beta3
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/androidextras/android/qandroidintent.cpp
+2
-0
src/androidextras/android/qandroidintent.cpp
with
2 additions
and
0 deletions
src/androidextras/android/qandroidintent.cpp
+
2
−
0
View file @
b2e2e76b
...
...
@@ -125,6 +125,8 @@ QByteArray QAndroidIntent::extraBytes(const QString &key)
QAndroidJniExceptionCleaner
cleaner
;
auto
array
=
m_handle
.
callObjectMethod
(
"getByteArrayExtra"
,
"(Ljava/lang/String;)[B"
,
QAndroidJniObject
::
fromString
(
key
).
object
());
if
(
!
array
.
isValid
()
||
!
array
.
object
())
return
QByteArray
();
QAndroidJniEnvironment
env
;
auto
sz
=
env
->
GetArrayLength
(
jarray
(
array
.
object
()));
QByteArray
res
(
sz
,
Qt
::
Initialization
::
Uninitialized
);
...
...
This diff is collapsed.
Click to expand it.
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets