summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-091-0/+20
| |\| | | | | | | | | | Change-Id: I494cfbf71cb9d088657329654c645aac3bb7e064
| | * Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-beta3Qt Forward Merge Bot2019-11-051-0/+20
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I5e06ee1a757e9cf5563b4e1a2595cc09bd298e35
| | | * Add changes file for Qt 5.13.2v5.13.25.13Antti Kokko2019-10-141-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | + acdb9438f7ae94b29bab9c261ec20e18ec80390d Add changes file for Qt 5.12.5 Change-Id: Ia15c1ae359b4c794920e13ee4e07b5794638a435 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | | * Bump versionFrederik Gladhorn2019-10-141-1/+1
| | | | | | | | | | | | | | | | Change-Id: I680bfef8cd498f3a558359f6a07093112e662bb5
* | | | Update dependencies on 'dev' in qt/qtpurchasingQt Submodule Update Bot2019-11-081-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: Iad54fb12efbda438ce2e7fc626c5de39959cf958 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtpurchasingQt Submodule Update Bot2019-11-051-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I923738cb7b9a23112285613e44ddbc08846035c3 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtpurchasingQt Submodule Update Bot2019-11-021-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I3fed1b3cc7c75bf9e0e1ac1276bd7b191b0a98e2 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtpurchasingQt Submodule Update Bot2019-11-021-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I4d50d4564a7dbecc8e3f0226f444824373785754 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtpurchasingQt Submodule Update Bot2019-10-311-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I379ee97b11997229eebc365a11ca271698509c50 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtpurchasingQt Submodule Update Bot2019-10-291-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I4649adf821f512dbac077b379385fc9c328492e1 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtpurchasingQt Submodule Update Bot2019-10-261-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I0b431d90c5f8c2812fdd922d8aa2c9d62aade5a2 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtpurchasingQt Submodule Update Bot2019-10-241-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I045182c7671b4e5741e0fdaf128d1ea0bf039d36 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtpurchasingQt Submodule Update Bot2019-10-221-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I6d2a2b7515479823e82185c4a4f77f9176eca850 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtpurchasingQt Submodule Update Bot2019-10-191-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I2b718b9ead01c989b71e7af3708415229e6e7274 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtpurchasingQt Submodule Update Bot2019-10-181-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I335acc3c12cfb23569b27d18dff7c2c6666588b5 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtpurchasingQt Submodule Update Bot2019-10-171-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I9b1da34d6aae16bf1d7962ccaf26aa4ae8331e22 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtpurchasingQt Submodule Update Bot2019-10-171-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I5c66f06a7c46ce9a742cfa4026463d945f67d385 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtpurchasingQt Submodule Update Bot2019-10-161-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I8348f71528247cfb6b51938e1734d2e40c294996 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtpurchasingQt Submodule Update Bot2019-10-161-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I11df6d9a36a56a3400e1cbdb95a678781c2338d3 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtpurchasingQt Submodule Update Bot2019-10-151-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: Ic4684d37be8ebd96bf91adbefaa4f4ac141e0583 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtpurchasingQt Submodule Update Bot2019-10-131-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I4b03c892e5582102ac9db03d4d8656df1a74514e Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtpurchasingQt Submodule Update Bot2019-10-101-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I2eb09b3a175925d7a7b74506956bac068336cb4c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtpurchasingQt Submodule Update Bot2019-10-081-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I55f81a29600effd4fc08d04323136f7cd7e7558b Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-10-051-1/+1
|\| | | | | | | | | | | | | | | Change-Id: I80847111c23e167c4342178cf18a88c3b21ac344
| * | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-10-011-1/+1
| |\| | | | | | | | | | | | | | Change-Id: I488ed535cc92bb371ee4b8e91776c794fc79557d
| | * | Update plugins.qmltypes for 5.14v5.14.0-beta2v5.14.0-beta1Kai Koehne2019-09-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-78690 Change-Id: I5b6b05a0133ccd3ddc4a64d8fe723ab57739b9f9 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | | | Update dependencies on 'dev' in qt/qtpurchasingwip/cmakeQt Submodule Update Bot2019-10-041-0/+10
| | | | | | | | | | | | | | | | | | | | Change-Id: Idbb7031076b48ce15c71cc62e81771800e2a18b4 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Merge "Merge remote-tracking branch 'origin/5.15' into dev"Qt Forward Merge Bot2019-09-242-0/+40
|\ \ \ \
| * | | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-09-242-0/+40
|/| | | | | |/ / / | | | | | | | | Change-Id: Ia46f2bb7fd2ba8722c5ea0c20d0c81bf4a9a7562
| * | | Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"Qt Forward Merge Bot2019-09-212-0/+40
|/| | |
| * | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-09-212-0/+40
|/| | | | |/ / | | | | | | Change-Id: I9ad707269b0736da9e08a30ac3002301579fbe6f
| * | Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"v5.14.0-alpha1Qt Forward Merge Bot2019-09-172-0/+40
| |\ \
| | * | Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-09-172-0/+40
| |/| | | | |/ | | | | | | Change-Id: Ie81e288534dbfa2e207a65ba1fc6e331b0f7a668
| | * Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-09-081-0/+20
| | |\
| | | * Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-09-081-0/+20
| | |/| | | | | | | | | | | | | Change-Id: I27c55d789eb59cad594d8510309020e4fdd1ef57
| | | * Merge "Merge remote-tracking branch 'origin/5.12.5' into 5.12"Qt Forward Merge Bot2019-09-071-0/+20
| | | |\
| | | | * Merge remote-tracking branch 'origin/5.12.5' into 5.12Qt Forward Merge Bot2019-09-071-0/+20
| | | |/| | | | | | | | | | | | | | | | Change-Id: Iaa4575e937c63960c3e3cc4891540122b6ca294f
| | | | * Add changes file for Qt 5.12.5v5.12.5Antti Kokko2019-08-231-0/+20
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | + 6df36bebdcb0a12069b0cabfed797ebc719b587d Bump version Change-Id: I37a9598d5be6f482f908791038edc5642177ae98 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| | * | Merge "Merge remote-tracking branch 'origin/5.13.1' into 5.13"Qt Forward Merge Bot2019-09-051-0/+20
| | |\ \
| | | * | Merge remote-tracking branch 'origin/5.13.1' into 5.13Qt Forward Merge Bot2019-09-051-0/+20
| | |/| | | | | | | | | | | | | | | | | Change-Id: I92f88238db9eac706d4e2a0a1b26b569a7f65ba7
| | | * | Add changes file for Qt 5.13.1v5.13.1Antti Kokko2019-07-301-0/+20
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 8eb2ead663a55d6c0bfd83f8914bd2369846df55 Bump version + 780bf06b9a938380eb9221532465db0d3069f38a Add changes file for Qt 5.12.4 + d7ff4e5827512eeb3624b8e9dbb736e3c2624e92 Bump version + 6df36bebdcb0a12069b0cabfed797ebc719b587d Bump version + a7d50256d76d5b44b6af37590ea433de025feb31 Doc: Replace example file lists with links to code.qt.io Change-Id: Iabbbeb29116e5664098c26d980dbd2a923225ac8 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | / / Bump versionKari Oikarinen2019-08-271-1/+1
|/ / / | | | | | | | | | Change-Id: I9c88d993917e0b73e16314907d1a61e1a1c6f246
* | | Port from QMutex::Recursive to QRecursiveMutexMarc Mutz2019-08-064-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the example, also port from QMutexLocker to std::lock_guard, as the former will not support QRecursiveMutex going forward. The library code needs to wait for qt_scoped_lock to become available. Change-Id: Ide509a9db59b90fe6845a6b3b67f4a0ca40245e0 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-07-161-0/+1
|\ \ \
| * | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-07-161-0/+1
|/| | | | |/ / | | | | | | Change-Id: Ib5a1867223138c134fe221e8921bcf39262cc222
| * | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-07-110-0/+0
| |\ \
| | * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-07-110-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I975dcb488d8115d158ba6f25178ea7170ad4c7e1
| | | * Bump versionFrederik Gladhorn2019-07-011-1/+1
| | | | | | | | | | | | | | | | Change-Id: I1984f38d1ecd5fc5250e38d9bc4ac5052b97bbda
| * | | Doc: Replace example file lists with links to code.qt.ioTopi Reinio2019-07-091-0/+1
| |/ / | | | | | | | | | | | | | | | Task-number: QTBUG-74391 Change-Id: Iefa59b0734053e792efb54228d65b12c90e77f20 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-07-110-0/+0
|\ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-07 22:42:40 +0000