summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-10-023-10/+18
|\| | | | | | | | | | | Change-Id: Ie08ec4454b9ce750e00f2624abe9b9abecf7b45f
| * | 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>
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-09-2512-46/+790
|\| | | | | | | | | | | Change-Id: Ib25fc536594d89de787a1a3b273565e5c2ac80ee
| * | 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>
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-09-113-10/+41
|\| | | | | | | | | | | Change-Id: I7a33f19a46adc206a282a5854a98e89542c7b99d
| * | 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>
| * | Fix OpenGL context crashJesus Fernandez2018-09-111-6/+6
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-70458 Change-Id: I00efefeb9f8c0bf245c77e68c285e596c60755e1 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-09-111-0/+24
|/| | | |/ | | | | Change-Id: I22d20f81f63bb42f3d05910ab62857f58442b0d6
| * Merge remote-tracking branch 'origin/5.11.2' into 5.11Qt Forward Merge Bot2018-09-091-0/+24
| |\ | | | | | | | | | Change-Id: If7dc4e51d482b23c2f79b7ca71d79436aa7387da
| | * Add changes file for Qt 5.11.2v5.11.2Antti Kokko2018-08-291-0/+24
| |/ | | | | | | | | Change-Id: If5d8e039bb436fc15dc163e44f28823c3524d272 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-07-311-1/+0
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I0949f4de88e34271b38c7ebd639a8991b22002fc
| * Bump versionOswald Buddenhagen2018-07-301-1/+1
| | | | | | | | Change-Id: I3443d630bca7209ec162c8439a47025b9a9042da
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-07-141-1/+1
|\| | | | | | | Change-Id: I46001e91691d29540c1ce21be9d72fddf3684a13
| * Silence warning about paddingJesus Fernandez2018-07-101-1/+1
| | | | | | | | | | Change-Id: I640cd8eeaf468fc004ae2b34c00518d3c4b62866 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-231-0/+24
|\| | | | | | | Change-Id: Idcfe4c1a96984a799d6f4c3d024ed738fad1a91a
| * Merge remote-tracking branch 'origin/5.11.1' into 5.11Qt Forward Merge Bot2018-06-191-0/+24
| |\ | | | | | | | | | Change-Id: I08d20cb83d63191b9cbbde34af509e95bc26345d
| | * Add changes file for Qt 5.11.1v5.11.1Antti Kokko2018-06-091-0/+24
| |/ | | | | | | | | Change-Id: I62f8a1a15cdedfdc68bcfdc21195a8c73dfa112e Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-122-103/+102
|\| | | | | | | Change-Id: I7030064d9b6b46246488e1b43127301d84af33ac
| * Remove unused variableJesus Fernandez2018-06-051-1/+0
| | | | | | | | | | | | | | | | It removes rotatingAngle. It was being serialized in the browser but ignored by the QPA plugin. Sending it is not necessary. Change-Id: I1cc7a4aba10886887fe7ec037139f5c943425494 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
| * Normalize object notationJesus Fernandez2018-06-051-97/+97
| | | | | | | | | | | | | | | | It removes whitespaces before the colon in object creation. Change-Id: I54d8bc5e5e5a8284dfdd8e0c3a35961f87134196 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
| * Fix typoJesus Fernandez2018-06-042-8/+8
| | | | | | | | | | | | | | Replace radious with radius. Change-Id: Ief1373a6eeaa54490ca608d633294438274fa15c Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-0411-45/+485
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ia44a20a78bc327ce199f02e1c1d2fb6c246d6675
| * Prefer object notation over bracesJesus Fernandez2018-06-041-43/+45
| | | | | | | | | | | | | | | | JSHint recommends it. Change-Id: I70181f0012ad79cafd73071c268c9f1ae05ba42b Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
| * Fix critical messagesJesus Fernandez2018-06-011-2/+2
| | | | | | | | | | | | | | | | | | Fixes a misleading message. Removes the function name from the message. Change-Id: Ie0ef0c7dc0b0fc4b1e2ee4665e2b7aacdd111b5c Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
| * Bump versionOswald Buddenhagen2018-05-311-1/+1
| | | | | | | | Change-Id: I0f6e6f411c8d21dcacf8150d57b474e52c4e65ae
| * Add a basic testJesus Fernandez2018-05-299-0/+438
| | | | | | | | | | | | | | | | | | Adds the test suite with a very basic test: It will try to receive the swapBuffers command from the qmlscene. Change-Id: If74819fffd5f876c7bf2bf68a25ca6998fe870ef Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-05-261-2/+2
|\| | | | | | | Change-Id: I7c12121a87fe29b2058e2971eb8f9a0b76fa4940
| * Fix detection of invalid parameterJesus Fernandez2018-05-251-1/+1
| | | | | | | | | | | | | | | | It fixes the invalid port check. The condition was dead code due to a previous check. Change-Id: I22bb7497f9577aeed0140542337c0a13200e37a8 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
| * Convert port string to ushortJesus Fernandez2018-05-221-1/+1
| | | | | | | | | | | | | | Removes clazy warning. Change-Id: Ib019497a8b3f8812ddf51ae59373a7a9501c9b21 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-05-121-0/+33
|\| | | | | | | Change-Id: I85a92fa6b14ec7cb9a064324bc482e5affef0aef
| * Merge remote-tracking branch 'origin/5.11.0' into 5.11Qt Forward Merge Bot2018-05-091-0/+33
| |\ | | | | | | | | | Change-Id: I9c24a9542d3e77f558485b9ebf79c647eececd9d
| | * Add changes file for Qt 5.11.0v5.11.0-rc2v5.11.0-rc1v5.11.0Antti Kokko2018-04-241-0/+33
| | | | | | | | | | | | | | | Change-Id: I1a3546f2d14a447eb92c3f904c040bc8c5d8533f Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io>
* | | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-04-281-1/+1
|\| | | | | | | | | | | Change-Id: Iac63b4aa9b02baca2fb9c293f8e2f03d3bfabef5
| * | Fix Clang 6 warning about not using the override keywordThiago Macieira2018-04-271-1/+1
| |/ | | | | | | | | | | | | | | /qwebglwindow.h:64:19: warning: 'screen' overrides a member function but is not marked 'override' [-Winconsistent-missing-override] Change-Id: I3840d727dee443318644fffd1529390d71aae8d8 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-04-146-92/+99
|\| | | | | | | Change-Id: Ib8aa9397ae3e6f05705835c9ceb4d63ab592b63b
| * Fix warningsv5.11.0-beta4Jesus Fernandez2018-04-051-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "qwebglintegration.cpp", line 216: warning #68-D: integer conversion resulted in a change of sign WId winId = -1; ^ "qwebglintegration.cpp", line 491: warning #1215-D: function "QWindowSystemInterface::handleMouseEvent(QWindow *, ulong, const)" QPointF &, const QPointF &, Qt::MouseButtons, Qt::KeyboardModifiers, Qt::MouseEventSource) [with] Delivery=QWindowSystemInterface::DefaultDelivery]" (declared at line 85 of "/home/qt/work/install/include/QtGui/5.11.0/QtGui/qpa/qwindowsystemin ce.h") was declared deprecated" QWindowSystemInterface::handleMouseEvent(platformWindow->window(), ^ "qwebglintegration.cpp", line 513: warning #1215-D: function "QWindowSystemInterface::handleWheelEvent(QWindow *, ulong, const QPointF &, const QPointF &, int, Qt::Orientation, Qt::KeyboardModifiers)" (declared at line 153 of "/home/qt/work/install/include/QtGui/5.11.0/QtGui/qpa/qwindowsystemin terface.h") was declared deprecated QWindowSystemInterface::handleWheelEvent(platformWindow->window(), ^ Change-Id: I0b83cc38b6567f3819890c74e973bba52fe2acf8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
| * Silence complaints about bitwise operationsv5.11.0-beta3Jesus Fernandez2018-03-271-0/+3
| | | | | | | | | | | | | | | | | | | | JSLint complains about the bitwise operations. From documentation: Bitwise operators are very rare in JavaScript programs and quite often & is simply a mistyped &&. Change-Id: Ibda95e06bb062b71d4b5866a06010d57a6f321a6 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
| * Remove old partial binary message workaroundJesus Fernandez2018-03-272-28/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The original implementation of the plugin was created using Qt 5.8. A workaround was added to avoid partial binary messages. Apparently, this is not happening anymore, so the workaround is not needed anymore. Removing the workaround can provide a performance boost since the application sends the binary message in a single message and the browser does not need to rebuild the message. Change-Id: I18e7a1c559d8a5d677ab66131098a6a1e855d985 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
| * Fix browser warning and use addEventListenerJesus Fernandez2018-03-221-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | [Violation] Added non-passive event listener to a scroll-blocking event. Consider marking event handler as 'passive' to make the page more responsive. See https://www.chromestatus.com/feature/5745543795965952 This patch also uses addEventListener instead of assigning the callback directly to the function to be able to mark the event as passive. Change-Id: I6c2336eed0cc4bc562fff09a08737815eaa864ce Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
| * Add missing semicolonsJesus Fernandez2018-03-221-14/+14
| | | | | | | | | | | | Change-Id: I0d4feade770b607e6cc3dc304038281a79097c4a Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
| * Remove unnecessary semicolonJesus Fernandez2018-03-211-1/+1
| | | | | | | | | | | | | | Change-Id: I30c344d41514fa46bac1cb00b6cd54edf13c6397 Reviewed-by: Michael Winkelmann <michael.winkelmann@qt.io> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-16 10:23:49 +0000