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
23da3a78
Commit
23da3a78
authored
11 years ago
by
Sergio Ahumada
Browse files
Options
Download
Plain Diff
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ib8d267887ca6c11067a94812f9f4ac0151c1113f
parents
467e7b9f
abdb3877
dev
5.10
5.11
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
5.3
5.4
5.5
5.6
5.7
5.8
5.9
5.9.8
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
v5.12.0-beta2
v5.12.0-beta1
v5.12.0-alpha1
v5.11.3
v5.11.2
v5.11.1
v5.11.0
v5.11.0-rc2
v5.11.0-rc1
v5.11.0-beta4
v5.11.0-beta3
v5.11.0-beta2
v5.11.0-beta1
v5.11.0-alpha1
v5.10.1
v5.10.0
v5.10.0-rc3
v5.10.0-rc2
v5.10.0-rc1
v5.10.0-beta4
v5.10.0-beta3
v5.10.0-beta2
v5.10.0-beta1
v5.10.0-alpha1
v5.9.9
v5.9.8
v5.9.7
v5.9.6
v5.9.5
v5.9.4
v5.9.3
v5.9.2
v5.9.1
v5.9.0
v5.9.0-rc2
v5.9.0-rc1
v5.9.0-beta4
v5.9.0-beta3
v5.9.0-beta2
v5.9.0-beta1
v5.9.0-alpha1
v5.8.0
v5.8.0-rc1
v5.8.0-beta1
v5.8.0-alpha1
v5.7.1
v5.7.0
v5.7.0-rc1
v5.7.0-beta1
v5.7.0-alpha1
v5.6.3
v5.6.2
v5.6.1
v5.6.1-1
v5.6.0
v5.6.0-rc1
v5.6.0-beta1
v5.6.0-alpha1
v5.5.1
v5.5.0
v5.5.0-rc1
v5.5.0-beta1
v5.5.0-alpha1
v5.4.2
v5.4.1
v5.4.0
v5.4.0-rc1
v5.4.0-beta1
v5.4.0-alpha1
v5.3.2
v5.3.1
v5.3.0
v5.3.0-rc1
v5.3.0-beta1
v5.3.0-alpha1
No related merge requests found
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
src/androidextras/androidextras.pro
+2
-1
src/androidextras/androidextras.pro
src/androidextras/doc/qtandroidextras.qdocconf
+4
-6
src/androidextras/doc/qtandroidextras.qdocconf
src/androidextras/doc/snippets/code/src_androidextras_qandroidjniobject.cpp
+53
-0
...doc/snippets/code/src_androidextras_qandroidjniobject.cpp
src/androidextras/doc/src/qtandroidextras-examples.qdoc
+36
-0
src/androidextras/doc/src/qtandroidextras-examples.qdoc
src/androidextras/doc/src/qtandroidextras-index.qdoc
+7
-2
src/androidextras/doc/src/qtandroidextras-index.qdoc
src/androidextras/doc/src/qtandroidextras-module.qdoc
+1
-2
src/androidextras/doc/src/qtandroidextras-module.qdoc
src/androidextras/jni/qandroidjniobject.cpp
+180
-43
src/androidextras/jni/qandroidjniobject.cpp
tests/auto/qandroidjnienvironment/qandroidjnienvironment.pro
+1
-1
tests/auto/qandroidjnienvironment/qandroidjnienvironment.pro
tests/auto/qandroidjnienvironment/tst_qandroidjnienvironment.cpp
+8
-17
...uto/qandroidjnienvironment/tst_qandroidjnienvironment.cpp
tests/auto/qandroidjniobject/tst_qandroidjniobject.cpp
+2
-30
tests/auto/qandroidjniobject/tst_qandroidjniobject.cpp
with
294 additions
and
102 deletions
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