summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Doc: Remove \ingroup all-examples command from the docsHEADdevJaishree Vyas2023-07-121-1/+0
| | | | | | Fixes: QTBUG-115044 Change-Id: Id3d380a464fad5017d5052337e2c35a14156ac93 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Make sure all private headers include at least one otherThiago Macieira2022-03-081-2/+3
| | | | | | | | | | See script in qtbase/util/includeprivate for the rules. Since these files are being touched anyway, I also ran the updatecopyright.pl script too. Change-Id: Ib056b47dde3341ef9a52ffff13ef677e471674b6 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Update plugins.qmltypesKai Koehne2018-09-241-157/+1
| | | | | | | Task-number: QTBUG-70264 Change-Id: Ic7088623a4dda9ba4427995b10e1bcb513d5ebcd Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Remove Canvas3D examples from highlighted examplesPasi Keranen2018-09-131-2/+0
| | | | | | | | | Remove highlighted Canvas3D examples as qtcanvas3d module is now deprecated. Task-number: QTBUG-70532 Change-Id: I11f138d4421796dc03d9d5bac777a09da68b0188 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Mark Qt Canvas3D module and APIs as deprecatedPasi Keränen2018-09-1319-14/+264
| | | | | | | | | | | | [ChangeLog][QtCanvas3D][Important Behavior Changes] Canvas3D module and API deprecated. Task-number: QTBUG-70510 Change-Id: I0d519acad7ca331b9edf9565e6cc80d91c9617c6 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Sami Makkonen <sami.makkonen@qt.io> Reviewed-by: Pasi Keränen <pasi.keranen@qt.io>
* Port to changed internal declarative API for typed arraysSimon Hausmann2018-08-272-28/+45
| | | | | | | | | After commit 7bdb46c5aae3da345653fe91fbe9281b39015497 the enum for the typed array types has moved. Task-number: QTBUG-70187 Change-Id: I505625820e6175c22b19ba43e83017025ae3b14b Reviewed-by: Liang Qi <liang.qi@qt.io>
* Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-07-312-20/+26
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I5329041124ec2caffcf3fbe05e8510586a26b39b
| * Fix outdated license headers in openglversionchecker*Kai Koehne2018-07-302-20/+26
| | | | | | | | | | Change-Id: Id83962db91e47ade469f1508a8728c9a0b0b2570 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-233-43/+19
|\| | | | | | | Change-Id: I6575af293ea023aa726b620f4d834e8430cc0462
| * Use FDL license for all .qdoc filesKai Koehne2018-06-192-42/+18
| | | | | | | | | | | | Change-Id: I295cf5ee0f557d1977dc750cded9d3ee40f78e0f Reviewed-by: Pasi Keränen <pasi.keranen@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| * Doc: Add missing dots (qtcanvas3d)Paul Wicking2018-06-191-1/+1
| | | | | | | | | | | | Task-number: QTBUG-68933 Change-Id: Ia02aa2a78aa4a4f3c6502b6fcac965e969060cb2 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-05-262-6/+5
|\| | | | | | | Change-Id: I6851380a0a60a0955140bd792a85d12df2fca5cd
| * Fix GCC 8 warning about memcpying non-trivial classThiago Macieira2018-05-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Follow what the compiler suggests and just use std::copy_n. Code generation may not be as good as memcpy for large-ish m_queuedCount values as sizeof(GlCommand) = 40 or 48 bytes. glcommandqueue.cpp:181:75: error: ‘void* memcpy(void*, const void*, size_t)’ writing to an object of non-trivially copyable type ‘class QtCanvas3D::GlCommand’; use copy-assignment or copy-initialization instead [-Werror=class-memaccess] Change-Id: I052407b777ec43f78378fffd15310ca2d996e9a3 Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Fix GCC 8 warning about memcpying non-trivial classThiago Macieira2018-05-231-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | In this case, it's easier to just make it trivial. Note how it contains a pointer which isn't deleted in the destructor (which is why we can make it trivial). glcommandqueue.cpp:181:75: error: ‘void* memcpy(void*, const void*, size_t)’ writing to an object of non-trivially copyable type ‘class QtCanvas3D::GlCommand’; use copy-assignment or copy-initialization instead [-Werror=class-memaccess] Change-Id: I052407b777ec43f78378fffd15310c2121146ef2 Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
* | Remove the code to manually initialize resources in static buildsSimon Hausmann2018-05-081-8/+0
|/ | | | | | | | | After commit be9a56e5e3ced5d0d668fa24e4c65ae928f2e25a in qtbase, this is not needed anymore. Instead the resource system injects the plugin entry point with a reference to all resources. Change-Id: I075e2a855c27f87ad62d9ea45025e0481e3dd055 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Doc: Resolve all documentation warningsv5.11.0-beta4v5.11.0-beta3Topi Reinio2018-03-275-0/+16
| | | | | | | | | | | | | QDoc in Qt 5.11 uses Clang to parse C++ documentation - even though Qt Canvas doesn't expose a C++ API, we need to pass a module header to Clang, as well as disable the custom module-specific namespace for documentation builds. This is because we still parse the .cpp files and get documentation warnings for classes that contain /*! .. */ documentation comments, unless we explicitly mark the classes \internal. Change-Id: Ia7ee26b55d232c724bec78f0c3bf4018b5102913 Reviewed-by: Martin Smith <martin.smith@qt.io>
* Fix crash on application exitLars Knoll2017-12-301-8/+13
| | | | | | | | | | The destruction order of global statics is undefined. If the factory map got destroyed before the map deleter, we would not only leak memory, but also access a deleted object, which is undefined behaviour and did lead to crashes for me. Change-Id: I27c664751b1acdaa08cf35989e09db3e06c6b3c1 Reviewed-by: Pasi Keränen <pasi.keranen@qt.io>
* Update Canvas3D to the new internal API used in QtQmlLars Knoll2017-12-201-36/+9
| | | | | | | Fixes compilation against a recent version of qtdeclarative. Change-Id: If21b743b0226f3a5c78d46fa985822f9357a0622 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>
* Don't overwrite execute command queue when transferring queued commandsv5.10.0-beta3v5.10.0-beta2v5.10.0-beta1Tor Arne Vestbø2017-09-263-15/+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>
* 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>
* 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-265-19/+170
|\ | | | | | | Change-Id: Ic71ac5eb15092e1c4393b59e0f2311e5e98a3446
| * Merge remote-tracking branch 'origin/5.6' into 5.75.7Liang Qi2016-11-085-19/+170
| |\ | | | | | | | | | Change-Id: I44e5f1470146c7c3cf31b671ddc6612a73bf9b5d
| | * 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.7' into 5.8v5.8.0-beta1Liang Qi2016-09-183-4/+29
|\| | | | | | | | | | | Change-Id: If2f03ddd11258864a1d3d25103881a8b027eb12b
| * | Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.1Liang Qi2016-09-163-4/+29
| |\| | | | | | | | | | Change-Id: Iee82aa1dcf3957b77ab966a6d077c3de2faa4e45
| | * 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-074-15/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-08-021-1/+3
|\| | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I47f394d5e0963e8a70d705c39bfe8a31ed528bb4
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-011-1/+3
| |\| | | | | | | | | | 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>
* | | Fix private API usage after change in qtdeclarativeErik Verbruggen2016-06-221-9/+18
| | | | | | | | | | | | | | | | | | | | | | | | qtdeclarative/702c4247d74ffb7e4fb1aaca96d70f4591203ba2 changed the private API. Change-Id: I829cab940d4b88e63f8d672c7294d694cb6c1363 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-05-242-12/+10
|\| | | | | | | | | | | Change-Id: I789a424e020145a89b5789c3d16bdff8089c0176
| * | 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-191-1/+1
| |\| | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ic5484d9d51b7ff5f4fe17d3876daba2123045244
| | * 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>
* | | CleanupSimon Hausmann2016-05-211-1/+1
|/ / | | | | | | | | | | | | | | | | | | Use the variable that defines the interface id, instead of hard-coding the qqml extension plugin interface id. Change-Id: Iadb41b703e15de27144e98d81522effb22ad3afd Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Joni Poikelin <joni.poikelin@theqtcompany.com> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | 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>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-02-155-87/+108
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: If24938cb15392873cfd45c49901c6f1cc3e9f128
| * 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>
| * 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 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-2556-672/+840
| | | | | | | | | | | | | | | | 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-28 04:14:43 +0000