aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Doc: Update examplesinstallpath to include the repository namev5.6.0-beta1Topi Reinio2015-10-211-3/+1
| | | | | | | | | | | | The examplesinstallpath variable in .qdocconf files defines the path under QT_INSTALL_EXAMPLES where examples are found. To match the way examples are packaged in Qt 5.6, prefix the install path with the repository name. Task-number: QTBUG-48736 Change-Id: I4bc22773d7528fa6ffbb128b70c6708eceffcced Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* Merge remote-tracking branch 'origin/5.5' into 5.6v5.6.0-alpha1Liang Qi2015-08-212-0/+688
|\ | | | | | | Change-Id: I8ddff668f1bbdaa032b365dac93b116cc86a3707
| * Merge remote-tracking branch 'origin/5.4' into 5.5v5.5.15.5Liang Qi2015-08-190-0/+0
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Id1e361a9a0ce78700acd839a0411d608ab15a442
| | * Bump version5.4Oswald Buddenhagen2015-04-201-1/+1
| | | | | | | | | | | | Change-Id: I8991adb646448b6c75ca8dc497b0d19734c4861d
| * | Add the GPLv3 license textThiago Macieira2015-08-132-0/+688
| | | | | | | | | | | | | | | | | | | | | LGPLv3 refers to it but does not include it in its body. Change-Id: Ib056b47dde3341ef9a52ffff13eed18cf3504738 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.5' into devFrederik Gladhorn2015-08-091-1/+1
|\| | | | | | | | | | | Change-Id: I511a4d0098913e0081c491f75d997a5aa6c85214
| * | Doc: fix missing comma in sample codeSamuel Gaist2015-08-031-1/+1
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-44114 Change-Id: I0a43a2da13fdcd3d18caf87628a7f13f4685ecc6 Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
* | | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-06-292-15/+49
|\| | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I6ab9e89b0a89d5843da5eb43b62b5d32dc8c9ac7
| * | Bump versionOswald Buddenhagen2015-06-291-1/+1
| | | | | | | | | | | | Change-Id: If2bb90a0a69ee915c267ff850799f858ff140f34
| * | Add Changes file for the 5.5.0 releasev5.5.0-rc1v5.5.0Christian Strømme2015-06-081-0/+26
| | | | | | | | | | | | | | | Change-Id: Ieb4e08de7677f51031e16e7a21beab6f93f08d1e Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * | Mark deprecated functions with QT_DEPRECATED.v5.5.0-beta1Christian Strømme2015-03-191-15/+23
| | | | | | | | | | | | | | | | | | | | | This makes it clear that the functions are going away. Change-Id: Ia93d3be4b70541bdf3bf800ebb85ad88d44b475d Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-03-171-30/+0
|\| | | | | | | | | | | Change-Id: I110c2737eab4b310ebcc6c245808fc032db61677
| * | Doc: Remove unused documentation for comparison overloadsv5.5.0-alpha1Sergio Ahumada2015-03-061-30/+0
| | | | | | | | | | | | | | | | | | | | | | | | this change amends 4eb51def Change-Id: I4bcbee03ba4ba44ad05db0b7bd38c208ff9d4e5a Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | | Merge remote-tracking branch 'origin/5.5' into devFrederik Gladhorn2015-03-031-21/+7
|\| | | | | | | | | | | Change-Id: Ifd8c88ba8084f0141238d0cefcf0a3aebba43edd
| * | Fix comparison overloads.Christian Strømme2015-03-021-21/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Bump versionOswald Buddenhagen2015-02-241-1/+1
|/ / | | | | | | Change-Id: Ibcb3c61d72122e656e59cc7d9b139d58d2d45ad4
* | Fixed BSD licensed file headersJani Heikkinen2015-02-172-6/+6
| | | | | | | | | | Change-Id: I8fc57754926b441c8d6cb81e25ea09a5eb3029a5 Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2015-02-130-0/+0
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I34c07ac0a2c0c01501f0cd095542e266ef456607
| * Bump versionv5.4.2Oswald Buddenhagen2015-01-161-1/+1
| | | | | | | | Change-Id: I18abcd802451d438d9cfa90bfde4f68dfd411089
* | Update copyright headersJani Heikkinen2015-02-1229-174/+174
| | | | | | | | | | | | | | | | | | 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>
* | Android: Add more convenience types to QAndroidJniObject.Christian Strømme2015-01-111-39/+267
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Add missing methodChristian Strømme2015-01-111-0/+6
| | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-12-171-0/+26
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ibbb51f63638ab198ebeae20bcc6fc7378378e1c4
| * 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
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-11-212-36/+92
|\| | | | | | | Change-Id: Ie41284439a6f89e231837e2e50d1624c3cf7f37f
| * 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>
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-10-201-0/+0
|\| | | | | | | Change-Id: I427a8b159440fa8a01dfb2267215cb83b2524a79
| * 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.4' into devFrederik Gladhorn2014-10-090-0/+0
|\| | | | | | | Change-Id: Idacb25616e545fe9126151599c3419017c5b0641
| * 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
* | | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-08-2822-1020/+667
|\| | | | | | | | | | | Change-Id: Ia91960b1d742fe030e13d6554839cfc8f5d0490b
| * | 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>
* | | Bump versionOswald Buddenhagen2014-08-091-1/+1
|/ / | | | | | | Change-Id: Ib4886cbae2238a923807f79afa0cf1267fa03d29
* | 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-26 15:34:24 +0000