summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | 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
| * Bump versionKari Oikarinen2019-01-141-1/+1
| | | | | | | | Change-Id: Ic059701ff277084ce2cd9f61bf319814d1812db3
* | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2019-01-100-0/+0
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ifd0c7a09c5efd6b1cd00d478640777d81c241006
| * Bump versionv5.12.1Kari Oikarinen2019-01-071-1/+1
| | | | | | | | Change-Id: Id6d2e047b983528381b4ad61694aa43f3ea67e26
* | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-12-151-0/+20
|\| | | | | | | Change-Id: I6509547462a8a5cd62acf580e8e7d2519df50081
| * Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-12-111-0/+20
| |\ | | | | | | | | | Change-Id: I8a97ae5a9491b7c9a7077ccda0931d1587dee4dd
| | * Merge remote-tracking branch 'origin/5.11.3' into 5.11Qt Forward Merge Bot2018-12-041-0/+20
| | |\ | | | | | | | | | | | | Change-Id: I481594af85c36ff751593d0b30b473638073c2d0
| | | * Add changes file for Qt 5.11.3v5.11.3Antti Kokko2018-11-161-0/+20
| | |/ | | | | | | | | | | | | | | | | | | + 4519f09577e76c6c0f6cc7ca4c0a5a78174bc4a9 Bump version Change-Id: If2bae0fe17d17c2ecc2717109e482cff92565388 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-12-082-4/+35
|\| | | | | | | | | | | Change-Id: Ibc6e0a8c0efb90dfd9dcafbcd4f8dfd02282eb64
| * | Merge "Merge remote-tracking branch 'origin/5.12.0' into 5.12" into ↵Liang Qi2018-12-051-0/+25
| |\ \ | | | | | | | | | | | | refs/staging/5.12
| | * \ Merge remote-tracking branch 'origin/5.12.0' into 5.12Qt Forward Merge Bot2018-12-051-0/+25
| | |\ \ | | | | | | | | | | | | | | | Change-Id: I7c5510213c28f1160f3301104ca44798a965aee3
| | | * | Add changes file for Qt 5.12.0v5.12.0-rc2v5.12.0-rc1v5.12.0Antti Kokko2018-11-081-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I81f76e1ba72465826e3675be10c408c1c2a22c20 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
| * | | | Fix calling convention in Win32Jesus Fernandez2018-12-051-4/+10
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A mismatch with the calling convention was messing up the stack of the caller function. OpenGL calls in Win32 are expected to be using the call convention defined in GL_APIENTRY instead of the compiler default. Task-number: QTBUG-72129 Change-Id: I460b083a2cb03a297904a2bcfd13e7e704b2e136 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* | | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-11-170-0/+0
|\| | | | | | | | | | | | | | | Change-Id: I39c01330021aeb58e739e29eb94329ecfb4a014a
| * | | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-11-160-0/+0
| |\ \ \ | | |/ / | |/| / | | |/ | | | | | | | | | Conflicts: .qmake.conf Change-Id: I525353bafc14c3965127a8b13372eb435de0752e
| | * Bump versionOswald Buddenhagen2018-11-081-1/+1
| | | | | | | | | | | | Change-Id: Ib155eb9eb874e9169d480da48729a52094c044b1
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-10-271-0/+2
|\| | | | | | | | | | | Change-Id: Id3551a28a02dbf8bd2091961d38a1f880f82f105
| * | Check the pointer before dereferencing it to avoid crashesv5.12.0-beta4Jesus Fernandez2018-10-241-0/+2
| | | | | | | | | | | | | | | | | | Change-Id: I238698a5f74b426761eb524d88d284176738d5ae Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-10-132-3/+8
|\| | | | | | | | | | | Change-Id: I625d71174c9a396827d60f4f93530a93ade93868
| * | Disable mouse tracking by defaultv5.12.0-beta3v5.12.0-beta2Jesus Fernandez2018-10-122-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It will improve the performance and fix problems with code not optimized for the new QtQuick scenegraph. A new environment variable is added in this patch to enable it, QT_WEBGL_TRACKING. Change-Id: Id2b87c5baa16822008a146051fa43be12db0a1ed Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* | | Bump versionOswald Buddenhagen2018-10-111-1/+1
| | | | | | | | | | | | Change-Id: If6c6134dba78be4e23168888de9f75b691eec702
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-14 19:59:11 +0000