summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.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>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-016-6/+7
|\| | | | | | | Change-Id: I9c6f6ae4cfc72fc350fffc2ff1edf113d783a8f6
| * CanvasRenderJob: check if QOpenGLContext::currentContext() is NULLBenny Morgan2016-06-301-1/+3
| | | | | | | | | | | | | | | | | | | | Using a Canvas3D inside a QQuickWidget, for some reason sometimes QOpenGLContext::currentContext() is NULL, that causes a crash in CanvasRenderJob. The easy fix that seems to work is to just check QOpenGLContext::currentContext() if is NULL and so prevent the application to crash Task-number: QTBUG-54466 Change-Id: Icbc0e1500b06d3768bd238e54533b20f72e31500 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Expand license scope from "Qt GUI Toolkit" to "Qt Toolkit"Sze Howe Koh2016-06-193-3/+3
| | | | | | | | | | | | | | See http://comments.gmane.org/gmane.comp.lib.qt.devel/25771 Change-Id: Ibd96f16afe6ab89141a00365132514a90aa44859 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| * do not enable example installs explicitly any moreOswald Buddenhagen2016-05-241-1/+0
| | | | | | | | | | | | | | it's done centrally now. Change-Id: Ia471aae6fd2124c05c7a149745f426a9c09c8cdd Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * Fix include in commandthroughput test.Miikka Heikkinen2016-05-201-1/+1
| | | | | | | | | | | | | | | | Example folder changes broke the include path in this test. Change-Id: Ib7ac0c2cc035163300da410c5d804680b183bcf7 Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Bump versionOswald Buddenhagen2016-07-281-1/+1
| | | | | | | | Change-Id: Idead6dd25701727307ab4ff419a1d8b7c8da075a
* | Fix usage of tryCompare: pass property as stringFrederik Gladhorn2016-07-121-5/+5
| | | | | | | | | | | | | | | | These were no-ops before. Task-number: QTBUG-54558 Change-Id: I2bdacc5668e1fbe3ed062e71b21564c4bbc6c9b0 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | Merge remote-tracking branch 'origin/5.7.0' into 5.7Liang Qi2016-06-161-0/+28
|\ \ | | | | | | | | | Change-Id: I690cfe863da3168710445548a9392f05949424b8
| * | Initial version of the QtCanvas3D Qt5.7.0 changelogv5.7.0Antti Kokko2016-06-081-0/+28
| | | | | | | | | | | | | | | Change-Id: Ibb94b409b5e17981bff4323b2fad76813bbb3189 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | | Fix getting COMPRESSED_TEXTURE_FORMATS when no formats supportedMiikka Heikkinen2016-05-241-11/+9
|/ / | | | | | | | | | | | | | | If zero compressed formats were supported, execution fell through to the next case, returning invalid parameter value. Change-Id: I83d52b9cddb0cc8f7a1b65ef18bea5e36c15dfa2 Reviewed-by: Pasi Keränen <pasi.keranen@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-rc1Liang Qi2016-05-19193-115/+126
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ic5484d9d51b7ff5f4fe17d3876daba2123045244
| * Bump versionOswald Buddenhagen2016-05-191-1/+1
| | | | | | | | Change-Id: I55fd9cb837267199ae4269ff13bde612d58023c0
| * Doc: Remove repository name from examplesinstallpathv5.6.1-1v5.6.1Topi Reinio2016-05-121-1/+1
| | | | | | | | | | | | | | | | Examples in binary packages now directly match the install path. Change-Id: Ib429387257eaf3c3d10b0255a99b1538fb5ed122 Task-number: QTBUG-52953 Reviewed-by: Antti Kokko <antti.kokko@qt.io>
| * fix example installsOswald Buddenhagen2016-05-10192-114/+125
| | | | | | | | | | | | | | this includes removing an intermediate level from the source hierarchy. Change-Id: Ic601e15c05ccc451a291f2b3991db5034013484f Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1Liang Qi2016-04-082-0/+0
|\| | | | | | | Change-Id: I30b435f828cc2a0381e8ed34baacf4ecca545e6e
| * Purge sRGB chunks from PNGs in tests.Edward Welbourne2016-03-291-0/+0
| | | | | | | | | | | | | | | | Subjects each *.png file that matched grep -law "sRGB" to: pngcrush -ow -brute -rem allb -reduce -force Change-Id: I97be23b5fc5d3adc7f5488729340003c34f53952 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
| * Purge sRGB chunks from PNGs in examples.Edward Welbourne2016-03-291-0/+0
| | | | | | | | | | | | | | | | Subjects each *.png file that matched grep -law "sRGB" to: pngcrush -ow -brute -rem allb -reduce Change-Id: I968920638ff587b9ead6a2396bb41dd266a8a161 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* | Updated three.jsv5.7.0-alpha1Miikka Heikkinen2016-03-031-4/+4
| | | | | | | | | | | | | | 'debugger' keyword was causing "Unimplemented code." prints. Change-Id: Ic1a018208e6c2fcc818416fc72d4d3b15e095bb1 Reviewed-by: Pasi Keränen <pasi.keranen@theqtcompany.com>
* | Enable using the module in a statically built applicationAndy Shaw2016-03-022-1/+14
| | | | | | | | | | Change-Id: I71705aa185510c4ffce169fcd719514868037c68 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* | Update three.js to r74Miikka Heikkinen2016-02-235-12393/+20927
| | | | | | | | | | | | | | | | | | | | | | | | Updated affected examples as well. Planets example click detection was refactored, as r74 raycaster seems a lot slower than r71. Added a set of simpler dummy spheres to massively speed up the click detection. Change-Id: Idb07fccfa65a0b06277b215a7c5cc2c03a78e819 Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com> Reviewed-by: Pasi Keränen <pasi.keranen@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-02-156-92/+111
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: If24938cb15392873cfd45c49901c6f1cc3e9f128
| * Merge remote-tracking branch 'origin/5.6.0' into 5.6Liang Qi2016-02-153-9/+11
| |\ | | | | | | | | | Change-Id: I82a8b6d273391f76bcf861c2cac2c348f676f4a2
| | * Doc: Fix version strings in documentation configurationv5.6.0-rc1v5.6.0Topi Reinio2016-02-121-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Old version strings caused a conflict in documentation namespaces, resulting in wrong version of docs to be referenced for users that have multiple versions installed. Change-Id: I3386c2fb225e820b6251f067b9fb961b0879d28b Task-number: QTBUG-51051 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
| | * Fix texture using application crash at shutdownMiikka Heikkinen2016-02-112-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Depending on order things are destroyed at shutdown, texture factory can get deleted before textures at shutdown. Textures notify factory at their destructor, which caused the crash. Changed factory pointer to a guarded one to avoid this. Change-Id: I032f066a9a77ef92c68c31e0552f880a8f0a90af Task-number: QTBUG-51045 Reviewed-by: Pasi Keränen <pasi.keranen@theqtcompany.com>
| * | Bump versionOswald Buddenhagen2016-02-081-1/+1
| |/ | | | | | | Change-Id: I32fbc316deac0bf322520146804eebee8e6d556c
| * Add correct extension lookup to getExtensionMichael Dippold2016-02-021-2/+2
| | | | | | | | | | | | | | | | | | Previous change corrected the getSupportedExtensions function, this change fixes the getExtension function. Change-Id: Ie4d36366d3261bd65c7d5f6677902781156f9ad2 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> Reviewed-by: Pasi Keränen <pasi.keranen@theqtcompany.com>
| * Use appropriate name strings for opengl extensionsMichael Dippold2016-02-011-2/+2
| | | | | | | | | | | | | | | | This now uses the appropriate names similar to the extension lookup for webgl in the webengine code. Change-Id: I5a0a982b18b0986cd94d1d6fcb93a54c2ebaac56 Reviewed-by: Pasi Keränen <pasi.keranen@theqtcompany.com>
| * Fix CanvasTextureImage leakMiikka Heikkinen2016-01-142-11/+18
| | | | | | | | | | | | | | | | | | | | | | CanvasTextureImages were assigned as chilren of their parent factory, which has lifetime of the application, so they never got garbage collected. Change-Id: I3466491d37307b0d8daf7965a4c3d03ab7a62464 Task-number: QTBUG-50369 Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com> Reviewed-by: Pasi Keränen <pasi.keranen@theqtcompany.com>
| * Fix cellphone example flickingMiikka Heikkinen2016-01-121-5/+3
| | | | | | | | | | | | | | | | | | | | | | Apparently Flickable has changed internally so that giving two flick commands with same parameters in a row results in no flicking done at all. Fixed the example so that we only ever send one flick. Change-Id: I3ebd514e7958a86b918735df57612984fab6c8fa Task-number: QTBUG-50393 Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com> Reviewed-by: Pasi Keränen <pasi.keranen@theqtcompany.com>
| * Fix context leak when destroying canvas that was never properly shown.Miikka Heikkinen2016-01-111-42/+42
| | | | | | | | | | | | | | | | | | | | Sharecontext gets created even if the canvas doesn't create the regular context, but it wasn't destroyed unless regular context also existed. Change-Id: Ib975ff65c4138000b4a2f1277fe56c9d5109c626 Task-number: QTBUG-50369 Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com> Reviewed-by: Pasi Keränen <pasi.keranen@theqtcompany.com>
| * Fix QNetworkAccessManager crash at application shutdownv5.6.0-beta1Miikka Heikkinen2015-11-062-23/+35
| | | | | | | | | | | | | | | | | | Changed textures to use a common network access manager from QML engine instead of each of them creating their own. Change-Id: Ia70a756edc7f3c32679965a8edf28fa64be86dd4 Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com> Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* | Unify license header usageAntti Kokko2016-01-2638-666/+1074
| | | | | | | | | | | | | | | | Updated license headers to use new GPL-EXCEPT header instead of LGPL3 one (in those files which will be under GPL 3 with exceptions) Change-Id: I0760606258439ea2b7b89e41db50c90d0434a69f Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* | Unify license header usage.Antti Kokko2016-01-2545-861/+1491
| | | | | | | | | | | | | | | | | | Updated license headers to use new BSD header instead of LGPL3 one (in those files which will be under BSD) Change-Id: Id8773e1fd61510d186d76a29728086d35c2821b0 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com> Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | Unify license header usageAntti Kokko2016-01-2559-672/+2018
| | | | | | | | | | | | | | | | Update old header.LGPL3 to header.LGPL Change-Id: Ie6c28b2d7709730783a7ce9f3f7d6dae878f7ce1 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com> Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | Fix mixup of logical and binary operatorFrank Meerkoetter2016-01-141-2/+2
| | | | | | | | | | | | | | Fixes coverity CID141076. Change-Id: Ice5f78a0be12424fa0e308c62294f7ef7981ad36 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* | Fix resource leakFrank Meerkoetter2016-01-131-0/+2
| | | | | | | | | | | | | | | | Fixes a resource leak on the error path. Change-Id: I715c47a92428c50e31c5ff6acafeeaea027fbe89 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> Reviewed-by: Pasi Keränen <pasi.keranen@theqtcompany.com>
* | Bigger slider and its handleKatja Marttila2016-01-121-2/+2
| | | | | | | | | | | | | | | | | | With embedded devices it is hard to hit the slider handle Change-Id: If70a29a8794e34634d75b06744a780c674b102d1 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> Reviewed-by: Titta Heikkala <titta.heikkala@theqtcompany.com> Reviewed-by: Pasi Keränen <pasi.keranen@theqtcompany.com>
* | CanvasContext, CanvasGlCommandQueue: use prefix ++ for iteratorAnton Kudryavtsev2015-12-092-5/+5
| | | | | | | | | | | | | | | | because it's useful for non-primitive types Change-Id: Ic0a53b24148c5815b881d72eecadcaa4ca1ed3e5 Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com> Reviewed-by: Pasi Keränen <pasi.keranen@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-11-0554-448/+3685
|\| | | | | | | Change-Id: I81edeeaa4c686bae003074858f1c4b5db0e7a9b3
| * Fix DEPTH_STENCIL buffersMiikka Heikkinen2015-11-048-31/+122
| | | | | | | | | | | | | | | | | | | | | | We can't assume combined depth/stencil buffer is supported, so check for it, and initialize it correctly when it is supported. Change-Id: Id1792f51ef0a6c74437327e6308c88157fcc1124 Task-number: QTBUG-49182 Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com> Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
| * Tweak some examples to make them look better on AndroidMiikka Heikkinen2015-11-034-10/+7
| | | | | | | | | | Change-Id: I287e8fb36c95a65eb14c846d430f759ebdf5750e Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
| * Reduce unnecessary overdraw on examplesMiikka Heikkinen2015-10-2916-16/+16
| | | | | | | | | | | | | | | | | | | | Using both full screen opaque canvas and background Rectangle item causes one unnecessary fullscreen fill. Changed Rectangles to Items and used window background color instead, which is the recommended way. Change-Id: Ia2689fcafba7b66333f5e98574c28566faba4764 Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com> Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-04 21:05:25 +0000