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
ec731f55
Commit
ec731f55
authored
6 years ago
by
Qt Forward Merge Bot
Browse files
Options
Download
Plain Diff
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: Id4e120f3ab9ea1de9a0d3c86f1687807830fc435
parents
ae1a2533
328418b0
dev
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
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/androidextras/android/qandroidintent.cpp
+1
-1
src/androidextras/android/qandroidintent.cpp
with
1 addition
and
1 deletion
src/androidextras/android/qandroidintent.cpp
+
1
−
1
View file @
ec731f55
...
@@ -112,7 +112,7 @@ void QAndroidIntent::putExtra(const QString &key, const QByteArray &data)
...
@@ -112,7 +112,7 @@ void QAndroidIntent::putExtra(const QString &key, const QByteArray &data)
QAndroidJniEnvironment
env
;
QAndroidJniEnvironment
env
;
jbyteArray
array
=
env
->
NewByteArray
(
data
.
size
());
jbyteArray
array
=
env
->
NewByteArray
(
data
.
size
());
env
->
SetByteArrayRegion
(
array
,
0
,
data
.
length
(),
reinterpret_cast
<
const
jbyte
*>
(
data
.
constData
()));
env
->
SetByteArrayRegion
(
array
,
0
,
data
.
length
(),
reinterpret_cast
<
const
jbyte
*>
(
data
.
constData
()));
m_handle
.
callMethod
<
void
>
(
"putExtra"
,
"(Ljava/lang/String;[B)Landroid
.
content
.
Intent;"
,
m_handle
.
callMethod
<
void
>
(
"putExtra"
,
"(Ljava/lang/String;[B)Landroid
/
content
/
Intent;"
,
QAndroidJniObject
::
fromString
(
key
).
object
(),
array
);
QAndroidJniObject
::
fromString
(
key
).
object
(),
array
);
env
->
DeleteLocalRef
(
array
);
env
->
DeleteLocalRef
(
array
);
}
}
...
...
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