aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-11-261-10/+0
|\ | | | | | | Change-Id: I97c7c7fc4d3b3cd1489a1d056959805cd684fecf
| * Merge remote-tracking branch 'origin/5.6' into 5.75.7Liang Qi2016-11-241-10/+0
| |\ | | | | | | | | | Change-Id: Ib43b28edce5ffad5abdad30b06d717d2a7d66935
| | * remove dependencies from sync.profileOswald Buddenhagen2016-11-051-10/+0
| | | | | | | | | | | | | | | | | | | | | the CI obtains them from the qt5 super repo nowadays. Change-Id: I07ca9907ddf15527804027070f38a9156b93ca6d Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
* | | Merge remote-tracking branch 'origin/5.7' into 5.8v5.8.0-beta1Liang Qi2016-09-185-1689/+0
|\| | | | | | | | | | | Change-Id: Ia2b6356a24b3783af13ed86d48528a81df11061f
| * | Removed unnecessary license filesv5.7.1Jani Heikkinen2016-08-045-1689/+0
| | | | | | | | | | | | | | | Change-Id: Idf9a99c72e98171c323d0df1e123a0039366dbee Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | | Mark this module as Q_FOREACH-freeMarc Mutz2016-09-071-0/+2
| | | | | | | | | | | | | | | Change-Id: I238604bec632fe15791d29955ef57de943a5e334 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | | Add QtAndroid::androidContext()v5.8.0-alpha1Alex Blasche2016-08-042-4/+20
| | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][QtAndroidExtras][QtAndroid] Added QtAndroid::androidContext() Task-number: QTBUG-55102 Change-Id: I95122c8939e227acffb13ea9ba1a338a9d05595a Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-08-027-229/+298
|\| | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I0d8be58f3552d5714faedf586523dc3525ebfaf8
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-016-229/+253
| |\| | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Idbbad4585c05ea7c42c5d60e8b74ec20ca3d8737
| | * Workaround clang buggy explicit specializations function templates exportv5.6.2BogDan Vatra2016-07-191-225/+225
| | | | | | | | | | | | | | | | | | | | | | | | Should be reverted when https://github.com/android-ndk/ndk/issues/34 is fixed Change-Id: Idcc951ff432dbadd57a09851bcb7486b019b3426 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| | * Expand license scope from "Qt GUI Toolkit" to "Qt Toolkit"Sze Howe Koh2016-06-174-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | See http://comments.gmane.org/gmane.comp.lib.qt.devel/25771 Change-Id: I7eb1329e7215b99664b7c59f692de5858858a846 Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| | * Merge remote-tracking branch 'origin/5.6.1' into 5.6Liang Qi2016-06-091-0/+24
| | |\ | | | | | | | | | | | | Change-Id: I315e9fde41e59ec5ad8ec98ad979904af0cbda02
| | | * Add changelog for 5.6.1v5.6.1-1v5.6.1Christian Strømme2016-05-231-0/+24
| | | | | | | | | | | | | | | | | | | | Change-Id: Id11e8627d0ed9b594281f21958bbf7f3f8cdea52 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
| | * | Bump versionOswald Buddenhagen2016-05-191-1/+1
| | |/ | | | | | | | | | Change-Id: I663eafe5e63dd4980a364d7bdfd4d4a15cf8b91d
| * | Bump versionOswald Buddenhagen2016-07-281-1/+1
| | | | | | | | | | | | Change-Id: I5d8cbb97406ed31ea60a35c75809d6e30c081273
| * | Merge remote-tracking branch 'origin/5.7.0' into 5.7Liang Qi2016-06-161-2/+18
| |\ \ | | | | | | | | | | | | Change-Id: I43ddcfab8619ac7c57a1e463f050d8974707001f
| | * | Mention license change in ChangeLogv5.7.0Kai Koehne2016-06-081-2/+18
| |/ / | | | | | | | | | | | | | | | | | | Change-Id: I65105349a567fb8cd51ea621b6ca413c475182f5 Task-number: QTBUG-53913 Reviewed-by: Sami Makkonen <sami.makkonen@qt.io> Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * | Add changelog for 5.7.0v5.7.0-rc1Antti Kokko2016-05-261-0/+29
| | | | | | | | | | | | | | | | | | | | | Change-Id: I566e3dc26938eefab48eb44e233cb4e8810641eb Reviewed-by: Christian Stromme <christian.stromme@qt.io> Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com> Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-05-242-1/+4
|\| | | | | | | | | | | Change-Id: I9e7b4db823c192cc8ba9766f2623b63d6c640a9c
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-05-192-1/+4
| |\| | | | | | | | | | Change-Id: I324ee61f7627de76bcc3765fe18fa009166fe5b5
| | * Doc: Remove repository name from examplesinstallpathTopi Reinio2016-05-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Examples in binary packages now directly match the install path. Change-Id: I7a98d68cbc0623e86bb9dcfb3cadd1adc9631ebf Task-number: QTBUG-52953 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| | * add example installsOswald Buddenhagen2016-04-281-0/+3
| | | | | | | | | | | | | | | | | | Change-Id: Ic4ac40d6f946f9edcf68041820c95ae95db33eb9 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com> Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-04-0810-9/+62
|\| | | | | | | | | | | Change-Id: Ifffe7c27e728535f04610b63e1d1f3ee8bf070d5
| * | Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1Liang Qi2016-04-088-7/+31
| |\| | | | | | | | | | Change-Id: I3d3f2f84808ca29a056783873dd78094a53c2875
| | * Purge sRGB chunks from PNG in documentation.Edward Welbourne2016-03-291-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Subjects a *.png file that matched grep -law "sRGB" to: pngcrush -ow -brute -rem allb -reduce -force Change-Id: Ief67f8ca4dfc44655af62e70c10cb623acf83642 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
| | * Make more ctors explicitMarc Mutz2016-03-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added explicit where it was missing. This is not a source- incompatible change, because code that breaks by this is a bug. Let's not have this sitting around in an LTS. This change only affects C++11. Change-Id: I01ef7f6c26c8087e8516c9d66067060a6ed7c020 Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
| | * De-inline ~QAndroidJniObject() dtorMarc Mutz2016-03-222-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By making the destructor (usually the first non-inline, non-pure, virtual function, and therefore the trigger for most compilers to emit the vtable and type_info structures for the class in that TU) out-of-line, vtables and, more importantly, type_info strucures for the class are pinned to a single TU. This prevents false negative dynamic_cast and catch evaluation. Since it is already exported, users of the class are unaffected by the change, but since it's public API, and the dtors may have been de-virtualized and inlined into application code, we need to avoid adding code to the out-of-line dtor until Qt 6. Task-number: QTBUG-45582 Change-Id: I60273f7352be0d5a45a94828647d61f0ec9f1d79 Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
| | * Make public headers compile with -Wzero-as-null-pointer-constantMarc Mutz2016-03-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... or equivalent. QtBase 5.6 headers already compile that way, so let the other modules follow suit. Change-Id: I26201944b21d83f78c9e1c75cbd55334cd16359f Task-number: QTBUG-45291 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
| | * Purge sRGB chunks from PNGs in examples.Edward Welbourne2016-03-223-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Subjects each *.png file that matched grep -law "sRGB" to: pngcrush -ow -brute -rem allb -reduce Change-Id: I3ab25a8abccb130e4b419be6007e743f45f86fa2 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
| | * Merge remote-tracking branch 'origin/5.6.0' into 5.6Frederik Gladhorn2016-03-171-0/+22
| | |\ | | | | | | | | | | | | Change-Id: I4214c81ba18f149c2945dd1d87e374f89ec00665
| | | * Add changelog for 5.6.0v5.6.0Christian Strømme2016-02-251-0/+22
| | | | | | | | | | | | | | | | | | | | Change-Id: Ibb50ac81d3ea84e0c66e17a1400fc119f24917ab Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
| * | | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-03-071-1/+2
| |\| | | | | | | | | | | | | | Change-Id: If08e856e0de436395382ef141b55f8d1e984535f
| | * | consistently put {qt,qml}_{module,plugin} at the end of project filesOswald Buddenhagen2016-02-251-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this fixes static builds by ensuring that all dependencies are exported. no actual effect in this module. Change-Id: Ie4e6968b9a10fd20895393d4f7f5b490c7e8119d Reviewed-by: BogDan Vatra <bogdan@kdab.com>
| * | | Add hideSplashScreen function.v5.7.0-alpha1BogDan Vatra2016-02-252-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This function is useful to hide a sticky splash screen. Change-Id: I724a47a8cb73d3288916ed77b760217520d6b5ef Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
| * | | Add new method to get the main Android service.Michael Dippold2016-02-192-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently accessing the service requires use of private APIs. Change-Id: I480657978e8318f98f5ee24bd4587c467110677a Reviewed-by: BogDan Vatra <bogdan@kdab.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* | | | Bump versionOswald Buddenhagen2016-02-231-1/+1
|/ / / | | | | | | | | | Change-Id: Ie3d304c684e9db86aede0c2f8a80d18ec77ab9ba
* | | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-02-152-3/+2
|\| | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I4497150a68daf85260a55a6539f5ed178b55a725
| * | Bump versionOswald Buddenhagen2016-02-081-1/+1
| |/ | | | | | | Change-Id: I83ffa03d1111068ea0b2746a8e2247ba6de629e7
| * 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>
* | Helper functions needed to run Runnables on Android UI thread easily.BogDan Vatra2016-02-053-0/+103
| | | | | | | | | | | | | | | | | | 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-205-68/+752
| | | | | | | | | | | | | | | | | | | | | | 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>
* | Updated license headersAntti Kokko2016-01-205-86/+171
| | | | | | | | | | | | | | | | | | | | From Qt 5.7 -> examples are lisenced under BSD license, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new BSD header instead of LGPL21 one (in those files which will be under BSD) Change-Id: I7f0ee687933fa762b6f4419755df4893119949c7 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | Updated license headersAntti Kokko2016-01-2013-140/+1378
| | | | | | | | | | | | | | | | | | | | From Qt 5.7 -> LGPL v2.1 isn't an option anymore, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new LGPL header instead of LGPL21 one (in those files which will be under LGPL v3) Change-Id: I8bec15fbd91b483adb0f9e24878a701e9fb0061d Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-10-142-0/+688
|\| | | | | | | Change-Id: I0a3675f9b7cc2858be8807e778588df09adc8d7d
| * 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>
* | | | Add fromLocalRef() to QAndroidJniObjectChristian Strømme2015-09-183-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-20 22:11:17 +0000