aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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: I9eff3b10be0b1cd6b62d08b4039e6390a8048a13
| * Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-04-211-0/+20
| |\ | | | | | | | | | Change-Id: Ia7342226c20223daf89ec3691a2c62c046ecb2a5
| | * Merge remote-tracking branch 'origin/5.14.2' into 5.145.14Qt Forward Merge Bot2020-04-211-0/+20
| | |\ | | | | | | | | | | | | Change-Id: I8188351860e4b355ce4acbef55ae3e76466c195c
| | | * Add changes file for Qt 5.14.2v5.14.2Antti Kokko2020-03-101-0/+20
| | |/ | | | | | | | | | | | | | | | | | | | | | + 9beac3cc9bcb1806ad1f8118a70467c122b9e938 Bump version + 0d5ce87e1aeaed361c8d034e8329c0ceca62e42a Remove confusing documentation Change-Id: I2e62e1d75750adeb18f06e44d3e26ab5de487ff2 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | / Add changes file for Qt 5.15.0Antti Kokko2020-04-221-0/+18
|/ / | | | | | | | | | | | | | | | | | | | | + 23fb8fa7d3894d5f93ec5d51461e1366274a0c0b Bump version + 98fea3ae261313b88cb3f67c7f9d3368e635cd51 Reduce QList usage + c23dcca0a0d768f87c1fa164380f1028ce1ee43d Use UTF-16 literals where possible + ed91358ec20bb96fe2eff1b9dfaf772c9b1dba5d Use QNetworkReply::networkError() instead of deprecated error() + d5310efd2fbbe9786a4257f3ada78381cb54da23 Revert "Use QNetworkReply::networkError() instead of deprecated error()" Change-Id: I8237732432111f4594e0ae4252e732fe91d863e9 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Revert "Use QNetworkReply::networkError() instead of deprecated error()"v5.15.0-beta4v5.15.0-beta3v5.15.0-beta2Timur Pocheptsov2020-02-241-1/+1
| | | | | | | | | | | | | | | | | | This reverts commit ed91358ec20bb96fe2eff1b9dfaf772c9b1dba5d. Naming in QProcess is considered to be the correct one and the rule. Change-Id: Iaca8e2661454ace9f73b0fbbae0bf429153f0268 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta1Qt Forward Merge Bot2020-02-181-3/+3
|\| | | | | | | Change-Id: Ib98519d9d455d072e47c85cabd60d2e20cb28325
| * Remove confusing documentationYuhang Zhao2020-02-151-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QtWin::extendFrameIntoClientArea: You should set Qt::WA_NoSystemBackground for it to work QtWin::resetExtendedFrame: You must unset Qt::WA_NoSystemBackground for it to work Actual result: Set Qt::WA_NoSystemBackground and then call QtWin::extendFrameIntoClientArea results in a black window. So the documentation of QtWin::resetExtendedFrame is correct. Fixes: QTBUG-81831 Change-Id: I0fafb7049d65fa22eeb1b167a6227042f2fefe73 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | 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: I00344b079aeeeac0528f1206ec22a206e482015b
| * Bump versionAlexandru Croitor2020-02-021-1/+1
| | | | | | | | Change-Id: I57c95c00c9e1a2f8e1ce8f34dd863bc4060f6472
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-281-0/+20
|\| | | | | | | Change-Id: Ifc7ee2e0a9c4d2587286c0e850b70788b2d980e2
| * Merge remote-tracking branch 'origin/5.14.1' into 5.14Qt Forward Merge Bot2020-01-271-0/+20
| |\ | | | | | | | | | Change-Id: I8162b398fcdb68875dfafb7416a5120b263238e3
| | * Add changes file for Qt 5.14.1v5.14.1Antti Kokko2020-01-091-0/+20
| |/ | | | | | | | | | | | | + f2dde34d7d97616e027d7e37c7d6ef098723c2a1 Bump version Change-Id: I7441a4780e7546529c16f5b769bd3d900f627122 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Use QNetworkReply::networkError() instead of deprecated error()Timur Pocheptsov2020-01-151-1/+1
| | | | | | | | | | | | Task-number: QTBUG-80369 Change-Id: I9bd16bd0a1bd7a306622db03e012eb408e4bc6ea Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-300-0/+0
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I257eab9474deaac5fec271bbd28fe9cc4ded7d72
| * Bump versionDaniel Smith2019-12-161-1/+1
| | | | | | | | Change-Id: Id1549cff6ee954aff96f7f92116e612dd1c0ca83
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-141-0/+18
|\| | | | | | | Change-Id: Ie8658751efc8bd9426eb98ac8b6a4ea2c4f1f230
| * Merge remote-tracking branch 'origin/5.14.0' into 5.14Qt Forward Merge Bot2019-12-131-0/+18
| |\ | | | | | | | | | Change-Id: If54b6799b82707813d3eabcf0ec69964f6c4da31
| | * Add changes file for Qt 5.14.0v5.14.0-rc2v5.14.0-rc1v5.14.0Antti Kokko2019-11-261-0/+18
| |/ | | | | | | | | Change-Id: I979210b94548cd9ccc95ae9ade9fa3e420f9413a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Use UTF-16 literals where possibleFriedemann Kleint2019-12-028-21/+21
| | | | | | | | | | | | | | | | This should minimize diffs to Qt 6. Change-Id: I4ba077ebec3b1d76f822b74328ab55235d1ee11a Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: André de la Rocha <andre.rocha@qt.io>
* | Reduce QList usageFriedemann Kleint2019-11-205-5/+8
| | | | | | | | | | | | | | | | Prepare for migration to Qt 6 by using QVector where possible or auto. Change-Id: I7ee34e15a2ca534343ee5684ae24aadc0945eed9 Reviewed-by: André de la Rocha <andre.rocha@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-091-0/+20
|\| | | | | | | Change-Id: I67e83275a4904aa5655a69e63c87c2d515a6efba
| * 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: I4a35016b3f12894776b9d62948a873abdda8d26a
| | * Add changes file for Qt 5.13.2v5.13.25.13Antti Kokko2019-10-141-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | + 1ff458e8709d4e7b9a1489f2b246fc54efc8de72 Add changes file for Qt 5.12.5 + 15b0086268a33e6469e300da9817f723ade0a588 Doc: Define doc-specific typedef for Windows type 'IDataObject' Change-Id: Iaf6ad80f59132b3cf8e0b4183b4804344d08d483 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | * Bump versionFrederik Gladhorn2019-10-141-1/+1
| | | | | | | | | | | | Change-Id: I86165e6dbf99bcb1744f09e5b34f1824556d68c3
* | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-10-263-5/+26
|\| | | | | | | | | | | Change-Id: Id6597e900c1a371e88d20689280ea0afa2655926
| * | Music player: Fix progress and thumb nail toolbarFriedemann Kleint2019-10-223-5/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A valid window handle must be set for this to work. Delay this until QWidget::show() and add documentation. Fixes: QTBUG-79348 Change-Id: Ib7db9568e0d70cb6194176f2da95a3b2087e403f Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | | Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"Qt Forward Merge Bot2019-09-281-0/+1
|\ \ \
| * | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-09-281-0/+1
|/| | | | |/ / | | | | | | Change-Id: Ibcbeb4900bc1870c47f98d2e4d951314d1e61b63
| * | Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"v5.14.0-beta2v5.14.0-beta1Qt Forward Merge Bot2019-09-241-0/+1
| |\ \
| | * | Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-09-241-0/+1
| |/| | | | |/ | | | | | | Change-Id: Iceacd5cd6c810eecf8ca07b00f1348ac317560cc
| | * Doc: Define doc-specific typedef for Windows type 'IDataObject'Topi Reinio2019-09-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Without this, the Clang-parser seems to convert the type to 'int' on non-Windows platforms. Fixes: QTBUG-78551 Change-Id: I3d727fed8be46ef1a25c4fdf2b10fa3429d784ff Reviewed-by: Paul Wicking <paul.wicking@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: I15192f53d8c10754aa7bdc97fa126844823a917e
| * | 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: If89b38a38374b199c8f38ec88dd5d21e4dcd080b
| | * 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: If9cf3a8a9c4674d17a5526f215df416e19cdcb54
| | | * 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: Id761263aeb1b87c85dc7c13fd723408f310745d0
| | | | * Add changes file for Qt 5.12.5v5.12.5Antti Kokko2019-08-231-0/+20
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | + 3fc1164ee5464a317ac4daccc4edca09e4cae630 Bump version Change-Id: I02cd1ceeffc58b884923eb9d42fbcafccf5c755a Reviewed-by: Jani Heikkinen <jani.heikkinen@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: I4eefd8dcfecbd293e3d4c5f2e9f15fb828e7a1dc
| | | * | Add changes file for Qt 5.13.1v5.13.1Antti Kokko2019-07-301-0/+20
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + bc2ce0f326658c561b6f6785ce566a194392a063 Bump version + ab937fb390696a1adf6a97d820c900a53d316a62 Add changes file for Qt 5.12.4 + 75ef3b628f2d162dd349bbe24e0809ea87c9e91a Bump version + 3fc1164ee5464a317ac4daccc4edca09e4cae630 Bump version + 3aa951ac3d2e328df03b5d8abfe335aed5ab4edf Doc: Replace example file lists with links to code.qt.io Change-Id: I7bc7bf60fbe071035875acd4408c1e63356b4db9 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | / / Bump versionKari Oikarinen2019-08-271-1/+1
|/ / / | | | | | | | | | Change-Id: I6542979165a46f4ff5752c0f72c9cf79adc3b2b0
* | | 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: I261fbc640d1f72910effb637bd65bc00535665ed
| * | 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: I5aea97301fc536aa9f3064bb1beef5684a9195be
| | | * Bump versionFrederik Gladhorn2019-07-011-1/+1
| | | | | | | | | | | | | | | | Change-Id: I9f96ca47c67be7e6e77ac73939a529808dd27145