summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add changes file for Qt 5.15.2HEADdev6.2Antti Kokko2020-10-281-0/+28
| | | | | | | | | | | - 5b846f7c9e8dd09b924d142e5cf7753fcb082a03 Add changes file for Qt 5.15.1 + 55c9b8325daf15eb5654e8834de6b8fe41ca7f6e Bump version + 839f1b41be3f56a05e8f69abc8fbba9d55cff79b Add changes file for Qt 5.12.10 Change-Id: I11694f2a37c3fae7077c55c6fb2bdc5e4d6f6985 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit ddfa4d16243128d2871a51c513e025d518151b17) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove usage of deprecated QStandardPaths::DataLocationKarsten Heimrich2020-10-264-5/+7
| | | | | | | | * Dependency update on qtbase, qtdeclarative and qtandroidextras Task-number: QTBUG-87037 Change-Id: Ie19a660dc5613e470221cd50651fa7d7cd24b1c9 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Android: rename Android's package name for Qt 6Assam Boudjelthia2020-10-059-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: Ibeafcd164cc48100710fc134cb9c2f953ec33426 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Add changes file for Qt 5.15.1Antti Kokko2020-08-251-0/+20
| | | | | | | | | + 1dc083d1aa85a645e933403b7bcfadf78e5d601f Bump version Change-Id: I7c2823899004473fe06ca800257c7d3304627243 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit cf85bd1d88dd9a25b9a2b1210ab9d9668159b871) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add missing overrideAlexander Volkov2020-07-242-4/+4
| | | | | Change-Id: I71329521ec00c8fca333320eac42e081fc59ea6b Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Add ; to Q_UNUSEDLars Schmertmann2020-06-281-1/+1
| | | | | | | | This is required to remove the ; from the macro with Qt 6. Task-number: QTBUG-82978 Change-Id: I9c861c3f4655af187c8802f52830080fae6cf338 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-05-141-0/+18
|\ | | | | | | Change-Id: I7884d661e844275af52459f22c5b4901a2bc721c
| * 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
| | * 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.15' into devQt Forward Merge Bot2020-04-251-0/+20
|\| | | | | | | | | | | Change-Id: I07a4d2379ab69b3057dc8e3010fb107845713b2f
| * | 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>
* | | Update dependenciesFriedemann Kleint2020-03-274-4/+8
| | | | | | | | | | | | | | | | | | | | | Add missing Q_MOC_INCLUDE and fix QtConcurrent usage. Change-Id: I1d553144043c3db4d5b61315ce09223dda960e41 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-03-101-3/+3
|\| | | | | | | | | | | Change-Id: Ib07f9c06d9101c06cb64277e7482497f3a2a5e14
| * | 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>
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-02-291-1/+1
|\| | | | | | | | | | | Change-Id: Ie65be5acd9412ec7ff5327b57d3db21af4936dab
| * | 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.15' into devQt Forward Merge Bot2020-02-080-0/+0
|\| | | | | | | | | | | Change-Id: Ibdf217e291bbfa8ec8cf53f646234139a8b9a93c
| * | 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.15' into devQt Forward Merge Bot2020-02-011-0/+20
|\| | | | | | | | | | | Change-Id: I9c3109ef4209f474c87480e335e9cda152fea3b2
| * | 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>
* | | | Update dependencies on 'dev' in qt/qtpurchasingQt Submodule Update Bot2020-01-271-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: Idc3cd3711c65a21e7ac9474561e79b8bda0d947f Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtpurchasingQt Submodule Update Bot2020-01-211-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: Ifda44e740b1b1fc14d8d2e534dc9821e3499f268 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-01-211-5/+13
|\| | | | | | | | | | | | | | | Change-Id: I39c6854618c1989f2600dc17b22a8049fe39266c
| * | | 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>
* | | Update dependencies on 'dev' in qt/qtpurchasingQt Submodule Update Bot2020-01-151-3/+3
| | | | | | | | | | | | | | | Change-Id: Ib4c513a1e0348dfc2a6aaf4f308ecabacf0d8ab0 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-01-040-0/+0
|\| | | | | | | | | | | Change-Id: I037220318d8c0f61c126fa15bf7cc7fd1aa151f3
| * | 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.15' into devQt Forward Merge Bot2019-12-171-0/+18
|\| | | | | | | | | | | Change-Id: I4f1ae0d8951b056fd2906ab40650d40b53a82d1a
| * | 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>
* | | Update dependencies on 'dev' in qt/qtpurchasingQt Submodule Update Bot2019-12-051-3/+3
| | | | | | | | | | | | | | | Change-Id: I79fe685ab421c027bd27bd8fce2d9e9158155e81 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtpurchasingQt Submodule Update Bot2019-12-041-3/+3
| | | | | | | | | | | | | | | Change-Id: I7e423dc3353971c3932810cda4818dcb07bb3cae Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtpurchasingQt Submodule Update Bot2019-11-291-3/+3
| | | | | | | | | | | | | | | Change-Id: I6a6f17baaba89876b117e28bc94ddc0f08bc582c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtpurchasingQt Submodule Update Bot2019-11-281-3/+3
| | | | | | | | | | | | | | | Change-Id: I1e3030c52ae03c45d42aa50972cd47760257c5c2 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtpurchasingQt Submodule Update Bot2019-11-271-3/+3
| | | | | | | | | | | | | | | Change-Id: I781f00cbbdbe28dc73e22ef03d50294a9685e931 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtpurchasingQt Submodule Update Bot2019-11-251-3/+3
| | | | | | | | | | | | | | | Change-Id: Ic3afee6060fd8d66279280389de9d37cc7a66471 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtpurchasingQt Submodule Update Bot2019-11-221-3/+3
| | | | | | | | | | | | | | | Change-Id: I53059e7e30378425c05f37e4b48f9dc3a873e6f5 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtpurchasingQt Submodule Update Bot2019-11-131-3/+3
| | | | | | | | | | | | | | | Change-Id: I9027d42a1759bfbef7f90219e67c9a9ddf6e7fa6 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtpurchasingQt Submodule Update Bot2019-11-121-3/+3
| | | | | | | | | | | | | | | Change-Id: I5e52069251f3c487ec8af621fe0d94b7ccf3f247 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-11-121-0/+20
|\| | | | | | | | | | | Change-Id: I2b1db196682be6439a6a842e952e2c8c6de6d915
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-26 15:11:55 +0000