Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update dependencies on 'dev' in qt/qtpurchasingwip/cmake | Qt Submodule Update Bot | 2019-10-04 | 1 | -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 Bot | 2019-09-24 | 2 | -0/+40 |
|\ | |||||
| * | Merge remote-tracking branch 'origin/5.15' into dev | Qt Forward Merge Bot | 2019-09-24 | 2 | -0/+40 |
|/| | | | | | | | Change-Id: Ia46f2bb7fd2ba8722c5ea0c20d0c81bf4a9a7562 | ||||
| * | Merge "Merge remote-tracking branch 'origin/5.14' into 5.15" | Qt Forward Merge Bot | 2019-09-21 | 2 | -0/+40 |
|/| | |||||
| * | Merge remote-tracking branch 'origin/5.14' into 5.15 | Qt Forward Merge Bot | 2019-09-21 | 2 | -0/+40 |
|/| | | | | | | | Change-Id: I9ad707269b0736da9e08a30ac3002301579fbe6f | ||||
| * | Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"v5.14.0-alpha1 | Qt Forward Merge Bot | 2019-09-17 | 2 | -0/+40 |
| |\ | |||||
| | * | Merge remote-tracking branch 'origin/5.13' into 5.14 | Qt Forward Merge Bot | 2019-09-17 | 2 | -0/+40 |
| |/| | | | | | | | | | | Change-Id: Ie81e288534dbfa2e207a65ba1fc6e331b0f7a668 | ||||
| | * | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13" | Qt Forward Merge Bot | 2019-09-08 | 1 | -0/+20 |
| | |\ | |||||
| | | * | Merge remote-tracking branch 'origin/5.12' into 5.13 | Qt Forward Merge Bot | 2019-09-08 | 1 | -0/+20 |
| | |/| | | | | | | | | | | | | | Change-Id: I27c55d789eb59cad594d8510309020e4fdd1ef57 | ||||
| | | * | Merge "Merge remote-tracking branch 'origin/5.12.5' into 5.12" | Qt Forward Merge Bot | 2019-09-07 | 1 | -0/+20 |
| | | |\ | |||||
| | | | * | Merge remote-tracking branch 'origin/5.12.5' into 5.12 | Qt Forward Merge Bot | 2019-09-07 | 1 | -0/+20 |
| | | |/| | | | | | | | | | | | | | | | | Change-Id: Iaa4575e937c63960c3e3cc4891540122b6ca294f | ||||
| | | | * | Add changes file for Qt 5.12.5v5.12.5 | Antti Kokko | 2019-08-23 | 1 | -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 Bot | 2019-09-05 | 1 | -0/+20 |
| | |\ \ | |||||
| | | * | | Merge remote-tracking branch 'origin/5.13.1' into 5.13 | Qt Forward Merge Bot | 2019-09-05 | 1 | -0/+20 |
| | |/| | | | | | | | | | | | | | | | | | Change-Id: I92f88238db9eac706d4e2a0a1b26b569a7f65ba7 | ||||
| | | * | | Add changes file for Qt 5.13.1v5.13.1 | Antti Kokko | 2019-07-30 | 1 | -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 version | Kari Oikarinen | 2019-08-27 | 1 | -1/+1 |
|/ / / | | | | | | | | | | Change-Id: I9c88d993917e0b73e16314907d1a61e1a1c6f246 | ||||
* | | | Port from QMutex::Recursive to QRecursiveMutex | Marc Mutz | 2019-08-06 | 4 | -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 Bot | 2019-07-16 | 1 | -0/+1 |
|\ \ \ | |||||
| * | | | Merge remote-tracking branch 'origin/5.13' into dev | Qt Forward Merge Bot | 2019-07-16 | 1 | -0/+1 |
|/| | | | |/ / | | | | | | | Change-Id: Ib5a1867223138c134fe221e8921bcf39262cc222 | ||||
| * | | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13" | Qt Forward Merge Bot | 2019-07-11 | 0 | -0/+0 |
| |\ \ | |||||
| | * | | Merge remote-tracking branch 'origin/5.12' into 5.13 | Qt Forward Merge Bot | 2019-07-11 | 0 | -0/+0 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I975dcb488d8115d158ba6f25178ea7170ad4c7e1 | ||||
| | | * | Bump version | Frederik Gladhorn | 2019-07-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Change-Id: I1984f38d1ecd5fc5250e38d9bc4ac5052b97bbda | ||||
| * | | | Doc: Replace example file lists with links to code.qt.io | Topi Reinio | 2019-07-09 | 1 | -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 Bot | 2019-07-11 | 0 | -0/+0 |
|\ \ \ | |||||
| * | | | Merge remote-tracking branch 'origin/5.13' into dev | Qt Forward Merge Bot | 2019-07-11 | 0 | -0/+0 |
|/| | | | |/ / | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I638c8a5fbb61b281b7a1a37394b240c6c53c768f | ||||
| * | | Bump version | Frederik Gladhorn | 2019-07-01 | 1 | -1/+1 |
| | | | | | | | | | | | | Change-Id: I3fb08898ef100388e488013bd796048880f29c83 | ||||
* | | | Merge "Merge remote-tracking branch 'origin/5.13' into dev" | Qt Forward Merge Bot | 2019-06-29 | 1 | -0/+20 |
|\ \ \ | |||||
| * | | | Merge remote-tracking branch 'origin/5.13' into dev | Qt Forward Merge Bot | 2019-06-29 | 1 | -0/+20 |
|/| | | | |/ / | | | | | | | Change-Id: I638784f677fd09b4e9fdbc3455f5a0c8f9df911e | ||||
| * | | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13" | Qt Forward Merge Bot | 2019-06-28 | 1 | -0/+20 |
| |\ \ | |||||
| | * | | Merge remote-tracking branch 'origin/5.12' into 5.13 | Qt Forward Merge Bot | 2019-06-27 | 1 | -0/+20 |
| |/| | | | |/ | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I67e098d9a2c0eb74c002e4e6b7da57a68b4ba601 | ||||
| | * | Merge "Merge remote-tracking branch 'origin/5.12.4' into 5.12" | Qt Forward Merge Bot | 2019-06-17 | 2 | -1/+21 |
| | |\ | |||||
| | | * | Merge remote-tracking branch 'origin/5.12.4' into 5.12 | Qt Forward Merge Bot | 2019-06-17 | 2 | -1/+21 |
| | |/| | | | | | | | | | | | | | Change-Id: I15a1776b63e590382fe9a9d17e25fdbf6dfbba73 | ||||
| | | * | Add changes file for Qt 5.12.4v5.12.4 | Antti Kokko | 2019-05-23 | 1 | -0/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia7508b43af1532b3b0e477d70983b500251f6b13 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io> | ||||
| | | * | Bump version | Frederik Gladhorn | 2019-05-23 | 1 | -1/+1 |
| | |/ | | | | | | | | | | Change-Id: I0c8dc3bdf24744a6929254fe1c2225ca4f5f60f2 | ||||
* | | | Merge "Merge remote-tracking branch 'origin/5.13' into dev" | Qt Forward Merge Bot | 2019-06-22 | 1 | -0/+18 |
|\ \ \ | |||||
| * | | | Merge remote-tracking branch 'origin/5.13' into dev | Qt Forward Merge Bot | 2019-06-22 | 1 | -0/+18 |
|/| | | | |/ / | | | | | | | Change-Id: I4579ec2462aafbb5625ad7b2e81bebc77b25e5bc | ||||
| * | | Merge "Merge remote-tracking branch 'origin/5.13.0' into 5.13" | Qt Forward Merge Bot | 2019-06-20 | 1 | -0/+18 |
| |\ \ | |||||
| | * | | Merge remote-tracking branch 'origin/5.13.0' into 5.13 | Qt Forward Merge Bot | 2019-06-20 | 1 | -0/+18 |
| |/| | | | | | | | | | | | | | | Change-Id: I1de979f7a88e5a1ab791da906e1befb4e4fe3ae8 | ||||
| | * | | Add changes file for Qt 5.13.0v5.13.0-rc3v5.13.0-rc2v5.13.0-rc1v5.13.0-beta4v5.13.0 | Antti Kokko | 2019-05-08 | 1 | -0/+18 |
| |/ / | | | | | | | | | | | | | Change-Id: Ifa3418eed097f3c70f0f1bda274352b19c4a1718 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | ||||
* | | | Merge remote-tracking branch 'origin/5.13' into dev | Qt Forward Merge Bot | 2019-04-23 | 1 | -0/+20 |
|\| | | | | | | | | | | | Change-Id: I6a642b93c238688c6e25c6aa9567b0e24fa45361 | ||||
| * | | Merge remote-tracking branch 'origin/5.12' into 5.13 | Qt Forward Merge Bot | 2019-04-20 | 1 | -0/+20 |
| |\| | | | | | | | | | | Change-Id: I15f2a0df5a7591170892bc29b482f0a6fc33bc05 | ||||
| | * | Merge remote-tracking branch 'origin/5.12.3' into 5.12 | Qt Forward Merge Bot | 2019-04-17 | 1 | -0/+20 |
| | |\ | | | | | | | | | | | | | Change-Id: Idd60f62bcbb6faedc4c807b58fdc8d78d4460a46 | ||||
| | | * | Add changes file for Qt 5.12.3v5.12.3 | Antti Kokko | 2019-04-02 | 1 | -0/+20 |
| | |/ | | | | | | | | | | | | | | | | | | | | | | + 098dd780b7e773f3e945c6e1b4b7fef51fb0a446 Doc: Fix documented QtPurchasing import + 634f8e549291b96434941b1dc29d665fdf29f980 Bump version Change-Id: If90663d98020cc6900130a4df04e531371450b2a Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> | ||||
* | | | Merge remote-tracking branch 'origin/5.13' into dev | Qt Forward Merge Bot | 2019-03-30 | 0 | -0/+0 |
|\| | | | | | | | | | | | Change-Id: I74bdb33c9dd12a07f649563d0de4ec039e697ec5 | ||||
| * | | Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta3v5.13.0-beta2 | Qt Forward Merge Bot | 2019-03-27 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I9159152ff7dc944aa6dbb8c8c81abf1b936be33a | ||||
| | * | Bump version | Kari Oikarinen | 2019-03-21 | 1 | -1/+1 |
| | | | | | | | | | | | | Change-Id: I060175dc5bb795da0b9a84f2c732b92650d336d4 | ||||
* | | | Merge remote-tracking branch 'origin/5.13' into dev | Qt Forward Merge Bot | 2019-03-19 | 1 | -0/+20 |
|\| | | | | | | | | | | | Change-Id: Ib6893029c4760c3566d677a11aade1cfed165d6b | ||||
| * | | Merge remote-tracking branch 'origin/5.12' into 5.13 | Qt Forward Merge Bot | 2019-03-16 | 1 | -0/+20 |
| |\| | | | | | | | | | | Change-Id: I4e68107abcb6912d46f6bd5ef3096be337a93cb8 | ||||
| | * | Merge remote-tracking branch 'origin/5.12.2' into 5.12 | Qt Forward Merge Bot | 2019-03-15 | 1 | -0/+20 |
| | |\ | | | | | | | | | | | | | Change-Id: I146c8ba161f41d7cb45b6d9e66b204544a84e4fc | ||||
| | | * | Add changes file for Qt 5.12.2v5.12.2 | Antti Kokko | 2019-02-21 | 1 | -0/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 4e7e9fc7bcc97e9278b25ecb35e6798c2ca229d6 Bump version + dff997ecf2984acd7eae650e8ffe3269e6b2a5e2 examples: qthangman require quick explicitly Change-Id: Id1b730042144cfb9428cd05712553f931a5bef1d Reviewed-by: Alex Blasche <alexander.blasche@qt.io> |