| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
| |
Change-Id: I20cec71db97cbf896255d4f6d7e947072a86e2bb
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|
|
|
|
|
|
|
|
| |
This is required to remove the ; from the macro with Qt 6.
Task-number: QTBUG-82978
Change-Id: I66f620431011d02cb1542e8ad613dadd28fdd843
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
|
|
|
|
|
|
|
| |
Task-number: QTBUG-84469
Change-Id: I4dc064b70adb054ca4add2dd662e7227255ff970
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
|
|
|
|
|
|
|
| |
Add missing Q_MOC_INCLUDE and adapt to OpenGL split.
Change-Id: I6150876a62ca55ad63c09a128226c2bac428b821
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
|
|
|
|
|
|
|
| |
It is being deprecated.
Change-Id: I38e6bc29ac03108f56f445069b2dbbe8a3db201a
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
Fix warnings:
utils/utils.cpp:268:55: warning: ‘QString& QString::sprintf(const char*, ...)’ is deprecated: Use asprintf(), arg() or QTextStream instead [-Wdeprecated-declarations]
utils/utils.cpp:270:56: warning: ‘QString& QString::sprintf(const char*, ...)’ is deprecated: Use asprintf(), arg() or QTextStream instead [-Wdeprecated-declarations]
utils/utils.cpp:272:47: warning: ‘QString& QString::sprintf(const char*, ...)’ is deprecated: Use asprintf(), arg() or QTextStream instead [-Wdeprecated-declarations]
Change-Id: I27628b7a3d7daa75399ef4952efe373a65d8974e
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
Replace QFontMetrics::width() by horizontalAdvance(), fixing:
utils/utils.cpp:87:43: warning: ‘int QFontMetrics::width(const QString&, int) const’ is deprecated: Use QFont::horizontalAdvance [-Wdeprecated-declarations] ^~~~~
utils/utils.cpp:139:58: warning: ‘int QFontMetrics::width(const QString&, int) const’ is deprecated: Use QFont::horizontalAdvance [-Wdeprecated-declarations]
engine/axisrendercache.cpp:204:50: warning: ‘int QFontMetrics::width(const QString&, int) const’ is deprecated: Use QFont::horizontalAdvance [-Wdeprecated-declarations]
Change-Id: I8cfc466cee55b14060feae9b16a087c1db92cf90
Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de>
|
|
|
|
|
|
|
|
| |
VMware virtual machines have "OpenGL ES 3.0 Mesa x.x.x" as the version
string.
Change-Id: I5c23524a021732e84b78090de2913b4d974e9f34
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
|
|
|
|
|
| |
Change-Id: Idc9a7a0ebcc986c8def79ac56f7defceea1e4432
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
|
|
|
|
|
|
|
|
| |
Also fix the function signature in the qdoc file.
Change-Id: If8a7cb83f94efb9a5a999c99fce722e4ffb96312
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|
|
|
|
|
| |
Change-Id: Ia8b4a25094d4a608d3a20b808fd14c3941ae2dff
Task-number: QTRD-2116
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
|
|\
| |
| |
| |
| |
| |
| | |
Conflicts:
src/datavisualization/utils/qutils.h
Change-Id: Ic882590b5386697fb4af068e435704849ed5405c
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
-Wzero-as-null-pointer-constant
... or equivalent.
QtBase 5.6 headers already compile that way, so let the other
modules follow suit.
Added explicit where it was missing. This is not a source-
incompatible change, because code that breaks by this is
a bug. Let's not have this sitting around in an LTS.
Change-Id: I579e8714f94884dc555b673c9f85508f17cdc99d
Task-number: QTBUG-45291
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
|
| |
| |
| |
| |
| |
| |
| | |
C-style casts aren't allowed in public headers.
Change-Id: I1c1d6efb534b767d2ac06ecfae782b7a34bf37eb
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Mesa is used on Linux desktops for open source graphics drivers which
support more than OpenGL ES2. This fixes the volumetric example not
rendering correctly when using the open source ATI graphics driver.
Change-Id: Ibf4df6cc84881a15464653b65d1221b20c853b19
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
|
| |
| |
| |
| |
| | |
Change-Id: Ib264fe1f2cd1589e2ba1ef2dc7d8f3951e125708
Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
|
|/
|
|
|
|
|
| |
It appears to be enabled in developer builds in Qt 5.7
Change-Id: Ib96cc866b511d8b947323d27f172dc3dd5f3e46f
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
-Fix miscellaneous compile errors
-Move manual tests to manual folder and enable export of autotests
-Added widgets requirement
-Fixed autotests
-Fixed renderer and controller synchronization in QML case
-Treat fallback Mesa as ES2 similar to setting AA_UseSoftwareOpenGL
Change-Id: If6619733725d079e339bef16262e5ea1450ab20f
Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: I0581aefcf9dabc64b05eb8c97b5b92da1fb26299
Reviewed-by: Titta Heikkala <titta.heikkala@theqtcompany.com>
|
|
|
|
|
|
| |
Change-Id: I43bd6f8d2f565a989e4d48d68a8c610240ed35fb
Task-number: QTRD-3492
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
|
|
|
|
|
|
| |
Task-number: QTRD-3655
Change-Id: Id68e9cec8d1093fe1557b07a148ae04a27656284
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
|
|
|
|
|
|
|
| |
Copyright header changes for 5.5.
Change-Id: I0361cfe1ebdb28955cb927700f14cf7b72694421
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
|
|
|
|
|
|
|
| |
B2Qt device called uvs creation before array creation.
Change-Id: Ia0cac175a3e0769f2571a0eadc7c764ae4092cc2
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
|
|
|
|
|
|
|
|
| |
When texture was attached on the qmlsurface example, the smoothUVs was
called before the actual model mesh was created.
Change-Id: I5a62b06291232df54ce08d586d8794b332a4eece
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
| |
Vertex index was limited to unsigned short, meaning even slightly
complex meshes couldn't be used. Changed to unsigned int.
Also removed unused vertex indexer methods.
Change-Id: Iebe62bd3a501dc79ee2857cca28ac0d05bd4a55e
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
|
|
|
|
|
|
| |
Change-Id: I453438fee92f18c983c1bef04c68b24a7ff72cf9
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
|
|
|
|
|
|
| |
Change-Id: I0667a0e53fd07fe9c6ce7b2d63887eda1692bf3b
Change-Id: I0667a0e53fd07fe9c6ce7b2d63887eda1692bf3b
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
|
|
|
|
|
|
|
|
| |
Task-number: QTRD-3412
Change-Id: I7f19ee34ccdde3a227033e3a88994e157b0092c4
Change-Id: I7f19ee34ccdde3a227033e3a88994e157b0092c4
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
|
|
|
|
|
|
|
| |
Task-number: QTRD-3410
Change-Id: I86b240b6548ec4c94f6be0dc352ed112965926f3
Change-Id: I86b240b6548ec4c94f6be0dc352ed112965926f3
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
|
|
|
|
|
|
| |
Task-number: QTRD-3402
Change-Id: I70ef641fc7249b144d6e98971f1fb74f2935d706
Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
|
|
|
|
|
|
|
|
|
| |
Android doesn't like creating extra QWindows, so changed
dummy surfaces used to do static initialization and cleanup
to use QOffscreenSurface.
Change-Id: Ia42e288a05ef49524252c457f3a3494677e3fc63
Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
|
|
|
|
|
|
| |
Task-number: QTRD-3391
Change-Id: I5c2f2b674e50e7d39bc9355ebc9bcf05f22d5a39
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
|
|
|
|
|
| |
Change-Id: I46db1f02575b8d140890708bf04633fa23f28a15
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
|
|
|
|
|
|
| |
Task-number: QTRD-3392
Change-Id: I786bbf5ee9252b92d43d02d6b88ed9b986b4a5eb
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
If the label text with slightly smaller font would fit into smaller
texture, force to use the smaller one.
Task-number: QTRD-3395
Change-Id: Ib70f6722ea8403e4aa25ed190b21c059d9d0e062
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
Looks like the render buffer for depth gets incomplete and that causes
resets. Regenerating the buffers seems to be helpful.
Task-number: QTRD-3372
Change-Id: I1f0fb40f06fac44e062f2f2b512bc9424479328c
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
|
|
|
|
|
|
|
|
|
| |
Unnecessary modelMatrix multiplications removed. Intentional whitespace
removal.
Change-Id: I78b8e6f984d44baf7015c9551701b04cb869fc8b
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
|
|
|
|
|
|
|
|
| |
Bug in adjustment logic caused adjustment to happen pretty much always.
Task-number: QTRD-3374
Change-Id: Id6151d2d3eb8369bbf9252e4eb4b76ed57fb1f3c
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When static optimization is in use with mesh objects and range
gradient, and the object Y-value resolves into a texture coordinate
that is exactly on the texel boundary, the rendered fragments
of the object are not all same colors on some graphics cards,
despite all vertices having the same UV value.
Fixed by adjusting the Y-value slightly if it is close to the
boundary.
Task-number: QTRD-3370
Change-Id: Ie028602cbd9a00bb0e17049eb8f40feb8b18a6bf
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
In QML apps, the texture for custom labels can get created before
glGenIntegerv returns a valid value for GL_MAX_TEXTURE_SIZE.
Do not check for max size when it is zero.
Change-Id: I114ac8494bd5aa509490bd38ae58827fd21e2729
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
|
|
|
|
|
|
|
|
|
| |
Now that these are not generated all the time, makes it
easier to use glGetError to find actual errors.
Change-Id: I4e10f5798e4e79466a47a0d671c04b445899c62c
Change-Id: I4e10f5798e4e79466a47a0d671c04b445899c62c
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
|
|
|
|
|
|
| |
Change-Id: If40f10043951409b3d6597776b60d7eb55c73eec
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
|
|
|
|
|
|
|
|
|
| |
Change texture UVs to be generated according to data dimension. Also
utilise this change on texturesurface example.
Change-Id: Ideacfba409dc2e7cf579fb38d897e08c9f9a1b71
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
|
|
|
|
|
| |
Change-Id: Ic51682f7e3465c75d505e582f212eaa2cdc28c8b
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
|
|
|
|
|
|
|
|
|
| |
Normals and triangles are generated according to data direction.
Task-number: QTRD-3160
Change-Id: Ia4286467682628930da3d82b204fd1ec078a396a
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
- Buffer ids were not cleared appropriately
- Update didn't account for items outside axis ranges
- In some cases wrong shader was used for point series
Task-number: QTRD-3353
Change-Id: Iea465d99eb557402feb5fb017ae92393ee8f377f
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
|
|
|
|
|
|
| |
Task-number: QTRD-3344
Change-Id: I8c1d2e2ae4afd6f9058c59adfc3d784b5f724358
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
|
|
|
|
|
|
|
|
| |
Alpha buffer size should not be set for the window's surface format.
Task-number: QTRD-3351
Change-Id: I64ee61990e8ceb88bdbab715a2902b454619f3e5
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
|
|
|
|
|
|
|
|
| |
Task-number: QTRD-3230
Change-Id: I0cb76f077c1930033c03f833c9c9f2d347c41f9c
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
|
|
|
|
|
|
|
|
|
| |
Zooming to cursor is now default operating mode of
the default input handler.
Task-number: QTRD-3263
Change-Id: I5699fc0ce7393059538972cd52f31f06d87e3d8d
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
|