aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Doc: Remove \ingroup all-examples command from the docsHEADdevJaishree Vyas2023-07-121-1/+0
| | | | | | Fixes: QTBUG-115044 Change-Id: I83314f3b7955e1ef9c857bcc96c07f6f90b2f875 Reviewed-by: Topi Reiniƶ <topi.reinio@qt.io>
* Make sure all private headers include at least one otherThiago Macieira2022-03-083-2/+5
| | | | | | | | | | 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>
* Bump version to 6.4.0Jani Heikkinen2022-02-111-1/+1
| | | | | Change-Id: I73469f3867d3e176b175d0959f76cc8d3f0749a0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Q*FActory: remove unused path arguments6.3.06.3Thiago Macieira2021-11-052-40/+6
| | | | | | | | | | | | Cargo-culted from somewhere but not used here. This just made the code bigger for no reason. Task-number: QTBUG-97950 Pick-to: 6.2 Change-Id: Ice04365c72984d07a64dfffd16b48632888ed664 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Bump versionJani Heikkinen2021-09-141-1/+1
| | | | Change-Id: Ie006fe69116876e2d085f63b7c5cbdffe917839b
* Bump version6.2.0Jani Heikkinen2021-05-241-1/+1
| | | | Change-Id: Ibcb814920a9a99440687a4558836e23ce78285b7
* fix typo in geometryChanged() signal override for QGamepadMouseItemBrad Parker2021-03-042-3/+3
| | | | | Change-Id: Idd4eda52a0fc014a783b4e4eaf99cf205483d8e1 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* There should be a space after the comment '//'Zhu Yuliang2020-11-185-15/+15
| | | | | | | The other Qt codes style has space after '//' Change-Id: Icfe6e60163680da706380d7729682b8da9a1b509 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Update dependenciesAllan Sandfeld Jensen2020-11-182-2/+3
| | | | | Change-Id: I855e722f8be4c43b1243860d272c26d20647ef5b Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Android: rename Android's package name for Qt 6Assam Boudjelthia2020-10-056-10/+10
| | | | | | | | | | Rename Android package name org.qtproject.qt5.android to org.qtproject.qt.android to avoid inconsistency with Qt 6 name. Also, we include the major version number in the jar target. Task-number: QTBUG-86969 Change-Id: If2c7e014ed52dd97e86c5a179dfbcbcce915ee83 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Add changes file for Qt 5.15.1Antti Kokko2020-08-251-0/+20
| | | | | | | | | + 4efe211178849a058a2d670884359043ce56c2ec Bump version Change-Id: I25771c71e0d871aded01569eb858bc63e9b7ac3f Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit 7bf40625ab31685a827f5b6dc13922ae685e8a4f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add ; to Q_UNUSEDLars Schmertmann2020-06-308-34/+34
| | | | | | | | This is required to remove the ; from the macro with Qt 6. Task-number: QTBUG-82978 Change-Id: I70a100dc04d1178af4b60e42bb69b123a95164d6 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Use QList instead of QVectorJarek Kobus2020-06-252-5/+5
| | | | | | Task-number: QTBUG-84469 Change-Id: Ib8ba9561a5fd34c86df534e4383e2c65e80e6a55 Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
* Add missing overrideAlexander Volkov2020-05-263-4/+4
| | | | | Change-Id: I785bbebea724b71ae44f67f833644f1117982827 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-05-141-0/+18
|\ | | | | | | Change-Id: I290fcd8a263717efcb6083d1e197b19a307d62eb
| * Merge remote-tracking branch 'origin/5.15.0' into 5.15Qt Forward Merge Bot2020-05-141-0/+18
| |\ | | | | | | | | | Change-Id: I5115ef501a03c225690b6a6c8ee5c4aab7e78042
| | * Merge remote-tracking branch 'origin/5.15' into 5.15.0v5.15.0-rc2v5.15.0-rc1v5.15.0Qt Forward Merge Bot2020-04-221-0/+20
| | |\ | | |/ | |/| | | | Change-Id: Ie96b365dfcc20c143ed4610ceff61dd6c3832152
| | * Add changes file for Qt 5.15.0Antti Kokko2020-04-221-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | + 301af00942b710d8157a916907e2c8324f2502c5 Bump version + 196713714a63e789b65822e2222208251857359b Update plugins.qmltypes for 5.15 Change-Id: I761f6eeadbca462c2e15fcf92b94b8959626fafc Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* | | Update dependenciesMike Krus2020-04-303-6/+6
| | | | | | | | | | | | | | | | | | | | | And update for changes in API Change-Id: Ia9f0c20c0dfb937522b4eff6541e41e8933dc8d9 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-04-251-0/+20
|\| | | | | | | | | | | Change-Id: I8aee714d7be2bd546358ebb61052d566cf92dda7
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-04-211-0/+20
| |\ \ | | |/ | |/| | | | Change-Id: Icd35e4396c9f9de02f09b7c975832bc936e78d3c
| | * Merge remote-tracking branch 'origin/5.14.2' into 5.145.14Qt Forward Merge Bot2020-04-211-0/+20
| | |\ | | | | | | | | | | | | Change-Id: I41a2c20ea03af6562f808e57e8b62ffd9ea3fb30
| | | * Add changes file for Qt 5.14.2v5.14.2Antti Kokko2020-03-101-0/+20
| | |/ | | | | | | | | | | | | | | | | | | + e936e2bf84104668331d7f45d78d22ba190d6fba Bump version Change-Id: I1a8f7348b5519b11a1cbf6eebf3f8f2f12d3d256 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-02-291-1/+1
|\| | | | | | | | | | | Change-Id: I493575a4eca2a01238ab2cc3170025945b39c84f
| * | Update plugins.qmltypes for 5.15v5.15.0-beta4v5.15.0-beta3v5.15.0-beta2Jani Heikkinen2020-02-251-1/+1
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-82253 Change-Id: I1a452fcdcdaa69586d91c81d286fff9acadd5604 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-02-080-0/+0
|\| | | | | | | | | | | Change-Id: Iba18a08188b70f7d2d1ce62a5468e8cd412d661c
| * | Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta1v5.15.0-alpha1Qt Forward Merge Bot2020-02-050-0/+0
| |\| | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I4ca9b97e1ecc09176d8050284a9c085a37ddd839
| | * Bump versionAlexandru Croitor2020-02-021-1/+1
| | | | | | | | | | | | Change-Id: I653244a1eff28fbef6fd479b23060c78dd230a40
* | | Update dependenciesMike Krus2020-02-061-2/+2
| | | | | | | | | | | | | | | | | | | | | So qt3d can be updated in turn Change-Id: Iec7c4a56bd3a7c8fdfa04afff3b120cd06a7c442 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-02-011-0/+20
|\| | | | | | | | | | | Change-Id: Iffd0ea940b618c6c88dff2daf7bd9b397593bfe0
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-281-0/+20
| |\| | | | | | | | | | Change-Id: Ic73d249b0ec9e92738509639abce31de47db395c
| | * Merge remote-tracking branch 'origin/5.14.1' into 5.14Qt Forward Merge Bot2020-01-271-0/+20
| | |\ | | | | | | | | | | | | Change-Id: I070af078afe6a4d9784920e6753651827583cc8e
| | | * Add changes file for Qt 5.14.1v5.14.1Antti Kokko2020-01-091-0/+20
| | |/ | | | | | | | | | | | | | | | | | | + 8fe3f8873210bfe8ca584eb30d88ac19e355957d Bump version Change-Id: I08be8f9a506a3ce78d8aa494366793dd0eba90f0 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | | Update dependencies on 'dev' in qt/qtgamepadQt Submodule Update Bot2020-01-271-2/+2
| | | | | | | | | | | | | | | Change-Id: I7bcebacb9bc9fcf2f4703fd3a59340f624f2012c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtgamepadQt Submodule Update Bot2020-01-211-2/+2
| | | | | | | | | | | | | | | Change-Id: I50a520268cccc3e7666985f6ebff8194aaccb5ff Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtgamepadQt Submodule Update Bot2020-01-201-2/+2
| | | | | | | | | | | | | | | Change-Id: Ica04e772f7144867c9e5cd35e7e43b6c7a62adc3 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtgamepadQt Submodule Update Bot2020-01-151-2/+2
| | | | | | | | | | | | | | | Change-Id: I046ed52277bb0fa45108cf8146099648de32c7f1 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-12-310-0/+0
|\| | | | | | | | | | | Change-Id: I544870ae2f4c071e14520d3e00e9e8af1b93fa02
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-300-0/+0
| |\| | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ib2efe0c8577539d292742af117d0d36fffd38ad6
| | * Bump versionDaniel Smith2019-12-161-1/+1
| | | | | | | | | | | | Change-Id: I9a718478e369337d3ae5884fe382575d2e1175b1
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-12-171-0/+18
|\| | | | | | | | | | | Change-Id: Id6d9bc3d8fdd5dd9ae1fa45de668e5b0dd0932c6
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-141-0/+18
| |\| | | | | | | | | | Change-Id: I369d0b136879b8db75cb33a553d829bb8bcbbca9
| | * Merge remote-tracking branch 'origin/5.14.0' into 5.14Qt Forward Merge Bot2019-12-131-0/+18
| | |\ | | | | | | | | | | | | Change-Id: I48647e562fc9f2124be50eb8a8547f655fc05dd8
| | | * Add changes file for Qt 5.14.0v5.14.0-rc2v5.14.0-rc1v5.14.0Antti Kokko2019-11-281-0/+18
| | |/ | | | | | | | | | | | | Change-Id: I196e83916b32a1085a76b967d8c4c5269528b310 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* | | Update dependencies on 'dev' in qt/qtgamepadQt Submodule Update Bot2019-12-051-2/+2
| | | | | | | | | | | | | | | Change-Id: Iec140e20c5297744c39d174c96ecc64d3a26d634 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtgamepadQt Submodule Update Bot2019-12-041-2/+2
| | | | | | | | | | | | | | | Change-Id: I9b864be34ad460e89d25303694deaeb4ab1af1a3 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtgamepadQt Submodule Update Bot2019-11-291-2/+2
| | | | | | | | | | | | | | | Change-Id: I193790ed8b08ccc65954cc01981dba38321832cc Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtgamepadQt Submodule Update Bot2019-11-281-2/+2
| | | | | | | | | | | | | | | Change-Id: I671362b24c5f5b59406f50092fe33b6a0a1be5b3 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtgamepadQt Submodule Update Bot2019-11-261-2/+2
| | | | | | | | | | | | | | | Change-Id: I9bcda549679da243a59bc9b021712eb9b13dc75e Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtgamepadQt Submodule Update Bot2019-11-251-2/+2
| | | | | | | | | | | | | | | Change-Id: I09a84c5d62c4a159f55fb0ec28920948f561ce54 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>