aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Bump version5.3Frederik Gladhorn2014-08-291-1/+1
| | | | Change-Id: Ibaf5e0f160e453ebb5839b2740e62c9021336dc6
* Bump versionv5.3.2Oswald Buddenhagen2014-06-181-1/+1
| | | | Change-Id: Ie10b08a7ab02b7c73e22159894e60ea2d490c1fa
* Merge remote-tracking branch 'origin/release' into stablev5.3.1Frederik Gladhorn2014-05-011-1/+5
|\ | | | | | | Change-Id: I7b83f2a71649fa83d35aad557aebc0468e4a6763
| * Doc: Improved example documentation.v5.3.0-rc1v5.3.0Jerome Pasion2014-04-251-1/+5
| | | | | | | | | | | | | | | | | | | | | | -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>
* | Bump MODULE_VERSION to 5.3.1Sergio Ahumada2014-04-221-1/+1
|/ | | | | Change-Id: If0b02389ef93650cb2e1b4b9e3bb6228097b5fea Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Update the AndroidManifestv5.3.0-beta1Christian Strømme2014-03-201-1/+3
| | | | | | | | | | 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>
* Add test for isClassAvailable()Christian Strømme2014-03-201-0/+8
| | | | | Change-Id: Id9eac4df2651d8f53288071526740e127116ad0f Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Fix documentation for QAndroidJniObjectChristian Strømme2014-03-182-2/+45
| | | | | | | | | | 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>
* Fix typoSergio Ahumada2014-03-031-1/+1
| | | | | Change-Id: I4a5485c38897a3bc338ef015c08e6177e871ab26 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* Fix includes in qandroidactivityresultreceiver.hv5.3.0-alpha1Christian Strømme2014-02-241-2/+2
| | | | | Change-Id: I14589f095226ec35af74d9355ecfb0a035ea0525 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Add QAndroidActivityResultReceiver to the documentation.Christian Strømme2014-02-202-2/+1
| | | | | | | | 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>
* Add API for starting intentsEskil Abrahamsen Blomfeldt2014-02-166-2/+362
| | | | | | | | | | | | | | | | | 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>
* Add non-template version of QAndroidJniObject::object()Christian Strømme2014-02-132-0/+3
| | | | | | | | 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-133-3/+48
| | | | | | | | | | 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-073-0/+18
| | | | | | | | | | | 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-079-5/+209
| | | | | | | | | | | | 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>
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-01-271-2/+2
|\ | | | | | | Change-Id: I904858b3d308c48caaa05c0fba6ce687f5856589
| * Fix for some typos in the QAndroidJniObject documentation.old/5.2Christian Strømme2014-01-271-2/+2
| | | | | | | | | | | | | | | | qualified was misspelled "qulified". Change-Id: Ie38ec999f0c3b7146cc52c9a28c2a82d5d007355 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-01-170-0/+0
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I4e0d842ffc1a5d3cfd9fd9feca100083d666334d
| * Bump MODULE_VERSION to 5.2.2Sergio Ahumada2014-01-161-1/+1
| | | | | | | | | | Change-Id: I8af99d8908a97fe4674ff1b6d76647857ab23b4a Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-12-163-10/+11
|\| | | | | | | Change-Id: I50a0d452171d0940fe08b3816ca7386decf30d85
| * Doc: Updated the qdocconf to include .java filesVenu2013-12-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * Fix non-compiling doc snippets.Alex Blasche2013-12-132-9/+9
| | | | | | | | | | Change-Id: I0e5160f18f89ed25882741d93410ea1860ed659a Reviewed-by: Christian Stromme <christian.stromme@digia.com>
| * Remove stray curly bracket in QAndroidJniObject's documentation.Christian Strømme2013-12-131-1/+1
| | | | | | | | | | | | | | The bracket was misplaced in a very unfortunate place. Change-Id: Id2f0f96cc49689cb6c656757ddae6690ff1da0d2 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-11-298-24/+27
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I62d3973ca824120806281d58a9ba2de6dd2a32e4
| * Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-11-268-24/+27
| |\ | | | | | | | | | Change-Id: I3e500fcdf0bf7a04bdd753ceae5626ab8a443e17
| | * Add examplesinstallpath in qdocconfv5.2.0-rc1v5.2.0Christian Strømme2013-11-211-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * Fix license headers in exampleEskil Abrahamsen Blomfeldt2013-11-215-6/+5
| | | | | | | | | | | | | | | | | | | | | It's a part of QtAndroidExtras not QtWinExtras. Change-Id: I095d39e69dcd1c5362aa50a9e71a29e024fdab38 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
| | * Update AndroidManifest.xml in exampleEskil Abrahamsen Blomfeldt2013-11-122-18/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | Bump MODULE_VERSION to 5.2.1Sergio Ahumada2013-11-251-1/+1
| |/ | | | | | | | | | | Change-Id: Ia63c89e456f240d5a17be551af815d42cbb42aeb Reviewed-by: Matti Paaso <matti.paaso@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devSergio Ahumada2013-11-0810-102/+294
|\| | | | | | | Change-Id: Ib8d267887ca6c11067a94812f9f4ac0151c1113f
| * Fix note about jni references in documentation.Christian Strømme2013-11-071-2/+2
| | | | | | | | | | | | | | | | 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>
| * Fix bug in code snippet.Christian Strømme2013-11-071-2/+3
| | | | | | | | | | | | | | | | 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>
| * Doc: Updated url variable in qdocconf files.Jerome Pasion2013-11-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * Update documentationChristian Strømme2013-10-297-53/+281
| | | | | | | | | | | | | | | | | | | | - 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>
| * 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>
* | Merge branch 'stable' into devSergio Ahumada2013-10-1526-700/+644
|\| | | | | | | Change-Id: I483aac84fe5826f8f9b789385068cee3e16069f0
| * Rename QJNIXxx classes to QAndroidJniXxx.Christian Strømme2013-10-1016-562/+562
| | | | | | | | | | | | | | | | | | 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>
| * Doc: Adding "qtdoc" to the depends qdocconf variable.Jerome Pasion2013-10-081-1/+3
| | | | | | | | | | | | | | | | 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>
| * Test the generated cmake files.Stephen Kelly2013-10-023-0/+22
| | | | | | | | | | Change-Id: I4eafa7366a36d8444392b476d6262e54d67893bf Reviewed-by: Christian Stromme <christian.stromme@digia.com>
| * Update the git-archive export optionsSergio Ahumada2013-09-271-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * Doc: Enable running 'make docs' on non-android platformsTopi Reinio2013-09-261-2/+7
| | | | | | | | | | Change-Id: I26389a48912475598946cdfa839d09432a6c364a Reviewed-by: Christian Stromme <christian.stromme@digia.com>
| * Remove JNI_OnLoad() from the example.v5.2.0-alpha1Christian Strømme2013-09-264-135/+3
| | | | | | | | | | | | | | We use the class loader to get the files Change-Id: I5268dbda5f17c1dfc7332fec35e6da033090605f Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
| * Add missing files for exampleEskil Abrahamsen Blomfeldt2013-09-252-0/+41
| | | | | | | | | | | | | | I forgot to commit the icon.png and the documentation file Change-Id: Id874a7441ba4ea2591a46cca59bc1320ad35e869 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
| * Check for the qml module before building the notification example.Christian Strømme2013-09-251-2/+4
| | | | | | | | | | Change-Id: I5cfcc26b196fe1f5d8d9bd647cad652a3eec5dae Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* | Merge branch 'stable' into devSergio Ahumada2013-09-2532-95/+1653
|\| | | | | | | Change-Id: I28fb94a832b11fab73d1a587673da6ebe015dc5b
| * Fix infinite recursion in QJNIObject::getStaticField<jfloat>()Eskil Abrahamsen Blomfeldt2013-09-231-2/+2
| | | | | | | | | | Change-Id: I4e22a43bb689f46c5fb294da9d55671a28cab4cf Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@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>
| * Improve documentation.Christian Strømme2013-09-237-71/+191
| | | | | | | | | | Change-Id: Ia3999f853aa9b0ca1678f322419ddd200cae4b1a Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-06 04:17:33 +0000