aboutsummaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* Fix QAndroidJniEnvironment testChristian Strømme2019-06-281-3/+4
| | | | | | | | | | The QAndroidJniEnvironment class does not detach when it goes out of scope. Detaching will only happen if explicitly done, or if the thread we attached on dies. Fixes: QTBUG-73570 Change-Id: Iac749c7f3bf8fcee99f70c06123eb3c88315e261 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-02-151-0/+1
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I4497150a68daf85260a55a6539f5ed178b55a725
| * actually build any testsv5.6.0-rc1Oswald Buddenhagen2015-12-181-0/+1
| | | | | | | | | | | | Change-Id: I71a51bc01dd387b30542a773e85dae4c4daf44c0 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
* | Helper functions needed to run Runnables on Android UI thread easily.BogDan Vatra2016-02-051-0/+51
| | | | | | | | | | | | | | | | | | Add two function to allow the users to easily run (a)synchronously Runnables from any thread directly to Andoroid UI thread. These functions are useful to create java controls and to access their methods, which must done on Android UI thread. Change-Id: Iec5437321e6136cc90268cc7ecf091f82fc4cdd3 Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
* | Updated license headersAntti Kokko2016-01-204-68/+48
| | | | | | | | | | | | | | | | | | | | | | From Qt 5.7 -> tools & applications are lisenced under GPL v3 with some exceptions, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new GPL-EXCEPT header instead of LGPL21 one (in those files which will be under GPL 3 with exceptions) Change-Id: I78924c12ed8183c0f5eae548eb4850292fd56cb4 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | Add fromLocalRef() to QAndroidJniObjectChristian Strømme2015-09-181-0/+9
|/ | | | | | | | | This makes it more convenient to transfer the ownership of the local JNI reference to QAndroidJniObject. Before this change user would need to manually delete the local ref. after creating a QAndroidJniObject. Change-Id: Iebae7829773d1b783dc0982de92c51b4c6b0abd1 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Update copyright headersJani Heikkinen2015-02-124-28/+28
| | | | | | | | | 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>
* Complete test of all QAndroidJniObjects JNI types.Christian Strømme2015-01-223-0/+517
| | | | | | | | | | 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>
* Update license headers and add new licensesv5.4.0-alpha1Jani Heikkinen2014-08-243-56/+32
| | | | | | | | | | - 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>
* Add test for isClassAvailable()Christian Strømme2014-03-201-0/+8
| | | | | Change-Id: Id9eac4df2651d8f53288071526740e127116ad0f Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Add non-template version of QAndroidJniObject::object()Christian Strømme2014-02-131-0/+2
| | | | | | | | 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>
* Add non-templated versions of get[Static]ObjectField()Christian Strømme2014-02-131-3/+19
| | | | | | | | | | 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>
* Add API to get the Android API levelChristian Strømme2014-02-071-0/+6
| | | | | | | | | | | 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>
* Add new method to get the main Android activity.Christian Strømme2014-02-073-1/+67
| | | | | | | | | | | | 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>
* Removed JNI_OnLoad() as it's no longer needed.v5.2.0-beta1Christian Strømme2013-10-163-48/+11
| | | | | Change-Id: I568576b0ec5d9c81a59dca21f43a8c7ce8f6bef1 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Rename QJNIXxx classes to QAndroidJniXxx.Christian Strømme2013-10-108-169/+169
| | | | | | | | | 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>
* Test the generated cmake files.Stephen Kelly2013-10-023-0/+22
| | | | | Change-Id: I4eafa7366a36d8444392b476d6262e54d67893bf Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Added QJNIObject auto test.Yoann Lopes2013-09-233-1/+736
| | | | | Change-Id: If1a72842165f20b84589d61885e5dc1902a8d171 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Added QJNIEnvironment auto test.Yoann Lopes2013-09-233-2/+118
| | | | | Change-Id: I19aa638668ac8b4f263047d1e636d86abb73b91e Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Add Qt JNI API.Christian Strømme2013-09-202-0/+3
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>