summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.9' into 5.105.10Liang Qi2018-01-188-0/+25
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ic133c82fd4b0933564f8fb665248ea91d083007c
| * Merge remote-tracking branch 'origin/5.9.4' into 5.9Liang Qi2018-01-181-0/+25
| |\ | | | | | | | | | Change-Id: I0b80f07574d65e39cd16ce29618588223a7d9214
| | * Add changes file for Qt 5.9.4v5.9.4Antti Kokko2018-01-081-0/+25
| |/ | | | | | | | | Change-Id: I64769a6e78614b59bafb3e558caf9b4fad4c3c01 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
| * Bump versionOswald Buddenhagen2017-12-121-1/+1
| | | | | | | | Change-Id: Ic94bd48eaf311c129fa0b89647cd66599e2bbfab
| * Remove the iCCP chunk from the PNG imageMika Salmela2017-11-307-0/+0
| | | | | | | | | | | | | | | | | | This patch updates the png files giving warnings known incorrect sRGB profile. Task-number: QTBUG-64878 Change-Id: Icc378f4081727d1d37b1debdeddf66e718e636e6 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Merge remote-tracking branch 'origin/5.9.3' into 5.9Liang Qi2017-11-231-0/+24
| |\ | | | | | | | | | Change-Id: I2166e7994b8a2fdb7e9c317017536480d55a1eb3
* | | Bump versionOswald Buddenhagen2017-12-201-1/+1
| | | | | | | | | | | | Change-Id: I5e49ce2cd8b294e456e54d133b95d440facf6f12
* | | Merge remote-tracking branch 'origin/5.10.0' into 5.10Liang Qi2017-12-081-0/+24
|\ \ \ | | | | | | | | | | | | Change-Id: Id88a4107459ae5962cb83945ec8d893752bbfd14
| * | | Merge remote-tracking branch 'origin/5.9.3' into 5.10.0v5.10.0-rc3v5.10.0-rc2v5.10.0-rc1v5.10.0Liang Qi2017-11-211-0/+24
|/| | | | | |/ | |/| | | | Change-Id: Ie1483fec3a4a3dc3e3d6a578f59901d3aae7bccd
| * | Add changes file for Qt 5.9.3v5.9.3Antti Kokko2017-11-091-0/+24
| |/ | | | | | | | | Change-Id: Ib9efd29a7ea42870abf6fb2c463300574fe6bb9d Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Doc: Maintain the list of highlighted examples locallyTopi Reinio2017-11-101-0/+2
| | | | | | | | | | | | | | Previously the list was maintained in qtbase. Change-Id: I7581e9d2c4eae95bc5265277ea07193b39b204c6 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* | Add changes file for Qt 5.10.0Antti Kokko2017-11-101-0/+22
| | | | | | | | | | Change-Id: I0066d1a4f67276861daff4cdbe20bfdb8a783312 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta4Liang Qi2017-10-302-0/+48
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I0dbbd7ff7b6b6a97f4dda34ba005d3a0c6c3e4c7
| * Bump versionOswald Buddenhagen2017-10-061-1/+1
| | | | | | | | Change-Id: Ib123c2e988f2a7b7442b06174966c71725ada69c
| * Add changes file for Qt 5.9.2v5.9.2Jani Heikkinen2017-09-221-0/+24
| | | | | | | | | | | | Task-number: QTBUG-62750 Change-Id: Idb3a62f156013ad6329f0d12302cbb4e204e71d6 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Add change file for Qt 5.6.3Liang Qi2017-09-011-0/+24
| | | | | | | | | | | | Task-number: QTBUG-62712 Change-Id: I1af2327ab301a5b5bbcb1e5248d1149f9bba745e Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Don't overwrite execute command queue when transferring queued commandsv5.10.0-beta3v5.10.0-beta2v5.10.0-beta1Tor Arne Vestbø2017-09-264-18/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's no guarantee that we'll only transfer commands after successfully executing the existing command in the queue, so we must take care to append to the execute queue, not overwrite it. This can for example happen if an update request comes in which results in transferring commands via Canvas::sync(), followed by a synchronous command such as readPixels, which will trigger another transfer plus an execution of the command queue. Task-number: QTBUG-62963 Change-Id: Id0f326e98477ca14e70ad05706c62a8bf8a8d5f2 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* | Blacklist Canvas3D_render_ondemand::test_render_3_ondemand on macOSv5.10.0-alpha1Tor Arne Vestbø2017-09-071-0/+3
| | | | | | | | | | | | | | | | | | | | | | We now do QWindow::requestUpdate() via [NSView setNeedsDisplay] on macOS, which triggers a race in the Canvas3D update code. Until we've established what the cause is we're blacklisting this test, as it's flakey and may not always fail. Task-number: QTBUG-62963 Change-Id: I70b1468f94c1d478f35455d42d3daca783ae4d53 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-08-151-0/+24
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I6d9ab0253b4aec30f27ccff571cefad17fc8d5cc
| * Bump versionOswald Buddenhagen2017-06-301-1/+1
| | | | | | | | Change-Id: If81733d53c21c35ca229eafb78f7ad8b7fada764
| * Add changes file for 5.9.1v5.9.1Antti Kokko2017-06-231-0/+24
| | | | | | | | | | | | | | Listing important changes and bug-fixes. Change-Id: I5e0c82fa2df3e6673a7857df7337ae5f6a474a4b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-06-077-13/+64
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I72eda5a6e51d805637fc8b8091f533e51e645b6a
| * Merge remote-tracking branch 'origin/5.9.0' into 5.9Liang Qi2017-05-311-0/+16
| |\ | | | | | | | | | Change-Id: I3a0689c3e11c904ba806fe2c55d15a46a74c10a5
| | * Add changes file for 5.9.0v5.9.0-rc2v5.9.0-rc1v5.9.0Antti Kokko2017-05-101-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | Listing important changes and bug-fixes. Change-Id: I3e731ee5ae286ab12133b4fa02470be10ba045ea Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Pasi Keränen <pasi.keranen@qt.io>
| * | Fix GCC 7 warnings about implicit fallthroughThiago Macieira2017-05-221-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | Make them explicit. Change-Id: I9bf1e35bffb044dcbf62fffd14bfe6f9d5c280f2 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
| * | Bump versionOswald Buddenhagen2017-05-101-1/+1
| |/ | | | | | | Change-Id: Ib4fbcf84410d0a8a2dfbbd3c16106c99d539ced4
| * Exclude qmltest for boot2qtv5.9.0-beta4Sami Nurmenniemi2017-04-271-0/+3
| | | | | | | | | | | | | | | | | | Currently boot2qt is tested with QEMU and the test crashes. Disabling for now to make it possible to enable qt5 tests for Coin. Task-number: QTBUG-60266 Change-Id: I8954d1dbefbd6f07710f1f5ed2a39be0fd55265f Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Examples: don't set colors as stringsv5.9.0-beta3v5.9.0-beta2v5.9.0-beta1Marc Mutz2017-03-293-3/+3
| | | | | | | | | | | | | | | | | | Use the 3-int ctor of QColor instead. Change-Id: Ib00e3f6c93a153dfdaddde6e72cb6f8f3234fdc4 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| * Merge remote-tracking branch 'origin/5.8' into 5.9Liang Qi2017-03-101-0/+32
| |\ | | | | | | | | | Change-Id: I0147405fd58580c75f9ff6122c50cdb880003188
| | * Merge remote-tracking branch 'origin/5.8.0' into 5.85.8Liang Qi2017-01-261-0/+32
| | |\ | | | | | | | | | | | | Change-Id: I6a34c1c9540d36cd80f91d1daebd2c9178c3d2b5
| | | * Add changes file for 5.8.0v5.8.0-rc1v5.8.0Jani Heikkinen2016-12-011-0/+32
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia2b476603fbe00cd67f98c2a2398432ddf92da36 Reviewed-by: Pasi Keränen <pasi.keranen@qt.io>
* | | | Bump versionOswald Buddenhagen2017-02-021-1/+1
|/ / / | | | | | | | | | Change-Id: Icb7ab83497e0484079cf31d163fda119cd88e338
* | | Merge remote-tracking branch 'origin/5.8' into devv5.9.0-alpha1Liang Qi2017-01-247-32/+173
|\| | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: If94e1ceeb1b03ef59bf5760931fdba9527815064
| * | Bump versionOswald Buddenhagen2017-01-031-1/+1
| | | | | | | | | | | | Change-Id: Ie530042a81199dbbec0d23ae6f01f3136155e436
| * | Fix MSVC 64bit warnings about converting GLint to const GLvoid *Friedemann Kleint2016-12-022-3/+3
| |/ | | | | | | | | | | | | | | | | | | Cast via quintptr, fixing warnings: glstatestore.cpp(487): warning C4312: 'reinterpret_cast': conversion from 'GLint' to 'const GLvoid *' of greater size canvasrenderer.cpp(1166): warning C4312: 'reinterpret_cast': conversion from 'GLint' to 'GLvoid *' of greater size canvasrenderer.cpp(1473): warning C4312: 'reinterpret_cast': conversion from 'GLint' to 'const GLvoid *' of greater size Change-Id: I0085a5f09e137a28973a8e62afa0254fbe8f4bf3 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-11-266-29/+170
| |\ | | | | | | | | | Change-Id: Ic71ac5eb15092e1c4393b59e0f2311e5e98a3446
| | * Merge remote-tracking branch 'origin/5.6' into 5.75.7Liang Qi2016-11-086-29/+170
| | |\ | | | | | | | | | | | | Change-Id: I44e5f1470146c7c3cf31b671ddc6612a73bf9b5d
| | | * remove dependencies from sync.profileOswald Buddenhagen2016-11-051-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | the CI obtains them from the qt5 super repo nowadays. Change-Id: I1ef7bdd1a762a79428b7a26b5b92ce58faa67bc3 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
| | | * Improve software opengl renderer detectionMiikka Heikkinen2016-10-245-19/+170
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously software renderer was only detected if forced on by an application attribute. Now mesa renderer should be always detected. Change-Id: Id85bbf9097e266529bacc657fa84b18c21a3c687 Task-number: QTBUG-56673 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | | | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-09-219-37/+89
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I832e6f3bab5dbd6eda02944596e8129b7a699948
| * | | Merge remote-tracking branch 'origin/5.7' into 5.8v5.8.0-beta1Liang Qi2016-09-184-4/+53
| |\| | | | | | | | | | | | | | Change-Id: If2f03ddd11258864a1d3d25103881a8b027eb12b
| | * | Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.1Liang Qi2016-09-164-4/+53
| | |\| | | | | | | | | | | | | Change-Id: Iee82aa1dcf3957b77ab966a6d077c3de2faa4e45
| | | * Merge remote-tracking branch 'origin/5.6.2' into 5.6Liang Qi2016-09-161-0/+24
| | | |\ | | | | | | | | | | | | | | | Change-Id: I9ac6f6537ad41849248af67c67d9a6a3f0a6c26e
| | | | * Add changes file for 5.6.2v5.6.2Antti Kokko2016-09-131-0/+24
| | | |/ | | | | | | | | | | | | | | | | | | | | Change-Id: Ie02dbe8e60a42fe7452fba765e9e02d029f6d341 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
| | | * Doc: Change instances of 'OS X' to 'macOS'Topi Reinio2016-08-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As of version 10.12 (Sierra), the name of Apple's desktop operating system will be macOS. Change all occurrences where the platform is discussed to use the macro \macos (defined in the documentation configuration in qtbase). Change-Id: I38f2a16e8e56601d6da6da8c9c3b0aa9a364f1e5 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| | | * Align pixel-row of the image passed to glTexImage2D to UNPACK_ALIGNBenny Morgan2016-08-022-3/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From what I can understand from the OpenGL specification, the image array that is passed as the last parameter to glTexImage2D, the pixel width must always be align to a boundary of what UNPACK_ALIGN parameter is set to. For example if UNPACK_ALIGN is set to 4 (default) the width of the image is 501 pixels, each pixel 3 bytes, each pixel row in image the array must take 1504 bytes. Task-number: QTBUG-54876 Change-Id: I7e3ea0bb11422903a6ca30eeb3ab930b9588f22f Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Pasi Keränen <pasi.keranen@qt.io>
| * | | Eradicate Q_FOREACH loops and mark the module as Q_FOREACH-freeMarc Mutz2016-09-075-15/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In CanvasContext::setContextLostState(), ported from iterating over keys() to iterating over the container itself. This seems to be pretty safe, as it doesn't look like there's recursing into the CanvasContext happening. In CanvasGlCommandQueue::getCanvasId(), replaced a convoluted loop with QMap::key(value, default) (required implementing the equality relational operators for GlResource). In ~StaticFactoryMapDeleter(), replaced the Q_FOREACH with a call to qDeleteAll(). Change-Id: I9b849cce6e8ff48b746c682895b00e0d5982bacb Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| * | | CanvasTextureImageFactory: fix quadratic loop in notifyLoadedImages()Marc Mutz2016-09-071-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old code uses a Java-style iterator on a QList, but failed to use the iterator's remove() function, opting instead to call QList::removeOne(). Both would have been quadratic, but the current code is even worse in that it re-scans the list for the element 'it' currently points at. Fix by using std::remove_if, which is linear, and, since it doesn't take a copy of the container, also avoids a deep copy of 'm_loadingImagesList' on actual removal (it will attempt to detach unconditional now, due to the use of non-const begin()/end(), but the variable is now no longer shared with anyone, so there will actually be no detach. Change-Id: I71cd08bd40994e86a6470fdd9bcd55c18913b8d8 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| * | | Fix cellphone example flickingMiikka Heikkinen2016-09-061-12/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-50393 Change-Id: I3da3fede43ede5e8d4a942e0c4df4e83117ca4cc Reviewed-by: Sami Makkonen <sami.makkonen@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | | | Bump versionOswald Buddenhagen2016-08-291-1/+1
|/ / / | | | | | | | | | Change-Id: Ie5422c3edc3470120fe12a1458e3f3aafbdae496
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-04 17:08:45 +0000