summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"v5.14.0-beta2v5.14.0-beta1v5.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: I2655ce57fef6a0996d2ce6e2bb2010cb6a072578
| * 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: Iba2abcde030e9168c8ffe7023fe3ff44d0920ef9
| | * 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: Ibe1967703a0b1e30d375fcb3d33a7b03f09a4c3d
| | | * Add changes file for Qt 5.12.5v5.12.5Antti Kokko2019-08-231-0/+20
| | |/ | | | | | | | | | | | | | | | | | | + ae907e4c0aa5ae78435138f86a7bd888ef0e1e9a Bump version Change-Id: If8ead3465896d4bbe1ac91b53c3fc7742c38c85b 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: I682b298e49fdc8ce4670bfbc444d904576c4579a
| | * | Add changes file for Qt 5.13.1v5.13.1Antti Kokko2019-07-301-0/+20
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | + 8fba2d1110bed680941c6fef8ead9bfffeaf0003 Bump version + ccf8f2f2b1729149965921462d9c2d3e5dd8f57a Add changes file for Qt 5.12.4 + 6aa5076f98d006e1ecd505835a2f77210a92a371 Bump version + ae907e4c0aa5ae78435138f86a7bd888ef0e1e9a Bump version Change-Id: I17bfd75a38532d270706975aa28926d9f8e9a5a0 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | | Handle offscreen surfacesLaszlo Agocs2019-07-254-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement createPlatformOffscreenSurface(). This way a QOffscreenSurface will not lead to creating a QWindow. Fairly dummy, and may need amending later, but fixes the immediate problem with the - still default - direct OpenGL code path of Qt Quick. Task-number: QTBUG-76993 Change-Id: Ia4198163fc91d3f353d0067a2a807ec075168ace Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io>
* | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-07-160-0/+0
|\ \ \
| * | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-07-160-0/+0
|/| | | | |/ / | | | | | | Change-Id: Id7773e6ae61f5d384daffbffa4a81c8c35e3012a
| * | 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: Ifba4093fb3e2c3ba4c2504405c9723a5ea8b9728
| | * Bump versionFrederik Gladhorn2019-07-011-1/+1
| | | | | | | | | | | | Change-Id: Idc099398e298ca4eb4f55b5cca3f22220b581589
* | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-07-110-0/+0
|\ \ \
| * | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-07-110-0/+0
|/| | | | |/ / | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I4ad4abdf21116a7323354306c8d2d3c0a18c734a
| * | Bump versionFrederik Gladhorn2019-07-011-1/+1
| | | | | | | | | | | | Change-Id: I1b36a7435289dcb30a5e43814b8574f2eb5b8d7f
* | | Eradicate Q_FOREACH loops and mark the module free of themMarc Mutz2019-07-012-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Q_FOREACH is scheduled for deprecation, or at the very least banned from use in Qt's own implementation. Change-Id: Ia83851d88da9fa94c901598a7500cf572db68b4e Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* | | Eradicate Java-style iterators and mark the module free of themMarc Mutz2019-07-012-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | Java-style iterators are scheduled for deprecation, or at the very least banned from use in Qt's own implementation. Change-Id: I3b65526968551baf48d1acb1e7184a3800092b56 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-06-291-0/+20
|\ \ \
| * | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-06-291-0/+20
|/| | | | |/ / | | | | | | Change-Id: I83879074104d25295b971281ffaf362e8e36bded
| * | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-06-281-0/+20
| |\ \
| | * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-06-271-0/+20
| |/| | | | |/ | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I319844b9822f92f4eb88ab7e5887daade13a5aad
| | * Merge "Merge remote-tracking branch 'origin/5.12.4' into 5.12"Qt Forward Merge Bot2019-06-172-1/+21
| | |\
| | | * Merge remote-tracking branch 'origin/5.12.4' into 5.12Qt Forward Merge Bot2019-06-172-1/+21
| | |/| | | | | | | | | | | | | Change-Id: I7c31649ba3973484c432b1d479327be2cb772692
| | | * Add changes file for Qt 5.12.4v5.12.4Antti Kokko2019-05-231-0/+20
| | | | | | | | | | | | | | | | | | | | Change-Id: I38fa67b5aa60418e00b9c8404edac3102a4a764d Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | | * Bump versionFrederik Gladhorn2019-05-231-1/+1
| | |/ | | | | | | | | | Change-Id: I6845a488bcdac99b1a2c8037b30cb3430e71977d
* | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-06-221-0/+18
|\ \ \
| * | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-06-221-0/+18
|/| | | | |/ / | | | | | | Change-Id: I99a06eabe9f624f304bb878b9d26338f8d646a89
| * | Merge "Merge remote-tracking branch 'origin/5.13.0' into 5.13"Qt Forward Merge Bot2019-06-201-0/+18
| |\ \
| | * | Merge remote-tracking branch 'origin/5.13.0' into 5.13Qt Forward Merge Bot2019-06-201-0/+18
| |/| | | | | | | | | | | | | | Change-Id: I97d144fb4483a8529a4445da08b4cbe425bc2fc0
| | * | Add changes file for Qt 5.13.0v5.13.0-rc3v5.13.0-rc2v5.13.0-rc1v5.13.0-beta4v5.13.0Antti Kokko2019-05-081-0/+18
| |/ / | | | | | | | | | | | | Change-Id: I86efbc1655914170beb29f3f39d048abba7221f0 Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io>
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-04-061-1/+0
|\| | | | | | | | | | | Change-Id: I59d16425187f5bbd4089eed0bc5f48efbe366bab
| * | Remove unused public interfacev5.13.0-beta3v5.13.0-beta2Jesus Fernandez2019-04-011-1/+0
| | | | | | | | | | | | | | | | | | | | | Due to recent changes, the public interface is no longer required. Change-Id: I69e532726e77592a3d7454b3a4f3230aa9cafe08 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-03-291-3/+3
|\| | | | | | | | | | | Change-Id: If93c78cef920af004e711e24ac836acf0c343aed
| * | Fix build - screen maintenance functions moved to QWSIJesus Fernandez2019-03-291-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is an ammendment to 01e1df90a7debd333314720fdd5cf6cd9964d796 in qtbase. Stop using screenAdded/destroyScreen deprecated functions. Task-number: QTBUG-74816 Change-Id: I6ce96e5dcd74e83560800de571d9530e4305e9ad Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-03-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Iaa898264fd37a294fcea824a518fb27380350257
| | * Bump versionv5.12.3Kari Oikarinen2019-03-211-1/+1
| | | | | | | | | | | | Change-Id: I089291fecb22fca2b6823b3d9d242ed41aa1313b
* | | Bump versionKari Oikarinen2019-02-251-1/+1
| | | | | | | | | | | | Change-Id: I24b051e5a0b5d49433742c398d98f17fa9c2215f
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-02-191-1/+1
|\| | | | | | | | | | | Change-Id: I39c4f5cd521571d0e4016be6b47d907de00fb9a5
| * | Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta1Qt Forward Merge Bot2019-02-161-1/+1
| |\| | | | | | | | | | Change-Id: I32333f07bfe235b50871177c1798b7c1194fc739
| | * Don't build the module in Android platformv5.12.2Jesus Fernandez2019-02-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | I'm not sure this platform makes sense. And the tests are failing. Change-Id: Ic78b833eab0f64dcd18c2409ab98efeaa8984b22 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io>
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-02-091-7/+6
|\| | | | | | | | | | | Change-Id: Icc1d28f07fdd82fd0b5fdc5c14c36be7106ee563
| * | Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-alpha1Qt Forward Merge Bot2019-02-021-7/+6
| |\| | | | | | | | | | Change-Id: If747100274972bf953c48867ab68e6636d61dbe2
| | * Destroy loading canvasJesus Fernandez2019-01-241-7/+6
| | | | | | | | | | | | | | | Change-Id: I948982b57f128bd3bd9832d0f877d2fe7e65ba03 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-02-026-10/+27
|\| | | | | | | | | | | Change-Id: I34a70e9a8333b762351f696e7732793d2dd8715c
| * | Add platform plugin parameter for websockerserverMaurice Kalinowski2019-01-306-10/+27
|/ / | | | | | | | | | | | | | | | | | | | | When using the webgl backend in a container, one needs to specify the port of the websocket server in addition to the http server. While using QT_WEBGL_WEBSOCKETSERVER is an option, it requires to pass a hostname in addition. Change-Id: Iefce12f049a81711a52586d60dd34bddbb9de12e Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2019-01-220-0/+0
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I7cc47b1ae0b10d1d4525daed8ae33ffbc496fc71
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-15 13:50:57 +0000