summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Use Q_STATIC_LOGGING_CATEGORYHEADdevUlf Hermann2024-06-194-4/+4
| | | | | | Task-number: QTBUG-67692 Change-Id: Ied25e7895fc0ac14a32f0506e0d11e8b873a04f2 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Increase timeout for slow CIAllan Sandfeld Jensen2022-08-161-1/+1
| | | | | | | | | Pick-to: 6.3 6.2 5.15 Fixes: QTBUG-105606 Change-Id: I1ec130fb12f9f447233f77d378c3738ba4e26726 Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Bump version to 6.4.0Jani Heikkinen2022-02-111-1/+1
| | | | | Change-Id: I668138ecbffaa32951bda4a1176c649c42f74d47 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Bump version6.3.0Jani Heikkinen2021-09-141-1/+1
| | | | Change-Id: Iceffc43611a988f175c2f8c9514ffcb488cc835f
* Bump version6.2.0Jani Heikkinen2021-05-241-1/+1
| | | | Change-Id: Id80cfe87fb3e1693c4000b94b95e81c6a3a4ad92
* Add changes file for Qt 5.15.1Antti Kokko2020-08-251-0/+20
| | | | | | | | | | + 5488f0731ebe9c5566abb897f0cb8d298c5944da Fix Clang 10 warning about inconsistent override + 267fba6fdb275601d2a61195ae0260f94f786cff Bump version Change-Id: Ic59946675ff991117af83c27ed726e195c721cfc Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit 835b594bda455a3ecb768605d64fb3ca29ceb51d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Use QList instead of QVectorJarek Kobus2020-06-292-4/+4
| | | | | | Task-number: QTBUG-84469 Change-Id: Ibe91f99df65861fd9a272afa11e812c7664af702 Reviewed-by: Jesus Fernandez <jsfdez@gmail.com>
* Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-05-141-0/+18
|\ | | | | | | Change-Id: I88dd9c44d91ce3dd0be3cf365d37a17820e3581d
| * Merge remote-tracking branch 'origin/5.15.0' into 5.15Qt Forward Merge Bot2020-05-141-0/+18
| |\ | | | | | | | | | Change-Id: I6e76d13c7a5333a3e5a276e35f77306b5795a752
| | * Merge remote-tracking branch 'origin/5.15' into 5.15.0v5.15.0-rc2v5.15.0-rc1v5.15.0Qt Forward Merge Bot2020-04-221-0/+20
| | |\ | | |/ | |/| | | | Change-Id: Ib48556d4ec687a3915fe62646be25478fdef6e7d
| | * Add changes file for Qt 5.15.0Antti Kokko2020-04-201-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | + 5f7bd72592576bb193592702a26a8b0288642a58 Bump version + f073783698fed536029b314cb523cf07cfa8b542 Avoid initializing QFlags with 0 or nullptr + ab0d58ef0a2cd21eab7dc612004e416d3d55a78e Add missing #include for QTcpSocket Change-Id: Ia54eede182028dd282ea7f1dae4a5d719bc22123 Reviewed-by: Jesus Fernandez <jsfdez@gmail.com>
* | | Fix Clang 10 warning about inconsistent overrideThiago Macieira2020-05-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qwebglintegration.h:62:32: warning: 'createPlatformOffscreenSurface' overrides a member function but is not marked 'override' [- Winconsistent-missing-override] Task-number: QTBUG-83666 Pick-To: 5.15 Change-Id: I99ab0f318b1c43b89888fffd160b5b8264692657 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> Reviewed-by: Jesus Fernandez <jsfdez@gmail.com>
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-04-251-0/+20
|\| | | | | | | | | | | Change-Id: Id0a10b7e2fbfc6942466277e9c75013cf178395a
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-04-211-0/+20
| |\ \ | | |/ | |/| | | | Change-Id: Ia6306e0f5d26a4d9c6065882228e9fdd8f353479
| | * Merge remote-tracking branch 'origin/5.14.2' into 5.145.14Qt Forward Merge Bot2020-04-211-0/+20
| | |\ | | | | | | | | | | | | Change-Id: I3329c3085e83d798ded4f4799e6f4b821852a9ca
| | | * Add changes file for Qt 5.14.2v5.14.2Antti Kokko2020-03-101-0/+20
| | |/ | | | | | | | | | | | | | | | | | | | | | + 4ec76380e83b86a9202c4b24a1dc3452eedd937b Bump version Change-Id: I98436ce0f93d553cdcfb7d41c058459f29413eb1 Reviewed-by: Andy Shaw <andy.shaw@qt.io> Reviewed-by: Jesus Fernandez <jsfdez@gmail.com>
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-02-221-0/+1
|\| | | | | | | | | | | Change-Id: I782d65adf794f8b146edafc01af3e0b1f1d0084e
| * | Add missing #include for QTcpSocketv5.15.0-beta4v5.15.0-beta3v5.15.0-beta2v5.15.0-beta1Edward Welbourne2020-02-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Include what you use. Change-Id: I37ef3cafd904760a0e8820135695512f4dcf65da Reviewed-by: Jesus Fernandez <jsfdez@gmail.com> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-02-080-0/+0
|\| | | | | | | | | | | Change-Id: I71e7984e1ed968c5a5adecc13546209a9f37faea
| * | Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-alpha1Qt Forward Merge Bot2020-02-050-0/+0
| |\| | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I83341746e2aeeab57a9b1196d5169aadb155f0ce
| | * Bump versionAlexandru Croitor2020-02-021-1/+1
| | | | | | | | | | | | Change-Id: I744c35f7ba28a0eb511944f06b153d59395a8929
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-02-011-0/+20
|\| | | | | | | | | | | Change-Id: Iee9fd8a1d93e686763cfbbddbfb64042ad95d097
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-281-0/+20
| |\| | | | | | | | | | Change-Id: Ic194bc8e0e1f9dffe1c8bfd1f65b8747e5412345
| | * Merge remote-tracking branch 'origin/5.14.1' into 5.14Qt Forward Merge Bot2020-01-271-0/+20
| | |\ | | | | | | | | | | | | Change-Id: I722f47960ae618d2c0bad35cd9c3b83702a0631f
| | | * Add changes file for Qt 5.14.1v5.14.1Antti Kokko2020-01-101-0/+20
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | + ef0f5f5ed8cdb6dd70f728fd1873158785f43d27 Don't send mouse events if we have touch support + 47bd603dba7c1d66871646f309407976aafe2f6b Pass the timestamp as a string from JS to Qt to preserve precision + 8476f66f413e89a4eb60f395a6e3840e0fe61a5f Bump version Change-Id: I051b5c2c92190a7468783c8504272dcdd5bdb079 Reviewed-by: Jesus Fernandez <jsfdez@gmail.com>
* | | Update dependencies on 'dev' in qt/qtwebglpluginQt Submodule Update Bot2020-01-271-3/+3
| | | | | | | | | | | | | | | Change-Id: I0835793955addf3a59c9bb1b90f82eeb216bfcea Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtwebglpluginQt Submodule Update Bot2020-01-221-3/+3
| | | | | | | | | | | | | | | Change-Id: I621469515931cc13ba30da982ec7e9f7fa50e48b Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-12-310-0/+0
|\| | | | | | | | | | | Change-Id: Iaff7e3d05986e487690bfcbc55064902df054888
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-300-0/+0
| |\| | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I48da29c2b9751fea84e800be388fbaacf2f73268
| | * Bump versionDaniel Smith2019-12-161-1/+1
| | | | | | | | | | | | Change-Id: I70a78a022d795e653065dfaace45a78cc8655dbd
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-12-172-1/+19
|\| | | | | | | | | | | Change-Id: Ica166f282941cad9632711e617328c764a85db80
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-142-1/+19
| |\| | | | | | | | | | Change-Id: Ia6f1bc0234ebb5cda8ccdb639bb89b56d9c9acf5
| | * Merge remote-tracking branch 'origin/5.14.0' into 5.14Qt Forward Merge Bot2019-12-132-1/+19
| | |\ | | | | | | | | | | | | Change-Id: I737802a3333b678ed5385faf22436c211fe6ed44
| | | * Add changes file for Qt 5.14.0v5.14.0-rc2v5.14.0-rc1v5.14.0Antti Kokko2019-11-251-0/+18
| | | | | | | | | | | | | | | | | | | | Change-Id: I23b0bb65dec62eb9e3246c4fc20941683c08935e Reviewed-by: Jesus Fernandez <jsfdez@gmail.com>
| | | * Set the bytes per pixel for LUMINANCE_ALPHA to 2Andy Shaw2019-11-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This corrects a case where the camera was being used in a multimedia example that was being streamed and the colors were not correct as the some of the data was lost as a result. Fixes: QTBUG-79181 Change-Id: I8ab02b525c6d54b0005f00d06969aa3ebbac4d20 Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
* | | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-12-033-11/+8
|\| | | | | | | | | | | | | | | Change-Id: I6f09c39da415aeb1bfc6214e6774f531fbe2f161
| * | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-302-7/+7
| |\| | | | | | | | | | | | | | Change-Id: Ib3e9b7c940693816677e19e88948b349ae0af3b4
| | * | Pass the timestamp as a string from JS to Qt to preserve precisionAndy Shaw2019-11-282-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the timestamp was passed as a double from JS to Qt while being hosted on an embedded Linux device it was losing the precision and as a result scrolling for a ListView does not work because it does not see the timestamp has having changed. So by passing it as a string instead means that it does not lose anything in the transition. Fixes: QTBUG-79842 Change-Id: Ia6bb8b713c0c5296a046ff3f7fddbc8e8249bbd6 Reviewed-by: Jesus Fernandez <jsfdez@gmail.com>
| * | | Avoid initializing QFlags with 0 or nullptrFriedemann Kleint2019-11-261-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is being deprecated. Remove the constructor initialization as member initialization is already present in the header. Change-Id: I249ef164d42eee378fb016e6162c154caaa8b2de Reviewed-by: Jesus Fernandez <jsfdez@gmail.com>
* | | | Update dependencies on 'dev' in qt/qtwebglpluginQt Submodule Update Bot2019-11-281-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I7a672feba84aca544923b5ca4641bfd02cc4419d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtwebglpluginQt Submodule Update Bot2019-11-261-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I33f20d7c46a43dfd274007723619e2bae95cd829 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-11-261-0/+8
|\| | | | | | | | | | | | | | | Change-Id: Iba930c6044a8c9a3101346110bc311941d4f8e31
| * | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-231-0/+8
| |\| | | | | | | | | | | | | | Change-Id: Iee39da40e14cb5a08e1c95feed20a8372ec6d455
| | * | Don't send mouse events if we have touch supportAndy Shaw2019-11-221-0/+8
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unfortunately, using stopPropagation() and preventDefault() does not stop the mouse events from being sent for a touch. So we have to assume that they will be handled by Qt one way or the other and only send mouse events if we can tell that we are not on a touch screen or that the mouse event was not synthesized by WebGL. This was tested on a Windows host with an iPad and Microsoft Edge to verify it works in both cases correctly. Change-Id: Ia2297062b2e1a4894f52954dd567bab5b7df8fa1 Reviewed-by: Jesus Fernandez <jsfdez@gmail.com>
* | | Update dependencies on 'dev' in qt/qtwebglpluginQt Submodule Update Bot2019-11-251-3/+3
| | | | | | | | | | | | | | | Change-Id: I7f4eb0878cb097f5f43a0c6d17482e541c11b6c1 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtwebglpluginQt Submodule Update Bot2019-11-221-3/+3
| | | | | | | | | | | | | | | Change-Id: Ie326259eb5df67baa7ed411d1ae5bc13d2ae2d65 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtwebglpluginQt Submodule Update Bot2019-11-141-3/+3
| | | | | | | | | | | | | | | Change-Id: I0af547d890d204586bbdc9cc15f0dbb008614279 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtwebglpluginQt Submodule Update Bot2019-11-121-3/+3
| | | | | | | | | | | | | | | Change-Id: Idacf7905f584a6791d5fb2e1834331919ec58b97 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Merge "Merge remote-tracking branch 'origin/5.15' into dev"Qt Forward Merge Bot2019-11-121-0/+20
|\ \ \
| * | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-11-121-0/+20
| |\| | | | | | | | | | | | | | Change-Id: Ie1c9debbe1a06ab64e2cb5102b72e155cb73e6be
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-10 18:09:32 +0000