summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Doc: Remove \ingroup all-examples command from the docsHEADdevJaishree Vyas2023-07-121-1/+0
| | | | | | Fixes: QTBUG-115044 Change-Id: Id3d380a464fad5017d5052337e2c35a14156ac93 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Make sure all private headers include at least one otherThiago Macieira2022-03-081-2/+3
| | | | | | | | | | See script in qtbase/util/includeprivate for the rules. Since these files are being touched anyway, I also ran the updatecopyright.pl script too. Change-Id: Ib056b47dde3341ef9a52ffff13ef677e471674b6 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Merge remote-tracking branch 'origin/5.12' into dev6.3.06.36.2.46.2.36.2.26.2.16.2.06.2Qt Forward Merge Bot2019-01-220-0/+0
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I428934933062a121494032131ca5ecad1c1a0dde
| * Bump versionKari Oikarinen2019-01-141-1/+1
| | | | | | | | Change-Id: I64f098c24577c062f35692bd0f3ca7475bfe1a4a
* | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2019-01-100-0/+0
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I0aef00f419e931fb763d4e699d79083170771cd0
| * Bump versionKari Oikarinen2019-01-071-1/+1
| | | | | | | | Change-Id: Ibdaaab1e4a22a11e0fb4a90daa9eaf42dc9218c1
* | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-12-151-0/+20
|\| | | | | | | Change-Id: I99b9e5044286f33eaf17ff455d7f43ce525033bd
| * Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-12-111-0/+20
| |\ | | | | | | | | | Change-Id: Ie7d55d036111ab1050b9c8fb09dc6af093a0496b
| | * Merge remote-tracking branch 'origin/5.11.3' into 5.11Qt Forward Merge Bot2018-12-041-0/+20
| | |\ | | | | | | | | | | | | Change-Id: I02662715c20b3d187f18c57806850e4f63538157
| | | * Add changes file for Qt 5.11.3v5.11.3Antti Kokko2018-11-161-0/+20
| | |/ | | | | | | | | | | | | | | | | | | + 6f0a1143a55a4e19d14bf999c4e3a2ad5c7fa313 Bump version Change-Id: I6fe67062d97c7cb3b4d8105f239a2eb8c07cd450 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-12-081-0/+23
|\| | | | | | | | | | | Change-Id: I0840739811b059dba44ade60a2651462648381ab
| * | Merge remote-tracking branch 'origin/5.12.0' into 5.12Qt Forward Merge Bot2018-12-051-0/+23
| |\ \ | | | | | | | | | | | | Change-Id: I2b06ccde29b70a1c0f8d86563ed149f9cbc3b7c8
| | * | Add changes file for Qt 5.12.0v5.12.0-rc2v5.12.0-rc1v5.12.0Antti Kokko2018-11-071-0/+23
| | | | | | | | | | | | | | | | | | | | Change-Id: I73af47b15f0e8f9ca6ac28227f6647a1011ed08f Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-11-170-0/+0
|\| | | | | | | | | | | | | | | Change-Id: I1887507a9d4a23efaa5c4a1128f2ffeb715832e0
| * | | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-11-160-0/+0
| |\ \ \ | | |/ / | |/| / | | |/ | | | | | | | | | Conflicts: .qmake.conf Change-Id: I4af296a238e4dcb8d8a814d1a588c113e66cc02c
| | * Bump versionOswald Buddenhagen2018-11-081-1/+1
| | | | | | | | | | | | Change-Id: I21e02d50f85e19c5da62f29e7e1f50f25098d079
* | | Bump versionOswald Buddenhagen2018-10-111-1/+1
| | | | | | | | | | | | Change-Id: Ibfa7ba12dc915c96431d94f078e7998f98b9768d
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-10-021-0/+1
|\| | | | | | | | | | | Change-Id: If1eb7ad5ef27a2bd6b44c7e9b626278be6d6cb65
| * | Don't build if Qt Network is not availablev5.12.0-beta4v5.12.0-beta3v5.12.0-beta2v5.12.0-beta1Eskil Abrahamsen Blomfeldt2018-09-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | The plugin requires QNetworkAccessManager, so we just disable the module when Qt Network is not built. Change-Id: I113754a6923f18014181fe327d36e6ccac3e4941 Reviewed-by: Pasi Keränen <pasi.keranen@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-09-251-157/+1
|\| | | | | | | | | | | Change-Id: I967e03276fb7579b405dd2f56ea9e43c65cc9fde
| * | Update plugins.qmltypesKai Koehne2018-09-241-157/+1
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-70264 Change-Id: Ic7088623a4dda9ba4427995b10e1bcb513d5ebcd Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-09-1520-16/+288
|\| | | | | | | | | | | Change-Id: Ieaf95f81e3bf15161a1f0baea629d666742032c2
| * | Remove Canvas3D examples from highlighted examplesPasi Keranen2018-09-131-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | Remove highlighted Canvas3D examples as qtcanvas3d module is now deprecated. Task-number: QTBUG-70532 Change-Id: I11f138d4421796dc03d9d5bac777a09da68b0188 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * | Mark Qt Canvas3D module and APIs as deprecatedPasi Keränen2018-09-1319-14/+264
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][QtCanvas3D][Important Behavior Changes] Canvas3D module and API deprecated. Task-number: QTBUG-70510 Change-Id: I0d519acad7ca331b9edf9565e6cc80d91c9617c6 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Sami Makkonen <sami.makkonen@qt.io> Reviewed-by: Pasi Keränen <pasi.keranen@qt.io>
| * | Merge remote-tracking branch 'origin/5.11' into 5.12v5.12.0-alpha1Qt Forward Merge Bot2018-09-111-0/+24
| |\| | | | | | | | | | Change-Id: I8679fabf5a0712f631bf904ddce7e86529749594
| | * Merge remote-tracking branch 'origin/5.11.2' into 5.11Qt Forward Merge Bot2018-09-091-0/+24
| | |\ | | | | | | | | | | | | Change-Id: I8493b38ce10e9193a1542742ba19bbcc5bd37641
| | | * Add changes file for Qt 5.11.2v5.11.2Antti Kokko2018-08-291-0/+24
| | |/ | | | | | | | | | | | | Change-Id: Id63d0908aa8ff11f4a4dde07f88e9174e75a5b15 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-08-282-28/+45
|\| | | | | | | | | | | Change-Id: I0c8a64286cbe004c28853265c386cddaf9926687
| * | Port to changed internal declarative API for typed arraysSimon Hausmann2018-08-272-28/+45
|/ / | | | | | | | | | | | | | | | | After commit 7bdb46c5aae3da345653fe91fbe9281b39015497 the enum for the typed array types has moved. Task-number: QTBUG-70187 Change-Id: I505625820e6175c22b19ba43e83017025ae3b14b Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-07-315-1173/+26
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I5329041124ec2caffcf3fbe05e8510586a26b39b
| * Bump versionOswald Buddenhagen2018-07-301-1/+1
| | | | | | | | Change-Id: I2544574f6bc1e6b31047821889587995abab49e8
| * Remove unused license filesKai Koehne2018-07-303-1153/+0
| | | | | | | | | | | | | | | | They got replaced by newer variants, and all the references to them in source code have been updated. Change-Id: I253257c9c1cf83e3d9848d63ed18569ea335c6b5 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * Fix outdated license headers in openglversionchecker*Kai Koehne2018-07-302-20/+26
| | | | | | | | | | Change-Id: Id83962db91e47ade469f1508a8728c9a0b0b2570 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-239-48/+48
|\| | | | | | | Change-Id: I6575af293ea023aa726b620f4d834e8430cc0462
| * Use FDL license for all .qdoc filesKai Koehne2018-06-192-42/+18
| | | | | | | | | | | | Change-Id: I295cf5ee0f557d1977dc750cded9d3ee40f78e0f Reviewed-by: Pasi Keränen <pasi.keranen@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| * Merge remote-tracking branch 'origin/5.11.1' into 5.11Qt Forward Merge Bot2018-06-191-0/+24
| |\ | | | | | | | | | Change-Id: Iac5f94fe7e2e8356541aa28699c771c868c45581
| | * Add changes file for Qt 5.11.1v5.11.1Antti Kokko2018-06-091-0/+24
| | | | | | | | | | | | | | | Change-Id: I427624db2444dc7d36237596870de4ccebed71bb Reviewed-by: Pasi Keränen <pasi.keranen@qt.io>
| * | Doc: Add missing dots (qtcanvas3d)Paul Wicking2018-06-196-6/+6
| |/ | | | | | | | | | | Task-number: QTBUG-68933 Change-Id: Ia02aa2a78aa4a4f3c6502b6fcac965e969060cb2 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-042-0/+48
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: If33722ccaa852b70e79e22ec277291d0d77896fd
| * Add changes file for Qt 5.9.6Antti Kokko2018-06-011-0/+24
| | | | | | | | | | | | | | Change-Id: If5c15c5d59304596fad1b732bca2db85d2650d76 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit 569495de338821ad89153b69a59a5364fc96a49a) Reviewed-by: Antti Kokko <antti.kokko@qt.io>
| * Add changes file for Qt 5.9.5Antti Kokko2018-06-011-0/+24
| | | | | | | | | | | | | | Change-Id: Ib99998e8d50d84b6f1636ca3733e2f5f725ecb54 Reviewed-by: Pasi Keränen <pasi.keranen@qt.io> (cherry picked from commit 9030337d37cdfad7d42b2ea1d3052e499df8f8dc) Reviewed-by: Antti Kokko <antti.kokko@qt.io>
| * Bump versionOswald Buddenhagen2018-05-311-1/+1
| | | | | | | | Change-Id: I645609efc1778ee1d16497dd79591f9d37098ddc
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-05-263-7/+6
|\| | | | | | | Change-Id: I6851380a0a60a0955140bd792a85d12df2fca5cd
| * Declare qtcanvas3d warning-cleanThiago Macieira2018-05-231-1/+1
| | | | | | | | | | Change-Id: I052407b777ec43f78378fffd15310c88519837e6 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Fix GCC 8 warning about memcpying non-trivial classThiago Macieira2018-05-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Follow what the compiler suggests and just use std::copy_n. Code generation may not be as good as memcpy for large-ish m_queuedCount values as sizeof(GlCommand) = 40 or 48 bytes. glcommandqueue.cpp:181:75: error: ‘void* memcpy(void*, const void*, size_t)’ writing to an object of non-trivially copyable type ‘class QtCanvas3D::GlCommand’; use copy-assignment or copy-initialization instead [-Werror=class-memaccess] Change-Id: I052407b777ec43f78378fffd15310ca2d996e9a3 Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Fix GCC 8 warning about memcpying non-trivial classThiago Macieira2018-05-231-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | In this case, it's easier to just make it trivial. Note how it contains a pointer which isn't deleted in the destructor (which is why we can make it trivial). glcommandqueue.cpp:181:75: error: ‘void* memcpy(void*, const void*, size_t)’ writing to an object of non-trivially copyable type ‘class QtCanvas3D::GlCommand’; use copy-assignment or copy-initialization instead [-Werror=class-memaccess] Change-Id: I052407b777ec43f78378fffd15310c2121146ef2 Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-05-121-0/+22
|\| | | | | | | Change-Id: Idc740bb11dc8698fbc13b33a174425afb6968b57
| * Merge remote-tracking branch 'origin/5.11.0' into 5.11Qt Forward Merge Bot2018-05-091-0/+22
| |\ | | | | | | | | | Change-Id: I730ef6adbd66b450ad6113e217a4f7e0081452ae
| | * Add changes file for Qt 5.11.0v5.11.0-rc2v5.11.0-rc1v5.11.0Antti Kokko2018-04-201-0/+22
| |/ | | | | | | | | | | Change-Id: I74988d0bef940ae43252e64f253c7ac2e3b4d0d2 Reviewed-by: Pasi Keränen <pasi.keranen@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Remove the code to manually initialize resources in static buildsSimon Hausmann2018-05-081-8/+0
| | | | | | | | | | | | | | | | | | After commit be9a56e5e3ced5d0d668fa24e4c65ae928f2e25a in qtbase, this is not needed anymore. Instead the resource system injects the plugin entry point with a reference to all resources. Change-Id: I075e2a855c27f87ad62d9ea45025e0481e3dd055 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-19 08:02:05 +0000