| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| | |
Change-Id: I6a34c1c9540d36cd80f91d1daebd2c9178c3d2b5
|
| |
| |
| |
| |
| | |
Change-Id: Ia2b476603fbe00cd67f98c2a2398432ddf92da36
Reviewed-by: Pasi Keränen <pasi.keranen@qt.io>
|
| |
| |
| |
| | |
Change-Id: Ie530042a81199dbbec0d23ae6f01f3136155e436
|
|/
|
|
|
|
|
|
|
|
| |
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>
|
|\
| |
| |
| | |
Change-Id: Ic71ac5eb15092e1c4393b59e0f2311e5e98a3446
|
| |\
| | |
| | |
| | | |
Change-Id: I44e5f1470146c7c3cf31b671ddc6612a73bf9b5d
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
the CI obtains them from the qt5 super repo nowadays.
Change-Id: I1ef7bdd1a762a79428b7a26b5b92ce58faa67bc3
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
|\| |
| | |
| | |
| | | |
Change-Id: If2f03ddd11258864a1d3d25103881a8b027eb12b
|
| |\|
| | |
| | |
| | | |
Change-Id: Iee82aa1dcf3957b77ab966a6d077c3de2faa4e45
|
| | |\
| | | |
| | | |
| | | | |
Change-Id: I9ac6f6537ad41849248af67c67d9a6a3f0a6c26e
|
| | |/
| | |
| | |
| | |
| | |
| | | |
Change-Id: Ie02dbe8e60a42fe7452fba765e9e02d029f6d341
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-50393
Change-Id: I3da3fede43ede5e8d4a942e0c4df4e83117ca4cc
Reviewed-by: Sami Makkonen <sami.makkonen@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | | |
Change-Id: I4c07ab41ffd4b1490bf2f86bfa6c61e897fa7eda
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
|
|\| |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
.qmake.conf
Change-Id: I47f394d5e0963e8a70d705c39bfe8a31ed528bb4
|
| |\|
| | |
| | |
| | | |
Change-Id: I9c6f6ae4cfc72fc350fffc2ff1edf113d783a8f6
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
See http://comments.gmane.org/gmane.comp.lib.qt.devel/25771
Change-Id: Ibd96f16afe6ab89141a00365132514a90aa44859
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
it's done centrally now.
Change-Id: Ia471aae6fd2124c05c7a149745f426a9c09c8cdd
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
| | |
| | |
| | |
| | | |
Change-Id: Idead6dd25701727307ab4ff419a1d8b7c8da075a
|
|\| |
| | |
| | |
| | | |
Change-Id: I2c42064a1fc90be868fa94b736aa6baf5060168b
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
These were no-ops before.
Task-number: QTBUG-54558
Change-Id: I2bdacc5668e1fbe3ed062e71b21564c4bbc6c9b0
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
|
| |\ \
| | | |
| | | |
| | | | |
Change-Id: I690cfe863da3168710445548a9392f05949424b8
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Change-Id: Ibb94b409b5e17981bff4323b2fad76813bbb3189
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Currently there is a check that is made before the module is built, but
the examples are still built otherwise for -no-opengl builds. Now this
module takes the same approach as Qt3D and uses the qmake function
requires().
Change-Id: I596df68dbe8ea4e9bcce195ef2b9a1ee8d2ce110
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
qtdeclarative/702c4247d74ffb7e4fb1aaca96d70f4591203ba2 changed the
private API.
Change-Id: I829cab940d4b88e63f8d672c7294d694cb6c1363
Reviewed-by: Liang Qi <liang.qi@qt.io>
|
|\| | |
| | | |
| | | |
| | | | |
Change-Id: I789a424e020145a89b5789c3d16bdff8089c0176
|
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
| |\|
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
.qmake.conf
Change-Id: Ic5484d9d51b7ff5f4fe17d3876daba2123045244
|
| | |
| | |
| | |
| | | |
Change-Id: I55fd9cb837267199ae4269ff13bde612d58023c0
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
this includes removing an intermediate level from the source hierarchy.
Change-Id: Ic601e15c05ccc451a291f2b3991db5034013484f
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
|\| |
| | |
| | |
| | | |
Change-Id: I27e421364bc7da98a995a1c6796425abc4757f35
|
| |\|
| | |
| | |
| | | |
Change-Id: I30b435f828cc2a0381e8ed34baacf4ecca545e6e
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
'debugger' keyword was causing "Unimplemented code." prints.
Change-Id: Ic1a018208e6c2fcc818416fc72d4d3b15e095bb1
Reviewed-by: Pasi Keränen <pasi.keranen@theqtcompany.com>
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: I71705aa185510c4ffce169fcd719514868037c68
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
|/ /
| |
| |
| | |
Change-Id: Ifef3839b8c4581c47e24aeeae9bdf1b3b728f5f6
|
|\|
| |
| |
| |
| |
| |
| | |
Conflicts:
.qmake.conf
Change-Id: If24938cb15392873cfd45c49901c6f1cc3e9f128
|
| |\
| | |
| | |
| | | |
Change-Id: I82a8b6d273391f76bcf861c2cac2c348f676f4a2
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|