summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add changes file for Qt 5.12.10v5.12.10Antti Kokko2020-10-161-0/+28
| | | | | | Pick-to: dev 5.15 5.12 Change-Id: Ic4cc0d2e23ef7cdb6e40ba2d634140035b5a52a7 Reviewed-by: Jesus Fernandez <jsfdez@gmail.com>
* Bump versionJani Heikkinen2020-10-141-1/+1
| | | | Change-Id: Id01321229514d3021e65e29059fa57aa53de9f9b
* Merge remote-tracking branch 'origin/5.12.9' into 5.12Qt Forward Merge Bot2020-06-171-0/+20
|\ | | | | | | Change-Id: I86d5dd9f8ec420752df386a6d2d4974667df9f6d
| * Add changes file for Qt 5.12.9v5.12.9Antti Kokko2020-06-041-0/+20
|/ | | | | | | + cade8889a0ac5f832dee3fde2aa6024426741908 Bump version Change-Id: I6f4e42787df7f767a973e609f3f007a8a7f8592a Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Bump versionAlexandru Croitor2020-04-221-1/+1
| | | | Change-Id: Iec8a490d8b0eac5b63176be7c7df3e1a6f5c37a5
* Merge remote-tracking branch 'origin/5.12.8' into 5.12Qt Forward Merge Bot2020-04-141-0/+20
|\ | | | | | | Change-Id: I78a3867b480b54306e50e35b58086c1aac2bd4ec
| * Add changes file for Qt 5.12.8v5.12.8Antti Kokko2020-03-241-0/+20
|/ | | | | | | + 985b234745102bcde82c5e710031f4454ad51a18 Bump version Change-Id: I0b2ef5690e9a6a078e81f8d740c5e6ec5e4b29f7 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Merge remote-tracking branch 'origin/5.12.7' into 5.12Qt Forward Merge Bot2020-01-311-0/+20
|\ | | | | | | Change-Id: Ic5da17867047cf49c5c51e86e26da23f7e8f0c81
| * Add changes file for Qt 5.12.7v5.12.7Antti Kokko2020-01-171-0/+20
| | | | | | | | | | | | | | + 772138f439dc29c0b4953df7f090fc2f2086ad8f Bump version Change-Id: Ic7ebe742da7d664f644ae866e4f14f14ee282186 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Bump versionAlexandru Croitor2020-01-281-1/+1
|/
* Merge remote-tracking branch 'origin/5.12.6' into 5.12Qt Forward Merge Bot2020-01-071-0/+20
|\ | | | | | | Change-Id: I9883ef2d4cb3e0bcaa075c1719de059811f6f452
| * Add changes file for Qt 5.12.6v5.12.6Antti Kokko2019-11-051-0/+20
| | | | | | | | | | | | | | + e0678f37d61f9523276697589e5e1473c16fdf87 Bump version Change-Id: I1fedd837783747659f8760adc4b0dbb6c3428a53 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Bump versionFrederik Gladhorn2019-11-071-1/+1
|/
* Bump versionFrederik Gladhorn2019-10-301-1/+1
|
* 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>
* Bump versionFrederik Gladhorn2019-07-011-1/+1
| | | | Change-Id: Idc099398e298ca4eb4f55b5cca3f22220b581589
* 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
* Bump versionv5.12.3Kari Oikarinen2019-03-211-1/+1
| | | | Change-Id: I089291fecb22fca2b6823b3d9d242ed41aa1313b
* 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>
* Destroy loading canvasJesus Fernandez2019-01-241-7/+6
| | | | | Change-Id: I948982b57f128bd3bd9832d0f877d2fe7e65ba03 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* Bump versionKari Oikarinen2019-01-141-1/+1
| | | | Change-Id: Ic059701ff277084ce2cd9f61bf319814d1812db3
* Bump versionv5.12.1Kari Oikarinen2019-01-071-1/+1
| | | | Change-Id: Id6d2e047b983528381b4ad61694aa43f3ea67e26
* 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 "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.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
* | 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>
* | 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>
* | Fix rendering updatev5.12.0-beta1Jesus Fernandez2018-10-012-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes the rendering updates after the commit 4d15f393a76cfcc4d54f311884fedac5bf0f72ee. Ensures the render update after hiding the window. It sets the value of updateRequestPending to false to allow continuing rendering after a client disconnects. Task-number: QTBUG-70191 Change-Id: I1e72f5af8ee3f7deebb2e35081961764e30db0d2 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io> Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io>
* | Remove QVERIFY and QCOMPAREJesus Fernandez2018-09-251-7/+14
| | | | | | | | | | | | | | | | | | Avoids calling QCOMPARE and QVERIFY inside an asynchronous function called from a QTRY_* that is subject to a QEXPECT_FAIL. Change-Id: Ibca2fd3d2cc83b6330f9436f0a0e1b602144880c Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* | Use reference in range for to avoid copyJesus Fernandez2018-09-251-1/+1
| | | | | | | | | | | | Change-Id: I5441025990c36226acc2065d7dde8f5220182350 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | Reload the browser when the socket disconnectsJesus Fernandez2018-09-242-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | It tries to reload the browser to try to reconnect. If the remote application closes, the browser will show the default disconnected page. Doing this the user will know the session ended and it will free the resources required to have a WebGL context alive in the browser. [ChangeLog][QtWebGL][General] Reload the browser when the WebSocket disconnects. Change-Id: I724d74ef6e44ff6b89e557f77f65fa827198a47d Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | Blacklist Linux QEMUJesus Fernandez2018-09-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | The test is failing because unknown reasons. It seenms the process spawning takes longer time each new test case until it reaches a QTRY_* timeout. Right now the test suite is failing in the launcher.qml test case but it seems it's related to a degradation after running some tests before this one. Task-number: QTBUG-70670 Change-Id: I4a17abafc7ff8af52ab80ca0bef909d35f09397c Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | Fix -Wzero-as-null-pointer-constantJesus Fernandez2018-09-141-1/+1
| | | | | | | | | | | | Change-Id: Iafcd7eeda4023027111b95d101d569a8ceb625d6 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* | Fix -Wold-style-castJesus Fernandez2018-09-141-12/+17
| | | | | | | | | | | | Change-Id: Iebd13c88a34477fd80c5a6be29d6cf60d680d89b Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* | Use QWebGLFunctionCall::addParametersJesus Fernandez2018-09-141-5/+1
| | | | | | | | | | | | | | | | It can add all the parameters in a single call. Change-Id: I3b6352459cfa39d0dc3760dea78c587ec709d5fa Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* | Move strings variable from global to local scopeJesus Fernandez2018-09-141-2/+1
| | | | | | | | | | | | Change-Id: I8934a434c8d87cb72b28c80de5737a7dd0c073ef Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | Add reload and update testsJesus Fernandez2018-09-139-23/+764
| | | | | | | | | | | | | | | | | | | | This patch also copies part of the code of an example form qtdeclarative that reproduces an update bug. Change-Id: I4b9c2be89d4110d36a04c46bb0865c82b3a2cd16 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>
* | Tests: Reduce verbosityv5.12.0-alpha1Jesus Fernandez2018-09-111-2/+3
| | | | | | | | | | | | Change-Id: I03b0c376cffa3c69f88c7200a78f7b3432646f78 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | Add findSwapBuffers functionJesus Fernandez2018-09-111-4/+11
| | | | | | | | | | | | | | To avoid repeating the same code in similar test cases coming in later commits. Change-Id: Ife2065629ee7c1cb9ea0ab509364af5c3e66e46f Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>