summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* CMake: Regenerate projects after mergewip/cmakeAlexandru Croitor2020-03-248-24/+16
| | | | | | | Change-Id: Ie3dcf131d55db1b5d5a6271910785e4aac46140e Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Merge remote-tracking branch 'origin/dev' into wip/cmakeAlexandru Croitor2020-03-239-11/+77
|\ | | | | | | | | | | | | Conflicts: dependencies.yaml Change-Id: I15dc8f6d292527b8686271c575b1f57897d17806
| * Update dependencies on 'dev' in qt/qtnetworkauthQt Submodule Update Bot2020-03-231-1/+1
| | | | | | | | | | Change-Id: I31d8359aea42adfa3f9e35ea25d52b659675eb6a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Update dependencies on 'dev' in qt/qtnetworkauthQt Submodule Update Bot2020-03-191-1/+1
| | | | | | | | | | Change-Id: I3e311f1262353b98e39d2c901a5f54b9fc8f489f Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Update dependencies on 'dev' in qt/qtnetworkauthQt Submodule Update Bot2020-03-191-1/+1
| | | | | | | | | | Change-Id: Ic2496077ece5e4c46e247e96aee8004061f34a18 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Update dependencies on 'dev' in qt/qtnetworkauthQt Submodule Update Bot2020-03-171-1/+1
| | | | | | | | | | Change-Id: Id0e072ac30ee4854758bb380b7d6cc61ad6a14fd Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Update dependencies on 'dev' in qt/qtnetworkauthQt Submodule Update Bot2020-03-161-1/+1
| | | | | | | | | | Change-Id: I07699329eca1d53b65615700f0cb1bbf50143064 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Update dependencies on 'dev' in qt/qtnetworkauthQt Submodule Update Bot2020-03-051-1/+1
| | | | | | | | | | Change-Id: I37e0ad37d818d6cc1a6f81c30a7affe2e5799770 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Update dependencies on 'dev' in qt/qtnetworkauthQt Submodule Update Bot2020-03-051-1/+1
| | | | | | | | | | Change-Id: I40a7c9edb626217f3a32f8fca95f5219ff05a4ba Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Update dependencies on 'dev' in qt/qtnetworkauthQt Submodule Update Bot2020-03-031-1/+1
| | | | | | | | | | Change-Id: I41824c74cb4ce21129eb429fe74d4c578fa245ee Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Update dependencies on 'dev' in qt/qtnetworkauthQt Submodule Update Bot2020-02-291-1/+1
| | | | | | | | | | Change-Id: I46f8ce71ae0eb7b81dc3b341c46f1b10041d061f Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-02-293-3/+3
| |\ | | | | | | | | | Change-Id: I7369187cdf27cf82f752ad33af14d15b92a102a4
| | * Revert "Use QNetworkReply::networkError() instead of simple error()"v5.15.0-beta2Timur Pocheptsov2020-02-243-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ce84933d7466a6eb966da03591f6b45fbc0dcb47. QProcess takes precedence. Naming in QProcess is considered to be the correct one. Change-Id: Ie54f27c31ac0753a54632be1fa37280016ebb671 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Jesus Fernandez <jsfdez@gmail.com>
| * | Update dependencies on 'dev' in qt/qtnetworkauthQt Submodule Update Bot2020-02-281-1/+1
| | | | | | | | | | | | | | | Change-Id: Ied8a9b764107ce269ce38b4e1099563e9392f9a6 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Update dependencies on 'dev' in qt/qtnetworkauthQt Submodule Update Bot2020-02-281-1/+1
| | | | | | | | | | | | | | | Change-Id: Id4c10ff6967e08ce2cca96eddfa698362c0a71a2 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Update dependencies on 'dev' in qt/qtnetworkauthQt Submodule Update Bot2020-02-271-1/+1
| | | | | | | | | | | | | | | Change-Id: If98022ed5e9f7cf026452b745b3d9de4123d6efb Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Update dependencies on 'dev' in qt/qtnetworkauthQt Submodule Update Bot2020-02-271-1/+1
| | | | | | | | | | | | | | | Change-Id: Iabc52447424ed346cf5fd4e380c0f21d8f5dd5cd Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Update dependencies on 'dev' in qt/qtnetworkauthQt Submodule Update Bot2020-02-271-1/+1
| | | | | | | | | | | | | | | Change-Id: Ib8bc3d2f74246f799693b3a6e3fb1cca3b0f0060 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Update dependencies on 'dev' in qt/qtnetworkauthQt Submodule Update Bot2020-02-271-1/+1
| | | | | | | | | | | | | | | Change-Id: I1ff7eeafbf3ff7914aa88c49f0831ca9208b8e8a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Update dependencies on 'dev' in qt/qtnetworkauthQt Submodule Update Bot2020-02-261-1/+1
| | | | | | | | | | | | | | | Change-Id: I45a3e48cc980ec3c1a22cb5e9d7b15a9bee5c868 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Update dependencies on 'dev' in qt/qtnetworkauthQt Submodule Update Bot2020-02-261-1/+1
| | | | | | | | | | | | | | | Change-Id: I67d673022af3f7c0d4654d3e55d9d27dfdb97306 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Update dependencies on 'dev' in qt/qtnetworkauthQt Submodule Update Bot2020-02-231-1/+1
| | | | | | | | | | | | | | | Change-Id: I092ed5c75caa4b58e359f902c773989a11a0f731 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-02-221-1/+1
| |\| | | | | | | | | | Change-Id: I67bb49976721aa652139152906d56fb1ad31b4d3
| | * Fix deprecation warning against Qt::SystemLocaleShortDatev5.15.0-beta1Edward Welbourne2020-02-181-1/+1
| | | | | | | | | | | | | | | Change-Id: I4acbe4df6f96c1600496195e934dd8c77134c584 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * | Update dependencies on 'dev' in qt/qtnetworkauthQt Submodule Update Bot2020-02-181-1/+1
| | | | | | | | | | | | | | | Change-Id: I65b06c4f8d843c854b730dbacbf5750ee95b7a3e Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Update dependencies on 'dev' in qt/qtnetworkauthQt Submodule Update Bot2020-02-181-1/+1
| | | | | | | | | | | | | | | Change-Id: I195e6012d29e97da17e83606af4b68025616ce2e Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Update dependencies on 'dev' in qt/qtnetworkauthQt Submodule Update Bot2020-02-181-1/+1
| | | | | | | | | | | | | | | Change-Id: I81e39ff277fb133f3b3862414320cc68f52c6279 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Update dependencies on 'dev' in qt/qtnetworkauthQt Submodule Update Bot2020-02-161-1/+1
| | | | | | | | | | | | | | | Change-Id: Ie7e7d685e06a1599f62bac1d9c2ccdbe25a3d4f7 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Update dependencies on 'dev' in qt/qtnetworkauthQt Submodule Update Bot2020-02-151-1/+1
| | | | | | | | | | | | | | | Change-Id: I63d6727c3ba309c31125774199bb02703a5d7c98 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Update dependencies on 'dev' in qt/qtnetworkauthQt Submodule Update Bot2020-02-141-1/+1
| | | | | | | | | | | | | | | Change-Id: I7197d67c592cb8b22d705d2feb569b14c98d6f55 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Update dependencies on 'dev' in qt/qtnetworkauthQt Submodule Update Bot2020-02-141-1/+1
| | | | | | | | | | | | | | | Change-Id: I64b4185ab17490970be9ee900407289ffe8e3937 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Update dependencies on 'dev' in qt/qtnetworkauthQt Submodule Update Bot2020-02-131-1/+1
| | | | | | | | | | | | | | | Change-Id: Ifd078cc4f12b3ad611d36e1f33250b5556e93196 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-02-110-0/+0
| |\| | | | | | | | | | Change-Id: I06b9949b113a2bda1c7285fd52a0192aa944c01c
| | * Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-alpha1Qt Forward Merge Bot2020-02-050-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I04fa78ff07aafdaf7a0718bca10242413a9a9ec9
| | | * Bump versionAlexandru Croitor2020-02-021-1/+1
| | | | | | | | | | | | | | | | Change-Id: I44f64d17eb4ec585e786f73a738addad7bfe86a4
| * | | Update dependencies on 'dev' in qt/qtnetworkauthQt Submodule Update Bot2020-02-091-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I07e2d293a14b24f1bfd307e95b53d3454bcef663 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Update dependencies on 'dev' in qt/qtnetworkauthQt Submodule Update Bot2020-02-081-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: If30b2f42800ef900c94ca9e3ec0d2e1aec82d1d9 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Update dependencies on 'dev' in qt/qtnetworkauthQt Submodule Update Bot2020-02-081-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I9d2f413a4d401b9eb7737e6e24b060e30270161d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Update dependencies on 'dev' in qt/qtnetworkauthQt Submodule Update Bot2020-02-071-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I865e59f667df8653efac0eaf91d32fc9883369f2 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Remove QT_NO_LINKED_LISTSona Kurazyan2020-02-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QLinkedList is deprecated and moved to Qt5Compat, there's no need for QT_NO_LINKED_LIST. Change-Id: I806b76ca6829813a07544f0adc660788f6955b39 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * | | Update dependencies on 'dev' in qt/qtnetworkauthQt Submodule Update Bot2020-02-051-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I6242cec2f42fc0e83515f544b2b79f792ac953bc Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Update dependencies on 'dev' in qt/qtnetworkauthQt Submodule Update Bot2020-02-041-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Ib5246748e78db06e91ca3449007d1e3fb2d443fd Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Update dependencies on 'dev' in qt/qtnetworkauthQt Submodule Update Bot2020-02-041-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I6735a6a0dba7a25b984adcbd52486cc6236145b1 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-02-042-3/+26
| |\| | | | | | | | | | | | | | Change-Id: I0d34f77c35539fc18b800d24a3bf4b84ce887c4e
| | * | Suppress remaining uses of QVariantMap::uniteMårten Nordheim2020-01-301-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By going through a QMultiMap. Change-Id: I2c2c111f1d9a551dcf1d54715455a92e0855babe Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
| | * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-281-0/+20
| | |\| | | | | | | | | | | | | Change-Id: I2b073913516dad48ff948e27b6d321f2425f0d9e
| | | * Merge remote-tracking branch 'origin/5.14.1' into 5.14Qt Forward Merge Bot2020-01-271-0/+20
| | | |\ | | | | | | | | | | | | | | | Change-Id: I5b93c7dafa1472219f19fc6b3474745f258f6ef2
| | | | * Add changes file for Qt 5.14.1v5.14.1Antti Kokko2020-01-091-0/+20
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | + 923f889ff7ba000efcd0c51eadcb452181899fcc Bump version Change-Id: I1f7156867661190043b83836e9b5d3ae7f36ec34 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * | | Update dependencies on 'dev' in qt/qtnetworkauthQt Submodule Update Bot2020-02-021-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I90df679fed3516f1faa8842f1a5bcb4f9e178e99 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Update dependencies on 'dev' in qt/qtnetworkauthQt Submodule Update Bot2020-01-311-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Iad0db3fa07db92ad15b52be4b278dd00c372c2ec Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>