summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add changes file for Qt 5.15.1v5.15.1Antti Kokko2020-08-251-0/+20
| | | | | | | | + 1dc083d1aa85a645e933403b7bcfadf78e5d601f Bump version Pick-to: dev 5.15 Change-Id: I7c2823899004473fe06ca800257c7d3304627243 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Bump versionAlexandru Croitor2020-07-301-1/+1
| | | | Change-Id: Ia08cc89fc9ab8a9f5a86973386f82e565d150def
* Merge remote-tracking branch 'origin/5.15.0' into 5.15Qt Forward Merge Bot2020-05-141-0/+18
|\ | | | | | | Change-Id: I7c9f6c8b5e56c852694123cf96f643da8b1f3518
| * 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: I55e7e27104d9bc1fd6d9ab9bba5c509d1f266720
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-04-211-0/+20
|\ \ | | | | | | | | | Change-Id: I342bf9ce2a61960b74cb1f4006a8d9c4d84d806b
| * \ Merge remote-tracking branch 'origin/5.14.2' into 5.145.14Qt Forward Merge Bot2020-04-211-0/+20
| |\ \ | | | | | | | | | | | | Change-Id: I010f429242cd4da6329601d2b451eca4d677cc5c
| | * | Add changes file for Qt 5.14.2v5.14.2Antti Kokko2020-03-111-0/+20
| |/ / | | | | | | | | | | | | | | | | | | | | | + cb74352f3ad9cac58a60c36513edbeb6c65c0562 Fix a ClassNotFoundException crash on app start + ae27a573d67e1a7c6041b497592174b306bea6e9 Bump version Change-Id: I4c8c120023bee7719418159b7e7ea1de7d6e50a5 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| | * Add changes file for Qt 5.15.0Antti Kokko2020-04-201-0/+18
| |/ |/| | | | | | | | | | | | | + 689db87975134dc7332cf32ce2afe96d8a5211a8 Bump version + 0fd1c5413bd433755e54c7d69493efc45c432764 Update plugins.qmltypes for 5.15 Change-Id: Id8948465a8f04367468f1a164afade10bd31d1d5 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta4v5.15.0-beta3v5.15.0-beta2Qt Forward Merge Bot2020-03-071-3/+3
|\| | | | | | | Change-Id: I252cfc7a2e7dd8e75ce21755e2103a7b59745391
| * Doc: Fix advertised importKai Koehne2020-03-061-3/+3
| | | | | | | | | | Change-Id: I19934c0942f1f5c4a96c17c655ef86d2f00a8a7a Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | Update plugins.qmltypes for 5.15Jani Heikkinen2020-02-251-1/+1
| | | | | | | | | | | | | | Task-number: QTBUG-82253 Change-Id: Id9a9f3d418ca321d65f75aad8ea8fbd2a6be76f3 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | 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: Ie865e075fa077e2dfa956ea4859943389c717fb4
| * Bump versionAlexandru Croitor2020-02-021-1/+1
| | | | | | | | Change-Id: I06c3e3547d73b2afa6a3df21dd1f97ec60759cac
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-281-0/+20
|\| | | | | | | Change-Id: I16fa58ffae6de0b8304535cca058f8024ec95c5a
| * Merge remote-tracking branch 'origin/5.14.1' into 5.14Qt Forward Merge Bot2020-01-271-0/+20
| |\ | | | | | | | | | Change-Id: I891675afa8b7291e6c80e297d5d1ea9c3f13e7d5
| | * Add changes file for Qt 5.14.1v5.14.1Antti Kokko2020-01-091-0/+20
| | | | | | | | | | | | | | | | | | | | | + 0c5493b7e31f96277851667a9c0c04f0d7c9d750 Bump version Change-Id: Ib42ba43d9aa5391ec665f95401c1098202d6f5c0 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-181-5/+13
|\| | | | | | | | | | | Change-Id: I774429f12e3a8ad15f23e60926ce2ce3d716785f
| * | Fix a ClassNotFoundException crash on app startAssam Boudjelthia2020-01-161-5/+13
| |/ | | | | | | | | | | | | | | | | | | This is equivalent to e6034a4740756334317ab2445b518a645930f4f4 in qtbase, and needed because of a bug on Android that causes JNI_OnLoad() to be called multiple times for the same library. Fixes: QTBUG-80995 Change-Id: I86686feeb30f13cf56ea13c98bed3d5b799dfd90 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-020-0/+0
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I1866b46dfde5c94ceff1fed8c41573a45852de27
| * Bump versionDaniel Smith2019-12-161-1/+1
| | | | | | | | Change-Id: I735f0a7d79dd522d07d1c349c3cdb89144bb5305
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-141-0/+18
|\| | | | | | | Change-Id: I558cdab32b9bad28d52b9b7e50b05c8e0ffd6ebd
| * Merge remote-tracking branch 'origin/5.14.0' into 5.14Qt Forward Merge Bot2019-12-131-0/+18
| |\ | | | | | | | | | Change-Id: I99303fbfa6df265d3543427bd72b33f931f6be48
| | * Add changes file for Qt 5.14.0v5.14.0-rc2v5.14.0-rc1v5.14.0Antti Kokko2019-11-251-0/+18
| |/ | | | | | | | | Change-Id: I5979d1074982b7f48999eb5e5744a9ebcd5ccab6 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | 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
* | | 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>
* | | 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-06-22 03:18:19 +0000