aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Bump version5.4Oswald Buddenhagen2015-04-201-1/+1
| | | | Change-Id: I8991adb646448b6c75ca8dc497b0d19734c4861d
* Bump versionv5.4.2Oswald Buddenhagen2015-01-161-1/+1
| | | | Change-Id: I18abcd802451d438d9cfa90bfde4f68dfd411089
* Merge remote-tracking branch 'origin/5.4.0' into 5.4v5.4.1Frederik Gladhorn2014-12-171-0/+26
|\ | | | | | | Change-Id: I65d2e0e2133399fd279210958918bc64ca9c94f6
| * Add Qt 5.4.0 changelog for QtAndroidExtrasv5.4.0Alex Blasche2014-12-041-0/+26
| | | | | | | | | | Change-Id: I5e5d1869d0a04f8e190181949bc1975de7c03938 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Bump versionOswald Buddenhagen2014-12-121-1/+1
|/ | | | Change-Id: Ie2dc060c2cb154a1225406f32f392821d0888353
* Fix use of va_list in QAndroidJniObjectv5.4.0-rc1Christian Strømme2014-11-061-32/+34
| | | | | | | | 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>
* Doc: document Qt Notification exampleLeena Miettinen2014-11-041-0/+54
| | | | | | Change-Id: I31500a15f61ab4aecba623fed4cbeeb9292520cf Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Fix QAndroidJniObject documentation errors/inconsistenciesAlex Blasche2014-10-281-4/+4
| | | | | Change-Id: Ica7189c104d239183cf976956bfa63bd666424ab Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Update Qt icon used in the exampleTopi Reinio2014-10-151-0/+0
| | | | | | Change-Id: Ic5cecb60b2dc600cbbe7d7e6ab31a505c8ba1b26 Reviewed-by: Christian Stromme <christian.stromme@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* Merge remote-tracking branch 'origin/5.3' into 5.4v5.4.0-beta1Frederik Gladhorn2014-09-160-0/+0
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I96c28eff39225f312a37be76d31054a81fc3fa41
| * Bump version5.3Frederik Gladhorn2014-08-291-1/+1
| | | | | | | | Change-Id: Ibaf5e0f160e453ebb5839b2740e62c9021336dc6
* | Update license headers and add new licensesv5.4.0-alpha1Jani Heikkinen2014-08-2422-1020/+667
| | | | | | | | | | | | | | | | | | | | - 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>
* | Doc: Removing url variable from qdocconf file.Jerome Pasion2014-07-071-1/+0
| | | | | | | | | | | | | | -url inherited from the url variable set in qtbase/doc/global Change-Id: I2064a47e17a56636586f6c69b1630781cf6f0aaa Reviewed-by: Martin Smith <martin.smith@digia.com>
* | Merge remote-tracking branch 'origin/5.3' into devFrederik Gladhorn2014-06-260-0/+0
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I4c0a9ad9d5e5a28f9faf572279344d86af69fb4c
| * Bump versionv5.3.2Oswald Buddenhagen2014-06-181-1/+1
| | | | | | | | Change-Id: Ie10b08a7ab02b7c73e22159894e60ea2d490c1fa
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-05-091-1/+5
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I1ddc8586418c2d6915481c27d95dfa331c32738a
| * 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>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-03-246-6/+59
|\| | | | | | | Change-Id: I449d9dbfbef42fc9a8e8814b0b2f0f360d6bac22
| * 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>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-02-242-2/+1
|\| | | | | | | Change-Id: I354b2d1300dd3dfb2370acb6369aeb4ff38fcb8e
| * 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>
* | Bump module version to 5.4.0Thiago Macieira2014-02-201-1/+1
|/ | | | | | Change-Id: Ic8f41f1f365ded474668c1ec8658bd75239269a9 Reviewed-by: Sergio Ahumada <sahumada@blackberry.com> Reviewed-by: Lars Knoll <lars.knoll@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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-28 14:34:30 +0000