summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Re-add dependencies.yaml now that qt5.git wip/qt6 builds fine"wip/qt6Alexandru Croitor2019-08-281-4/+0
| | | | | | | | | | This reverts commit 407eabe0f7a78372baa77ea7e8493026693b7e8f. As discussed we shouldn't use the files until we have an easier mechanism for updating in place. Change-Id: I9dd3f6c73cc5c693828bb1c29b61fa26568e23c6 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Re-add dependencies.yaml now that qt5.git wip/qt6 builds fineAlexandru Croitor2019-08-221-0/+4
| | | | | Change-Id: Ia8b65fe26058e43e0abf2dd27588dec0357dda5a Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
* Merge "Merge remote-tracking branch 'origin/dev' into wip/qt6"Alexandru Croitor2019-08-1113-37/+79
|\
| * Merge remote-tracking branch 'origin/dev' into wip/qt6Alexandru Croitor2019-08-1113-37/+79
| |\ |/ / | | | | Change-Id: I4a9a175cb431cb3d38146e98cf08d7042dcc8f2b
| * Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-07-163-2/+5
| |\
| | * Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-07-163-2/+5
| | |\ | |/ / | | | | | | Change-Id: I2c1925759a489dc23edba9d082025efc33418d18
| | * 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: I5f0336f7eccfb44223e5f3ace62ed2c691ebe863
| | | | * Bump versionFrederik Gladhorn2019-07-011-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I278f4280b8d088393e639e77eb9a51527a9560dd
| | * | | Doc: Replace example file lists with links to code.qt.ioTopi Reinio2019-07-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-74391 Change-Id: I398a01a5af7ef88c24886d1c5549bd1fdbe7784c Reviewed-by: Paul Wicking <paul.wicking@qt.io>
| | * | | Fix compilation with disabled deprecated APIsSona Kurazyan2019-07-092-2/+4
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QImageIOHandler::name() has been deprecated since 5.13, but its overrides weren't. Enabled compilation of the overrides only when the QImageIOHandler::name() is compiled. Task-number: QTBUG-76491 Change-Id: Ida625f19d61081cfd50ae11ab50cf7829aef80a5 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
| * | | 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: I45da146d028d2f8f7b5661da514dead5e1a33f39
| | * | Bump versionFrederik Gladhorn2019-07-011-1/+1
| | | | | | | | | | | | | | | | Change-Id: Ib71a71df6cffd5162ec732e942b24e69dd88f7d6
| * | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-06-296-20/+42
| |\ \ \
| | * \ \ Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-06-296-20/+42
| | |\ \ \ | |/ / / / | | | _ / | | | / Change-Id: I3e08aa8666c4e74b70606a91bc2bc5653fac4003
| | * | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-06-286-20/+42
| | |\ \
| | | * \ Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-06-276-20/+42
| | | |\ \ | | |/ / / | | | | _ | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: If39eda43ff21d841aaa24ffed8b5793ff1239cce
| | | * Android: Skip QSVGRenderer testEskil Abrahamsen Blomfeldt2019-06-251-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These tests require access to local file system and are not written to be portable to remote devices. Since there is no real platform-dependency in this, testing them on other platforms is sufficient, so we will just skip it on Android rather than spend time on it. Task-number: QTBUG-73624 Change-Id: Ic11b69d2eb73e0cd264b153c9870dd7923e1336d Reviewed-by: BogDan Vatra <bogdan@kdab.com>
| | | * Android: Fix QSVGPlugin testEskil Abrahamsen Blomfeldt2019-06-252-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Assets have to be included in the resources in order to be accessible when testing on a remote device. Task-number: QTBUG-73625 Change-Id: I80332b6492bffc01c0157918b9e6abbc2b87a43b Reviewed-by: BogDan Vatra <bogdan@kdab.com>
| | | * Make QSvgGenerator test pass on AndroidEskil Abrahamsen Blomfeldt2019-05-142-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Platforms like Android require assets to be bundled with the app. We include the reference SVGs as resources to work around this. Task-number: QTBUG-73623 Change-Id: Id9cc7a7d575da5adbe73a3392419fd74a1ec1bbd Reviewed-by: BogDan Vatra <bogdan@kdab.com>
| | | * 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: I695d5bc0c1f5d93f4880d0b687b36327a88497cf
| | | | * Add changes file for Qt 5.12.4v5.12.45.12.4Antti Kokko2019-05-231-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia8f0e8cc9e7e8f072358b4c179e7aedafb7d67ba Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
| | | | * Bump versionFrederik Gladhorn2019-05-231-1/+1
| | | |/ | | | | | | | | | | | | Change-Id: I2cf60b8efe6070d6deaa1e2780a5bab7a710705a
| * | | 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: Ia2f3c9365dc0b63eb2927cb7de72970d1a78f1ca
| | * | 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: If09350ffed202ce1f55cb4ceeb8a6d948686f80a
| | | * | Add changes file for Qt 5.13.0v5.13.0-rc3v5.13.0-rc2v5.13.0-rc1v5.13.0-beta4v5.13.05.13.0Antti Kokko2019-05-081-0/+18
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I29aed2105f59367ffb23882e0f58fb0e550f9b22 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Samuel Gaist <samuel.gaist@idiap.ch> Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
| * | | Convert uses of QTime as a timer to QElapsedTimerEdward Welbourne2019-06-133-15/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One was an easy replacement, the other changes its reference time, which isn't supported by QElapsedTimer. However, it was easy enough to reimplement in terms of QDateTime::currentMSecsSinceEpoch(); and, as it was previously using QTime as timer, this is presumably good enough (although a proper monotonic timer would be better). Change-Id: I90f8e08635e7d2bc364755efd93fce008b6a62c0 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* | | | Temporarily remove dependencies.yamlAlexandru Croitor2019-08-071-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We'll re-add it after we get a working qt5.git wip/qt6 build. Change-Id: Iaa106a7b84852142f51f3d500d77cc950115155b Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Convert dependencies.yaml to dict from listAapo Keskimolo2019-07-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I29104891dd4eed4f90a15673d55c9ca436cd33d9 Reviewed-by: Toni Saario <toni.saario@qt.io> Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
* | | | Add initial dependencies.yamlAapo Keskimolo2019-07-031-0/+4
| | | | | | | | | | | | | | | | | | | | Change-Id: I183ae2e71d6679725940fdce0b06c53c78fc2695 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Fix endl usage to contain prefixes and bump version to 6.0.0Alexandru Croitor2019-06-142-27/+27
|/ / / | | | | | | | | | | | | | | | Change-Id: Ia10879666a87dc4db596b75cfbf654379e75041b Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Fix rendering of SVGs with viewBoxesSimon Hausmann2019-05-243-9/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The presence of the viewBox attribute in the svg tag implies the presence of the preserveAspectRatio attribute as well. It defaults to scaling the view box to the view port while preserving the aspect ratio and the box is also centered. This patch does not implement the full preserveAspectRatio attribute, but it does implement the default of aspect ratio preservation and centering, as that is what caused the rendering error in the linked task. This causes some tests in the SVG Tiny 1.2 test suite to differ. This is visible using the rendertestsuite helper program (see other change). In particular it corrects the rendering of struct-svg-203-t.svg to correctly center the text and avoid scaling it. For animate-elem-38-t.svg the rendering improved by making the entire text visible, as in the reference. The same applies to media-video-216-t.svg. In both rendering the scaling changes slightly. Done-With: Rainer Keller <rainer.keller@qt.io> Fixes: QTBUG-70256 Change-Id: I9142c511890765993ee3e316f0383550919fdcd4 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | QtSvg: remove deprecated functions and enumerationsChristian Ehrlicher2019-05-278-25/+10
| | | | | | | | | | | | | | | | | | | | | | | | Replace QPainter::HighQualityAntialiasing with Antialiasing and remove defines needed for Qt4. Change-Id: I866decad7d9c10da15e5b0e0bd79033d574f6a08 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* | | Add little helper program for finding visual regressionsSimon Hausmann2019-05-244-0/+176
| | | | | | | | | | | | | | | Change-Id: I0b6c7a7d82d64011fb9b1e2aea5ff0552c719f54 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-05-044-16/+32
|\ \ \ | |/ / | | | | | | Change-Id: I962bd9762be35f5905367a96a19038eb9b3c7637
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-04-274-16/+32
| |\ \ | | |/ | | | | | | Change-Id: I4a7a5ad6cd164f0d440217566bd647ecde4fddfb
| | * Fix stack overflow on indirect self-referralAllan Sandfeld Jensen2019-04-243-9/+25
| | | | | | | | | | | | | | | Change-Id: If2b13c3dc4a09ce6d18aff97855179172f92878b Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
| | * Fix leak in SVG font nodesAllan Sandfeld Jensen2019-04-241-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | Their lifetime is controlled by the document, but the logic was confused and lost the node. Change-Id: Ib074dcf209d53ade894ee571a0bc08a1a7acfcab Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | | Add libfuzzer test for QSvgRenderer::render()Robert Loehning2019-04-302-0/+45
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-74104 Change-Id: I4ce6a9e4ddc51c904af4a9bf4fb14e52fd8a23c8 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-04-274-2/+71
|\ \ \ | |/ / | | | | | | Change-Id: Ic62a145ff0a59765035ff6e0561c045083a6c3d9
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-04-204-2/+71
| |\ \ | | |/ | | | | | | Change-Id: Id1bdcd52b3c4553e882de825c769bd7643745dce
| | * Merge remote-tracking branch 'origin/5.12.3' into 5.12Qt Forward Merge Bot2019-04-174-2/+71
| | |\ | | | | | | | | | | | | Change-Id: I73662000d1b52a4b61a9bd0a58af2fb9a7dc7b22
| | | * Remove dedundant line from changes filev5.12.35.12.3Robert Loehning2019-04-051-1/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Ibfbd66c9722e3ac008679aa67545591854052fc9 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
| | | * Add changes file for Qt 5.12.3Antti Kokko2019-04-051-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + f6e5dc05855db60eab1568b5fe226922d1c899bb Don't leak nodes on parsing failures + f354d4be9a7a436fb16bd9764a261c930101850c Fix heap overflow in path parsing + 6f152f87dbbd47acc58458d636ce5d1cc181b8fd Fix IRI parsing, and use after free + d477ec8f40b28caf3a216d9e8550d8871d5131fb Bump version Change-Id: Id70f4fd80e8aae4b40f28f795d11d9ef80a0b55f Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | | * Fix crash for recursive gradient referencesEirik Aavitsland2019-04-023-2/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A reference loop with at least three elements would lead to endless recursion. Fixes: QTBUG-74189 Change-Id: Ie3c1b32da0e98e9218dc387dd3210666018a92e1 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-04-161-0/+7
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: Ieca44d9fb4cdf507dfd35536baa35c8d7c70a4fc
View Lorry Controller Status