aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * Bump versionKari Oikarinen2019-03-211-1/+1
| | | | | | | | | | | | Change-Id: I56a95642ca1a7ac4054b11db9ab7115560311d9e
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-03-191-0/+20
|\| | | | | | | | | | | Change-Id: I9739dde1a4b3ac6240fa4e13fb0e24c125e08d23
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-03-161-0/+20
| |\| | | | | | | | | | Change-Id: I48ed37ceb4a46eb1a0d39f683858c8f42b83ac9c
| | * Merge remote-tracking branch 'origin/5.12.2' into 5.12Qt Forward Merge Bot2019-03-151-0/+20
| | |\ | | | | | | | | | | | | Change-Id: I9d3047ca90ed3339d090321f19aa4ed74629bd16
| | | * Add changes file for Qt 5.12.2v5.12.2Antti Kokko2019-02-261-0/+20
| | |/ | | | | | | | | | | | | | | | | | | | | | + f2b824ef56104253ca1208e35d7d0973475033a6 QtMacExtras depends on QtGui + c8d6f78710198afb83dfac1af3c8026eabed1cca Bump version Change-Id: I4922718635474225691a5a8f91b6c19df0499eae Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | | Bump versionKari Oikarinen2019-02-251-1/+1
| | | | | | | | | | | | Change-Id: Ieb40cbccba1b67de1321c10be489778b592f256b
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-02-051-0/+20
|\| | | | | | | | | | | Change-Id: I36e896c3c8e0b0244e76a80de687bab38120dfe0
| * | Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta1v5.13.0-alpha1Qt Forward Merge Bot2019-02-021-0/+20
|/| | | |/ | | | | Change-Id: Id7b78e6f417bdcf18bd1087682cb7e42faa3dfdf
| * Merge remote-tracking branch 'origin/5.12.1' into 5.12Qt Forward Merge Bot2019-02-011-0/+20
| |\ | | | | | | | | | Change-Id: I1a096611beb9d9a706aa66bce10539566fc3758e
| | * Add changes file for Qt 5.12.1v5.12.1Antti Kokko2019-01-101-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 6259f255228f04e8936c73c0db042d6201c13bc4 Do: Get rid of QT_INSTALL_HEADERS in documentation config + 4b318dbbb95f4ca60782846ec4b59422953900e7 Bump version + 9c6ac88da0509a220dd654d5caa53ff7c87a39d6 Add changes file for Qt 5.11.3 + a76ea12dc8f740b2adfd095ea3d6a6c727e27da1 Bump version Change-Id: I41d002117158a7c0d75758fb9245e2e9e8e5f4d3 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2019-01-171-0/+1
|\| | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I10c63184c38e20703113bf798aab2701ecdf9d68
| * | Bump versionKari Oikarinen2019-01-141-1/+1
| | | | | | | | | | | | Change-Id: Ib39ef3f7c09f67f82752aa02c3932d3dcd793608
| * | QtMacExtras depends on QtGuiLiang Qi2019-01-111-0/+1
| |/ | | | | | | | | | | | | Task-number: QTBUG-72931 Change-Id: I90c9f7073b76b7cab8e0df511aad6bc0deb7d4be Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2019-01-100-0/+0
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I493d67914a389ef025ef1262526de3a5081cdb52
| * Bump versionKari Oikarinen2019-01-071-1/+1
| | | | | | | | Change-Id: I82c8247ea54a2ec2a21e4c2bfb52ba9cd6dca625
* | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-12-151-0/+20
|\| | | | | | | Change-Id: I57c935bea40d9d4874251c81a492fb296ba91a71
| * Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-12-111-0/+20
| |\ | | | | | | | | | Change-Id: I0e2d508db285790a5bdb22315220d41445e3852a
| | * Merge remote-tracking branch 'origin/5.11.3' into 5.11Qt Forward Merge Bot2018-12-041-0/+20
| | |\ | | | | | | | | | | | | Change-Id: Ib1820d8b68c40f00227d5dfd42a84dea2331fb77
| | | * Add changes file for Qt 5.11.3v5.11.3Antti Kokko2018-11-161-0/+20
| | |/ | | | | | | | | | | | | | | | | | | + 4b318dbbb95f4ca60782846ec4b59422953900e7 Bump version Change-Id: Iecfa8f05639ea71b12773d406d55dd85aac3d4ce Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-12-081-0/+18
|\| | | | | | | | | | | Change-Id: I0b447b72b9a595b44a13244b3401f23b16fc5ce6
| * | Merge remote-tracking branch 'origin/5.12.0' into 5.12Qt Forward Merge Bot2018-12-051-0/+18
| |\ \ | | | | | | | | | | | | Change-Id: I2be3f3ddedb1f37c9e5665b3f11f3747e3996fe8
| | * | Add changes file for Qt 5.12.0v5.12.0-rc2v5.12.0-rc1v5.12.0-beta4v5.12.0Antti Kokko2018-11-021-0/+18
| | | | | | | | | | | | | | | | | | | | Change-Id: I6535c3b7405079b4cd55a4bbfdfb569c2b6b5939 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* | | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-11-170-0/+0
|\| | | | | | | | | | | | | | | Change-Id: I68f03f604550d428a4f198151f53dc2e7d8a6c92
| * | | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-11-160-0/+0
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ia5a9bfaf949b2501b3a8cb6f040c40e2a1833e9c
| | * | Bump versionOswald Buddenhagen2018-11-081-1/+1
| | | | | | | | | | | | | | | | Change-Id: I2d57bb5e9feed7301b601c6d3505e5419f4e41c3
* | | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-11-102-2/+2
|\| | | | | | | | | | | | | | | Change-Id: I9f867fd0414eb3079c2f4c314275149a7437922b
| * | | Do: Get rid of QT_INSTALL_HEADERS in documentation configTopi Reinio2018-11-072-2/+2
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | The use of QT_INSTALL_HEADERS caused documentation build failures in certain configurations. Use an alternative method to pass the required include paths to QDoc. Task-number: QTBUG-67925 Change-Id: I29d9443f25862ec35022fff8e8efdebda07a1937 Reviewed-by: Martin Smith <martin.smith@qt.io>
* | | Bump versionOswald Buddenhagen2018-10-111-1/+1
| | | | | | | | | | | | Change-Id: Iff37f70861e59d3b2e2e5459b638b7eca3c84a00
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-09-157-25/+55
|\| | | | | | | | | | | Change-Id: I0db88e32c19edf15111599888874a2261dc9a5fc
| * | Remove Q_FORWARD_DECLARE_OBJC_CLASS macrov5.12.0-beta3v5.12.0-beta2v5.12.0-beta1Tor Arne Vestbø2018-09-121-17/+0
| | | | | | | | | | | | | | | | | | | | | It's been in QtCore for a long time now. Change-Id: Ie861cce8b03c759311561f972c01970c5d859839 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
| * | Deprecate APIs where other alternatives are preferredTor Arne Vestbø2018-09-125-8/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some of the APIs in this module now have APIs in other parts of Qt, more closely tied to the classes they convert back and forth from. Other APIs have native equivalents that are just as simple as the Qt wrapper, and we want people to use the native APIs since that scales better, and teaches users that they can mix native and Qt APIs. Change-Id: Id587cefe3ab8bee9f7d3e7dc4cb223882d57d325 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
| * | Merge remote-tracking branch 'origin/5.11' into 5.12v5.12.0-alpha1Qt Forward Merge Bot2018-09-111-0/+24
|/| | | |/ | | | | Change-Id: I52bfcec5f76eba433d393e47b712e24c027460eb
| * Merge remote-tracking branch 'origin/5.11.2' into 5.11Qt Forward Merge Bot2018-09-091-0/+24
| |\ | | | | | | | | | Change-Id: Id8b50e4af3e31dfa9f40c6848be87cb80ff27d8f
| | * Add changes file for Qt 5.11.2v5.11.2Antti Kokko2018-08-301-0/+24
| |/ | | | | | | | | Change-Id: Ibedebdf477443215478a92b6c0cdb52000cd2c4c Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-08-072-0/+48
|\| | | | | | | Change-Id: I631922ffc3ae6bc2995601c2d7f6fbffbfcb6a72
| * Add changes file for Qt 5.9.5Antti Kokko2018-07-311-0/+24
| | | | | | | | | | | | Change-Id: I7760e6359cf8542cf8e8d7a128a2202aafba9c92 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> (cherry picked from commit fda624ef873c2fda08a9f64e558ad52d49f1441d)
| * Add changes file for Qt 5.9.6Antti Kokko2018-07-311-0/+24
| | | | | | | | | | | | | | Change-Id: Ib29c2556dc411ebcfb288955c99c7636f16a4ee4 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit 7750febd322dac0224f84c03271f9e0c08ff1bc9) Reviewed-by: Antti Kokko <antti.kokko@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-07-310-0/+0
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I747234f6265b70e9652b9b72249a5d1225110007
| * Bump versionOswald Buddenhagen2018-07-301-1/+1
| | | | | | | | Change-Id: If8f0cae03345c543225f03824c702ddc0c144a97
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-231-0/+24
|\| | | | | | | Change-Id: I6cfe10a822446a93ac99a8dbc818df73ab3e2892
| * Merge remote-tracking branch 'origin/5.11.1' into 5.11Qt Forward Merge Bot2018-06-191-0/+24
| |\ | | | | | | | | | Change-Id: I922e2a5df93f7cb0d0aca3295c8927e79505a167
| | * Add changes file for Qt 5.11.1v5.11.1Antti Kokko2018-06-131-0/+24
| |/ | | | | | | | | Change-Id: If5f2e57b59d544a4234786f671e63da30333c3f9 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-040-0/+0
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I35042af42c0d2121ec8b4256d713a194bbb94909
| * Bump versionOswald Buddenhagen2018-05-311-1/+1
| | | | | | | | Change-Id: Ia6a63be3143e918ecea5cfc80924652d30bf952d
* | Remove LGPL_EXCEPTION.txtEdward Welbourne2018-05-311-22/+0
| | | | | | | | | | | | | | | | It became obsolete when we switched to LGPL3, as discussed on the developer mailing list in April 2017. Change-Id: I67b007c52bbb94fc0626a080642c7bc1ed2ebdb6 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-05-121-0/+22
|\| | | | | | | Change-Id: Ia488cc6f600e69996c127376f1fce3eed3699485
| * Merge remote-tracking branch 'origin/5.11.0' into 5.11Qt Forward Merge Bot2018-05-091-0/+22
| |\ | | | | | | | | | Change-Id: I78c5e0efc00f77ec1154350f0ed73e9dbd52b37e
| | * Add changes file for Qt 5.11.0v5.11.0-rc2v5.11.0-rc1v5.11.0Antti Kokko2018-04-241-0/+22
| |/ | | | | | | | | Change-Id: I2ec8c79acbd6b7a7424d12b73fd388d820337fc4 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-04-144-0/+18
|\| | | | | | | Change-Id: I1e365621212c9b9a70f696b576b0b657bf0896a3
| * Doc: Fix documentation issues when using Clang-enabled QDocv5.11.0-beta4Topi Reinio2018-04-124-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QDoc in Qt 5.11 uses Clang to parse the C++ source for documentation comments. Unlike the old parser, Clang requires a module header to be present as well as correct include paths to generate the docs correctly. However, these are available from the build system only when building on macOS, not when generating the documentation on another system (e.g. Linux). To fix this, create a 'dummy' module header specific to doc builds and add required relative include paths and DEFINEs to .qdocconf. Change-Id: Iadc1475d16c5570b86de7ea8e17bfeb02d8412eb Reviewed-by: Martin Smith <martin.smith@qt.io>