qt:qtandroidextras.git
2 years agoMerge remote-tracking branch 'origin/5.5' into dev dev
Liang Qi [Tue, 17 Mar 2015 15:37:25 +0000 (16:37 +0100)]
Merge remote-tracking branch 'origin/5.5' into dev

Change-Id: I110c2737eab4b310ebcc6c245808fc032db61677

2 years agoDoc: Remove unused documentation for comparison overloads v5.5.0-alpha1
Sergio Ahumada [Wed, 4 Mar 2015 17:28:44 +0000 (18:28 +0100)]
Doc: Remove unused documentation for comparison overloads

this change amends 4eb51def

Change-Id: I4bcbee03ba4ba44ad05db0b7bd38c208ff9d4e5a
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
2 years agoMerge remote-tracking branch 'origin/5.5' into dev
Frederik Gladhorn [Tue, 3 Mar 2015 17:13:16 +0000 (18:13 +0100)]
Merge remote-tracking branch 'origin/5.5' into dev

Change-Id: Ifd8c88ba8084f0141238d0cefcf0a3aebba43edd

2 years agoFix comparison overloads.
Christian Strømme [Mon, 16 Feb 2015 13:36:44 +0000 (14:36 +0100)]
Fix comparison overloads.

The templated comparison overloads could cause build errors due to
overload resolution being ambiguous; since implicit conversion from jni
object types to QAndroidJniObject is allowed the operator could end up
competing with built in types. To avoid that we get this ambiguity both
arguments of the operators will now require a QAndroidJniObject, this
effectively disables the templated operators unless called directly.
Since the templated operator overloads does not export any symbols and
are still callable, we retain both SC* and BC.

*Code that is written after this change, that would otherwise be affected
by this bug, will of course not be able to move back to an older version.

Task-number: QTBUG-43453
Change-Id: Icc774c432d078aeb7eb80ccbd0c25196af5f5a51
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
2 years agoBump version
Oswald Buddenhagen [Tue, 24 Feb 2015 15:16:06 +0000 (16:16 +0100)]
Bump version

Change-Id: Ibcb3c61d72122e656e59cc7d9b139d58d2d45ad4

2 years agoFixed BSD licensed file headers
Jani Heikkinen [Fri, 13 Feb 2015 11:28:31 +0000 (13:28 +0200)]
Fixed BSD licensed file headers

Change-Id: I8fc57754926b441c8d6cb81e25ea09a5eb3029a5
Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
2 years agoMerge remote-tracking branch 'origin/5.4' into dev
Frederik Gladhorn [Fri, 13 Feb 2015 12:12:00 +0000 (13:12 +0100)]
Merge remote-tracking branch 'origin/5.4' into dev

Conflicts:
.qmake.conf

Change-Id: I34c07ac0a2c0c01501f0cd095542e266ef456607

2 years agoUpdate copyright headers
Jani Heikkinen [Thu, 12 Feb 2015 08:13:52 +0000 (10:13 +0200)]
Update copyright headers

Qt copyrights are now in The Qt Company, so we could update the source
code headers accordingly. In the same go we should also fix the links to
point to qt.io.

Change-Id: Id0bb1fd5a9d695520753a280bb1ad5ba1ccc6026
Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
2 years agoComplete test of all QAndroidJniObjects JNI types.
Christian Strømme [Thu, 4 Dec 2014 17:37:57 +0000 (18:37 +0100)]
Complete test of all QAndroidJniObjects JNI types.

Makes sure that all template specializations are available and
that they pass a minimal call test.
This is a follow-up to 211e92a604bb617ed08ef6324adb191fc7221ef6
and d57cef7332c8b0669b469202b9f5e5e2dab5387f.

Change-Id: I8fa37f1a2ec12441343d2e4d257f2e5c12ad426b
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
2 years agoBump version 5.4.2
Oswald Buddenhagen [Fri, 16 Jan 2015 20:05:51 +0000 (21:05 +0100)]
Bump version

Change-Id: I18abcd802451d438d9cfa90bfde4f68dfd411089

2 years agoAndroid: Add more convenience types to QAndroidJniObject.
Christian Strømme [Wed, 3 Dec 2014 16:49:08 +0000 (17:49 +0100)]
Android: Add more convenience types to QAndroidJniObject.

This change adds more convenience methods for jclass, jobject,
jthrowable etc. while some of them don't add much value, they should be
included for completeness.

[ChangeLog][QAndroidJniObject] Added convenience functions for jclass,
jobject, jobjectArray and jthrowable

Change-Id: I46099f21b7806a22a8a539a1e91535ed61e395bb
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
2 years agoAdd missing method
Christian Strømme [Wed, 3 Dec 2014 16:49:01 +0000 (17:49 +0100)]
Add missing method

The method callObjectMethod didn't have a jcharArray convenience method,
as the equivalent static method has.

[ChangeLog][QAndroidJniObject] Added the missing jcharArray variant of
the callObjectMethod.

Change-Id: Ic5168f4604d7abe11788c18cba765d3660a91ed3
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
2 years agoMerge remote-tracking branch 'origin/5.4' into dev
Frederik Gladhorn [Wed, 17 Dec 2014 15:44:57 +0000 (16:44 +0100)]
Merge remote-tracking branch 'origin/5.4' into dev

Conflicts:
.qmake.conf

Change-Id: Ibbb51f63638ab198ebeae20bcc6fc7378378e1c4

2 years agoMerge remote-tracking branch 'origin/5.4.0' into 5.4 v5.4.1
Frederik Gladhorn [Wed, 17 Dec 2014 11:51:36 +0000 (12:51 +0100)]
Merge remote-tracking branch 'origin/5.4.0' into 5.4

Change-Id: I65d2e0e2133399fd279210958918bc64ca9c94f6

3 years agoBump version
Oswald Buddenhagen [Fri, 12 Dec 2014 12:47:28 +0000 (13:47 +0100)]
Bump version

Change-Id: Ie2dc060c2cb154a1225406f32f392821d0888353

3 years agoAdd Qt 5.4.0 changelog for QtAndroidExtras v5.4.0
Alex Blasche [Thu, 4 Dec 2014 09:54:15 +0000 (10:54 +0100)]
Add Qt 5.4.0 changelog for QtAndroidExtras

Change-Id: I5e5d1869d0a04f8e190181949bc1975de7c03938
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
3 years agoMerge remote-tracking branch 'origin/5.4' into dev
Frederik Gladhorn [Fri, 21 Nov 2014 15:12:18 +0000 (16:12 +0100)]
Merge remote-tracking branch 'origin/5.4' into dev

Change-Id: Ie41284439a6f89e231837e2e50d1624c3cf7f37f

3 years agoFix use of va_list in QAndroidJniObject v5.4.0-rc1
Christian Strømme [Wed, 5 Nov 2014 19:56:08 +0000 (20:56 +0100)]
Fix use of va_list in QAndroidJniObject

va_list functions where update to work on x86 where va_list is defined
as char*.

Change-Id: If1286a36d766b8536ca9a83ca21791d30b7b307c
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
3 years agoDoc: document Qt Notification example
Leena Miettinen [Mon, 13 Oct 2014 14:22:30 +0000 (16:22 +0200)]
Doc: document Qt Notification example

Change-Id: I31500a15f61ab4aecba623fed4cbeeb9292520cf
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
3 years agoFix QAndroidJniObject documentation errors/inconsistencies
Alex Blasche [Mon, 27 Oct 2014 14:26:06 +0000 (15:26 +0100)]
Fix QAndroidJniObject documentation errors/inconsistencies

Change-Id: Ica7189c104d239183cf976956bfa63bd666424ab
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
3 years agoMerge remote-tracking branch 'origin/5.4' into dev
Frederik Gladhorn [Mon, 20 Oct 2014 17:12:02 +0000 (19:12 +0200)]
Merge remote-tracking branch 'origin/5.4' into dev

Change-Id: I427a8b159440fa8a01dfb2267215cb83b2524a79

3 years agoUpdate Qt icon used in the example
Topi Reinio [Wed, 15 Oct 2014 08:39:45 +0000 (10:39 +0200)]
Update Qt icon used in the example

Change-Id: Ic5cecb60b2dc600cbbe7d7e6ab31a505c8ba1b26
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
3 years agoMerge remote-tracking branch 'origin/5.4' into dev
Frederik Gladhorn [Thu, 9 Oct 2014 15:56:47 +0000 (17:56 +0200)]
Merge remote-tracking branch 'origin/5.4' into dev

Change-Id: Idacb25616e545fe9126151599c3419017c5b0641

3 years agoMerge remote-tracking branch 'origin/5.3' into 5.4 v5.4.0-beta1
Frederik Gladhorn [Tue, 16 Sep 2014 13:31:51 +0000 (15:31 +0200)]
Merge remote-tracking branch 'origin/5.3' into 5.4

Conflicts:
.qmake.conf

Change-Id: I96c28eff39225f312a37be76d31054a81fc3fa41

3 years agoBump version 5.3
Frederik Gladhorn [Fri, 29 Aug 2014 09:33:20 +0000 (11:33 +0200)]
Bump version

Change-Id: Ibaf5e0f160e453ebb5839b2740e62c9021336dc6

3 years agoMerge remote-tracking branch 'origin/5.4' into dev
Frederik Gladhorn [Thu, 28 Aug 2014 15:49:29 +0000 (17:49 +0200)]
Merge remote-tracking branch 'origin/5.4' into dev

Change-Id: Ia91960b1d742fe030e13d6554839cfc8f5d0490b

3 years agoUpdate license headers and add new licenses v5.4.0-alpha1
Jani Heikkinen [Wed, 20 Aug 2014 11:04:01 +0000 (14:04 +0300)]
Update license headers and add new licenses

- Renamed LICENSE.LGPL to LICENSE.LGPLv21
- Added LICENSE.LGPLv3 & LICENSE.GPLv2
- Removed LICENSE.GPL

Change-Id: Iad800f28f4e85e3f00512400ed9c5ed196c5097a
Reviewed-by: Antti Kokko <antti.kokko@digia.com>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com>
3 years agoBump version
Oswald Buddenhagen [Sat, 9 Aug 2014 19:28:01 +0000 (21:28 +0200)]
Bump version

Change-Id: Ib4886cbae2238a923807f79afa0cf1267fa03d29

3 years agoDoc: Removing url variable from qdocconf file.
Jerome Pasion [Fri, 4 Jul 2014 12:41:35 +0000 (14:41 +0200)]
Doc: Removing url variable from qdocconf file.

-url inherited from the url variable set in qtbase/doc/global

Change-Id: I2064a47e17a56636586f6c69b1630781cf6f0aaa
Reviewed-by: Martin Smith <martin.smith@digia.com>
3 years agoMerge remote-tracking branch 'origin/5.3' into dev
Frederik Gladhorn [Thu, 26 Jun 2014 15:19:56 +0000 (17:19 +0200)]
Merge remote-tracking branch 'origin/5.3' into dev

Conflicts:
.qmake.conf

Change-Id: I4c0a9ad9d5e5a28f9faf572279344d86af69fb4c

3 years agoBump version 5.3.2 v5.3.2
Oswald Buddenhagen [Tue, 17 Jun 2014 22:27:30 +0000 (00:27 +0200)]
Bump version

Change-Id: Ie10b08a7ab02b7c73e22159894e60ea2d490c1fa

3 years agoMerge remote-tracking branch 'origin/stable' into dev
Frederik Gladhorn [Thu, 8 May 2014 22:46:38 +0000 (00:46 +0200)]
Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
.qmake.conf

Change-Id: I1ddc8586418c2d6915481c27d95dfa331c32738a

3 years agoMerge remote-tracking branch 'origin/release' into stable v5.3.1
Frederik Gladhorn [Thu, 1 May 2014 10:42:53 +0000 (12:42 +0200)]
Merge remote-tracking branch 'origin/release' into stable

Change-Id: I7b83f2a71649fa83d35aad557aebc0468e4a6763

3 years agoDoc: Improved example documentation. v5.3.0 v5.3.0-rc1
Jerome Pasion [Wed, 16 Apr 2014 10:32:47 +0000 (12:32 +0200)]
Doc: Improved example documentation.

-added information about running the example (using \include)
-updated copyright year
-added link to relevant pages

Task-number: QTBUG-33597
Change-Id: I58885677f365b31ad40b999b1c0d6acb491d31df
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
3 years agoBump MODULE_VERSION to 5.3.1
Sergio Ahumada [Thu, 17 Apr 2014 15:02:20 +0000 (17:02 +0200)]
Bump MODULE_VERSION to 5.3.1

Change-Id: If0b02389ef93650cb2e1b4b9e3bb6228097b5fea
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
3 years agoMerge remote-tracking branch 'origin/stable' into dev
Frederik Gladhorn [Mon, 24 Mar 2014 15:04:55 +0000 (16:04 +0100)]
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I449d9dbfbef42fc9a8e8814b0b2f0f360d6bac22

3 years agoUpdate the AndroidManifest v5.3.0-beta1
Christian Strømme [Thu, 20 Mar 2014 12:34:10 +0000 (13:34 +0100)]
Update the AndroidManifest

The old AndroidManifest included the splash screen resource that was
removed in commit 4d08d80be60af14c5daed7c6f8d37538aea6c429@qtbase

Task-number: QTBUG-37523

Change-Id: I42dab93e2654f3fc47bb715f7cfdf21169aa8f11
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
3 years agoAdd test for isClassAvailable()
Christian Strømme [Mon, 17 Mar 2014 15:24:55 +0000 (16:24 +0100)]
Add test for isClassAvailable()

Change-Id: Id9eac4df2651d8f53288071526740e127116ad0f
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
3 years agoFix documentation for QAndroidJniObject
Christian Strømme [Thu, 20 Feb 2014 13:43:29 +0000 (14:43 +0100)]
Fix documentation for QAndroidJniObject

QDoc does not differentiate between the templated and non-templated
versions of the same function.

Change-Id: Ifa5cfcf0780c267e996a64fd76581032126f0247
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
Reviewed-by: Martin Smith <martin.smith@digia.com>
3 years agoFix typo
Sergio Ahumada [Mon, 3 Mar 2014 16:13:51 +0000 (17:13 +0100)]
Fix typo

Change-Id: I4a5485c38897a3bc338ef015c08e6177e871ab26
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
3 years agoMerge remote-tracking branch 'origin/stable' into dev
Frederik Gladhorn [Mon, 24 Feb 2014 19:00:23 +0000 (20:00 +0100)]
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I354b2d1300dd3dfb2370acb6369aeb4ff38fcb8e

3 years agoFix includes in qandroidactivityresultreceiver.h v5.3.0-alpha1
Christian Strømme [Fri, 21 Feb 2014 16:07:52 +0000 (17:07 +0100)]
Fix includes in qandroidactivityresultreceiver.h

Change-Id: I14589f095226ec35af74d9355ecfb0a035ea0525
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
3 years agoAdd QAndroidActivityResultReceiver to the documentation.
Christian Strømme [Mon, 17 Feb 2014 11:53:57 +0000 (12:53 +0100)]
Add QAndroidActivityResultReceiver to the documentation.

QAndroidActivityResultReceiver was missing the \inmodule command and
was therefore not shown in the class list.

Change-Id: Ide0670e7ff377420e9690b6ff5421bf5fe0d96e3
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
3 years agoBump module version to 5.4.0
Thiago Macieira [Wed, 19 Feb 2014 20:20:47 +0000 (12:20 -0800)]
Bump module version to 5.4.0

Change-Id: Ic8f41f1f365ded474668c1ec8658bd75239269a9
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
3 years agoAdd API for starting intents
Eskil Abrahamsen Blomfeldt [Fri, 14 Feb 2014 14:07:25 +0000 (15:07 +0100)]
Add API for starting intents

We need an API for this, because otherwise it would be
impossible to start intents and get results from them
without having access to the application's activities.
For third-party libraries etc., this is required.

When we define a public Java API, we will implement a similar
API there, so that applications can also start intents from
Java code without worrying about collisions with third-party
add-ons.

[ChangeLog][Intents] Introduced API to launch intents.

Change-Id: Ic3bbfbbaced3278c2ee970e74cba2997d5d867c4
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
3 years agoAdd non-template version of QAndroidJniObject::object()
Christian Strømme [Thu, 13 Feb 2014 10:43:41 +0000 (11:43 +0100)]
Add non-template version of QAndroidJniObject::object()

In many cases we just want the jobject, this removes the need
to add the template type.

Change-Id: Iac5d8eab2b784908201baa8a05b126b4e7e5c86f
Reviewed-by: BogDan Vatra <bogdan@kde.org>
3 years agoAdd non-templated versions of get[Static]ObjectField()
Christian Strømme [Mon, 10 Feb 2014 17:09:15 +0000 (18:09 +0100)]
Add non-templated versions of get[Static]ObjectField()

Ideally the getStaticObjectField() and getObjectField() methods, that
take a signature, should never have been templated. Removing the
templated versions now will cause ABI breakage, so the only solution
is to add new non-templated versions.

Change-Id: I2f6e9f259b7bc511ef5bcaeb8a2077b0f267b8c8
Reviewed-by: BogDan Vatra <bogdan@kde.org>
3 years agoAdd API to get the Android API level
Christian Strømme [Thu, 30 Jan 2014 12:32:02 +0000 (13:32 +0100)]
Add API to get the Android API level

The Android SDK version, or API level, is commonly used to determine
what APIs are available at runtime.

[ChangeLog][QtAndroidExtras] Added convenience method for getting the
Android SDK version.

Change-Id: Ic20322f68bc9680aec9e1c8404583462063904db
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
3 years agoAdd new method to get the main Android activity.
Christian Strømme [Thu, 30 Jan 2014 12:16:03 +0000 (13:16 +0100)]
Add new method to get the main Android activity.

There were no public APIs the user could use to get access to
their applications main activity, and thus far the only solution have
been to access undocumented and private APIs.

[ChangeLog][QtAndroidExtras] Added functionality to get the Android main
activity.

Change-Id: Ifd4121e8bc643360ed7a7038ffae9e872b59db71
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
3 years agoMerge remote-tracking branch 'origin/stable' into dev
Frederik Gladhorn [Mon, 27 Jan 2014 17:53:09 +0000 (18:53 +0100)]
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I904858b3d308c48caaa05c0fba6ce687f5856589

3 years agoFix for some typos in the QAndroidJniObject documentation. old/5.2
Christian Strømme [Fri, 10 Jan 2014 10:17:53 +0000 (11:17 +0100)]
Fix for some typos in the QAndroidJniObject documentation.

qualified was misspelled "qulified".

Change-Id: Ie38ec999f0c3b7146cc52c9a28c2a82d5d007355
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
3 years agoMerge remote-tracking branch 'origin/stable' into dev
Frederik Gladhorn [Fri, 17 Jan 2014 16:10:15 +0000 (17:10 +0100)]
Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
.qmake.conf

Change-Id: I4e0d842ffc1a5d3cfd9fd9feca100083d666334d

3 years agoBump MODULE_VERSION to 5.2.2
Sergio Ahumada [Wed, 15 Jan 2014 21:48:24 +0000 (22:48 +0100)]
Bump MODULE_VERSION to 5.2.2

Change-Id: I8af99d8908a97fe4674ff1b6d76647857ab23b4a
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
3 years agoMerge remote-tracking branch 'origin/stable' into dev
Frederik Gladhorn [Mon, 16 Dec 2013 14:33:14 +0000 (15:33 +0100)]
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I50a0d452171d0940fe08b3816ca7386decf30d85

3 years agoDoc: Updated the qdocconf to include .java files
Venu [Thu, 12 Dec 2013 15:46:14 +0000 (16:46 +0100)]
Doc: Updated the qdocconf to include .java files

QDoc ignores the .java files without the following entry in the
qdocconf:
examples.fileextensions += *.java

Java files are not part of the default set of file types included
by Qdoc. So there must be an entry in the qdocconf to force Qdoc
to include additional file types such as the .java files.

Task-number: QTBUG-35568
Change-Id: Ic8b805e0dec937fb0e8b19f0b94883ced5eb6c04
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
Reviewed-by: Nico Vertriest <nico.vertriest@digia.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
3 years agoFix non-compiling doc snippets.
Alex Blasche [Thu, 12 Dec 2013 13:12:08 +0000 (14:12 +0100)]
Fix non-compiling doc snippets.

Change-Id: I0e5160f18f89ed25882741d93410ea1860ed659a
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
3 years agoRemove stray curly bracket in QAndroidJniObject's documentation.
Christian Strømme [Thu, 12 Dec 2013 16:14:22 +0000 (17:14 +0100)]
Remove stray curly bracket in QAndroidJniObject's documentation.

The bracket was misplaced in a very unfortunate place.

Change-Id: Id2f0f96cc49689cb6c656757ddae6690ff1da0d2
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
4 years agoMerge remote-tracking branch 'origin/stable' into dev
Frederik Gladhorn [Fri, 29 Nov 2013 15:02:03 +0000 (16:02 +0100)]
Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
.qmake.conf

Change-Id: I62d3973ca824120806281d58a9ba2de6dd2a32e4

4 years agoMerge remote-tracking branch 'origin/release' into stable
Frederik Gladhorn [Tue, 26 Nov 2013 09:51:21 +0000 (10:51 +0100)]
Merge remote-tracking branch 'origin/release' into stable

Change-Id: I3e500fcdf0bf7a04bdd753ceae5626ab8a443e17

4 years agoBump MODULE_VERSION to 5.2.1
Sergio Ahumada [Mon, 25 Nov 2013 11:44:23 +0000 (12:44 +0100)]
Bump MODULE_VERSION to 5.2.1

Change-Id: Ia63c89e456f240d5a17be551af815d42cbb42aeb
Reviewed-by: Matti Paaso <matti.paaso@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
4 years agoAdd examplesinstallpath in qdocconf v5.2.0 v5.2.0-rc1
Christian Strømme [Mon, 18 Nov 2013 18:21:40 +0000 (19:21 +0100)]
Add examplesinstallpath in qdocconf

If we don't add examplesinstallpath the examples won't be shown in
Qt Creator's welcome page.

Change-Id: Ia1c0015262e4dd3c6de83d7d73231e3e3e0cf027
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
4 years agoFix license headers in example
Eskil Abrahamsen Blomfeldt [Wed, 20 Nov 2013 10:02:37 +0000 (11:02 +0100)]
Fix license headers in example

It's a part of QtAndroidExtras not QtWinExtras.

Change-Id: I095d39e69dcd1c5362aa50a9e71a29e024fdab38
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
4 years agoUpdate AndroidManifest.xml in example
Eskil Abrahamsen Blomfeldt [Tue, 12 Nov 2013 07:58:58 +0000 (08:58 +0100)]
Update AndroidManifest.xml in example

This no longer compiled because it was an old version. I guess we
have to be very careful when updating the structure of
AndroidManifest.xml after the release.

Task-number: QTBUG-34763
Change-Id: I32dfe11c83eff42a50b54327fab6d4c5d05b0829
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
4 years agoMerge remote-tracking branch 'origin/stable' into dev
Sergio Ahumada [Fri, 8 Nov 2013 17:06:39 +0000 (18:06 +0100)]
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Ib8d267887ca6c11067a94812f9f4ac0151c1113f

4 years agoFix note about jni references in documentation.
Christian Strømme [Tue, 5 Nov 2013 14:12:56 +0000 (15:12 +0100)]
Fix note about jni references in documentation.

QAndroidJniObject does not manage user created references regardless
of them being local or global refs.

Change-Id: I4afa8aba8d53f35d83d36758946d4b0f0cb5734a
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
4 years agoFix bug in code snippet.
Christian Strømme [Tue, 5 Nov 2013 13:53:55 +0000 (14:53 +0100)]
Fix bug in code snippet.

We should set a good example by deleting local refs. as soon as we are
done with, also in our own examples...

Change-Id: Ib9b25b226d79532c137e1c404625840ffd3cdf6e
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
4 years agoDoc: Updated url variable in qdocconf files.
Jerome Pasion [Tue, 5 Nov 2013 12:11:38 +0000 (13:11 +0100)]
Doc: Updated url variable in qdocconf files.

In 5.2, the HTML output is in a flatter structure and when they are
hosted in qt-project.org/doc, the documentation will be found at
http://qt-project.org/doc/qt-$QT_VER

The url variable is used by projects outside of Qt 5 which need
to link to Qt 5 documentation, such as Qt Creator.

Task-number: QTBUG-34584
Change-Id: If3b2ef1bec1805e5f6bf14c8468126e4160e0ed0
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
4 years agoUpdate documentation
Christian Strømme [Fri, 27 Sep 2013 14:25:02 +0000 (16:25 +0200)]
Update documentation

- The list of examples was not showing in the index page.
- Added information about types, method signatures, J2N and GC.
- Fixed some typos.

Change-Id: Ibe66ddbc0b1cac323563d629ca82bfe54d69dfc1
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
4 years agoRemoved JNI_OnLoad() as it's no longer needed. v5.2.0-beta1
Christian Strømme [Fri, 11 Oct 2013 13:09:42 +0000 (15:09 +0200)]
Removed JNI_OnLoad() as it's no longer needed.

Change-Id: I568576b0ec5d9c81a59dca21f43a8c7ce8f6bef1
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
4 years agoMerge branch 'stable' into dev
Sergio Ahumada [Tue, 15 Oct 2013 09:57:12 +0000 (11:57 +0200)]
Merge branch 'stable' into dev

Change-Id: I483aac84fe5826f8f9b789385068cee3e16069f0

4 years agoRename QJNIXxx classes to QAndroidJniXxx.
Christian Strømme [Tue, 8 Oct 2013 15:42:41 +0000 (17:42 +0200)]
Rename QJNIXxx classes to QAndroidJniXxx.

The old classes where not following the usual convention for acronyms
in class names.

Change-Id: I2fad72483c51ca95a2703d914d6a678c5f7cde98
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
4 years agoDoc: Adding "qtdoc" to the depends qdocconf variable.
Jerome Pasion [Tue, 8 Oct 2013 08:57:20 +0000 (10:57 +0200)]
Doc: Adding "qtdoc" to the depends qdocconf variable.

Needed in order to link to the main Qt 5.2 documentation.

Change-Id: I451f4d60f165befe179cfe58904876c42211cfee
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
Reviewed-by: Martin Smith <martin.smith@digia.com>
4 years agoTest the generated cmake files.
Stephen Kelly [Tue, 1 Oct 2013 14:42:59 +0000 (16:42 +0200)]
Test the generated cmake files.

Change-Id: I4eafa7366a36d8444392b476d6262e54d67893bf
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
4 years agoUpdate the git-archive export options
Sergio Ahumada [Fri, 27 Sep 2013 14:18:15 +0000 (16:18 +0200)]
Update the git-archive export options

The .gitattributes, .gitignore, .commit-template files do not need to be
present in packaged sources, as they are for people using the Git
repository.  People who download tarballs usually don't reimport into
Git -- they should just download the actual repositories.

Meanwhile, the .tag file is quite useful. Instead of making Git extract
to the useless SHA-1 of the "$Id$\n" string, ask git-archive to store
the SHA-1 of the commit being packaged.

Change-Id: I4ad0ed39c84555447161511f257f7768d38d2173
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
4 years agoDoc: Enable running 'make docs' on non-android platforms
Topi Reinio [Wed, 25 Sep 2013 10:28:41 +0000 (12:28 +0200)]
Doc: Enable running 'make docs' on non-android platforms

Change-Id: I26389a48912475598946cdfa839d09432a6c364a
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
4 years agoRemove JNI_OnLoad() from the example. v5.2.0-alpha1
Christian Strømme [Wed, 25 Sep 2013 10:06:03 +0000 (12:06 +0200)]
Remove JNI_OnLoad() from the example.

We use the class loader to get the files

Change-Id: I5268dbda5f17c1dfc7332fec35e6da033090605f
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
4 years agoAdd missing files for example
Eskil Abrahamsen Blomfeldt [Wed, 25 Sep 2013 10:25:45 +0000 (12:25 +0200)]
Add missing files for example

I forgot to commit the icon.png and the documentation file

Change-Id: Id874a7441ba4ea2591a46cca59bc1320ad35e869
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
4 years agoCheck for the qml module before building the notification example.
Christian Strømme [Wed, 25 Sep 2013 12:51:05 +0000 (14:51 +0200)]
Check for the qml module before building the notification example.

Change-Id: I5cfcc26b196fe1f5d8d9bd647cad652a3eec5dae
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
4 years agoMerge branch 'stable' into dev
Sergio Ahumada [Wed, 25 Sep 2013 12:05:31 +0000 (14:05 +0200)]
Merge branch 'stable' into dev

Change-Id: I28fb94a832b11fab73d1a587673da6ebe015dc5b

4 years agoBump qtandroidextras version to 5.3.0
Sergio Ahumada [Tue, 24 Sep 2013 18:50:25 +0000 (20:50 +0200)]
Bump qtandroidextras version to 5.3.0

Change-Id: I6b9ba773a3ac4e650e008d5af11a2be1d19aaf8a
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
4 years agoFix infinite recursion in QJNIObject::getStaticField<jfloat>()
Eskil Abrahamsen Blomfeldt [Mon, 23 Sep 2013 18:16:23 +0000 (20:16 +0200)]
Fix infinite recursion in QJNIObject::getStaticField<jfloat>()

Change-Id: I4e22a43bb689f46c5fb294da9d55671a28cab4cf
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
4 years agoAdded QJNIObject auto test.
Yoann Lopes [Mon, 23 Sep 2013 19:48:07 +0000 (21:48 +0200)]
Added QJNIObject auto test.

Change-Id: If1a72842165f20b84589d61885e5dc1902a8d171
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
4 years agoAdded QJNIEnvironment auto test.
Yoann Lopes [Mon, 23 Sep 2013 18:06:52 +0000 (20:06 +0200)]
Added QJNIEnvironment auto test.

Change-Id: I19aa638668ac8b4f263047d1e636d86abb73b91e
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
4 years agoImprove documentation.
Christian Strømme [Mon, 23 Sep 2013 14:13:42 +0000 (16:13 +0200)]
Improve documentation.

Change-Id: Ia3999f853aa9b0ca1678f322419ddd200cae4b1a
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
4 years agoAdd example of JNI API
Eskil Abrahamsen Blomfeldt [Mon, 23 Sep 2013 13:40:40 +0000 (15:40 +0200)]
Add example of JNI API

This example adds a custom class to the project and calls into
it with JNI to set a notification message in the status area.

Change-Id: I74d7a87c0511b98608422788c1c282e9af57c074
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
4 years agoUpdate Licenses from qtbase#stable
Sergio Ahumada [Mon, 23 Sep 2013 12:49:43 +0000 (14:49 +0200)]
Update Licenses from qtbase#stable

Change-Id: Ia8b043f2d10b621eaa725a82da91adfd0779dc11
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
4 years agoAdd guard to disable other platforms then Android
Christian Strømme [Mon, 23 Sep 2013 11:21:52 +0000 (13:21 +0200)]
Add guard to disable other platforms then Android

Change-Id: If3efdd6e24dfc12b0baade98fd8d7538c5ff94b6
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
4 years agoAdd Qt JNI API.
Christian Strømme [Thu, 19 Sep 2013 10:33:56 +0000 (12:33 +0200)]
Add Qt JNI API.

The QJNI API's provide an easy way to communicate with Java API's from
C++. The API consists of two classes, QJNIObject which acts as a wrapper
around Java classes and QJNIEnvironment which attaches the current
thread to the Java VM and exposes the Java Native Interface.

Change-Id: I9cdc395249de74f940b75eab9f2bd32347d5d432
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
4 years agoInitial empty repository
Sergio Ahumada [Thu, 19 Sep 2013 08:24:37 +0000 (10:24 +0200)]
Initial empty repository