summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.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>
* | 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.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.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>
* | | 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>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-091-0/+20
|\| | | | | | | Change-Id: Id4ba7800d803653f7c39e8aa1920ab1d70caafcd
| * Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-beta3Qt Forward Merge Bot2019-11-051-0/+20
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I4032fecf61be1917451d24301e2d7dde6ecfc85e
| | * Add changes file for Qt 5.13.2v5.13.25.13Antti Kokko2019-10-141-0/+20
| | | | | | | | | | | | | | | | | | | | | + 3581cde283545b907671d0cc42eeda6cbdeccb66 Add changes file for Qt 5.12.5 Change-Id: Ieea9effd7d1d88de7bcb051e3673edf72301b6f9 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | * Bump versionFrederik Gladhorn2019-10-141-1/+1
| | | | | | | | | | | | Change-Id: I6572ddcbb126042dd264df63f7fb87f3fba1f107
* | | Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"Qt Forward Merge Bot2019-09-212-0/+40
|\ \ \
| * | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-09-212-0/+40
|/| | | | |/ / | | | | | | Change-Id: I20cac67766122001da3a0cec8d0dd76bcc330c23
| * | 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>
* | / / Bump versionKari Oikarinen2019-08-271-1/+1
|/ / / | | | | | | | | | Change-Id: I0421736acf37069d0b1e455371e1deed1ce5401c
* | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-18 20:23:21 +0000