| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When using static optimization for scattergraph
and series mesh type is not point mesh,
the scatter3D renderer uses
ScatterObjectBufferHelper's fullLoad. In
the fullLoad old data buffers are deleted, if
m_meshDataLoaded is set to true. However, at the
beginning of the fullLoad, the flag was always
set to false so old data buffers were
never deleted. Moved the setting of
the m_meshDataLoaded to false after the deletion
of old buffers. Added similar code to
scatterpointbufferhelper for consistency.
Pick-to: 5.15 6.1
Fixes: QTBUG-80194
Change-Id: I2fd71af86b1fd73621074187f112fd9783df36df
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|
|
|
|
|
|
| |
Those modules are not used anywhere inside this module.
Change-Id: I21cafca4705172cfdaf4336cc4bfcc43d90306a7
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
|
|
|
|
|
|
|
|
|
| |
This is a low-risk port that leaves all the procedural registration
intact and just uses the CMake syntax.
Change-Id: I5cfbf345977e5ea522ce2da6111c1fe293be6a2c
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Rendering a graph directly to background didn't
work in Qt 6 since it uses RHI and there is
no way to not clear the color buffer
before rendering. The graph uses direct OpenGL
calls to render directly to background. Enabled
direct rendering to qml3doscilloscope example.
In addition, RenderDirectToBackground_NoClear got
deprecated.
When rendering directly to background,
using non-transparent qml item as a background
will hide the graph. This was already mentioned
in the documentation but not clearly enough.
Updated documentation for AbstractGraph3D.
Pick-to: 6.1
Fixes: QTBUG-90665
Change-Id: I53081bac382ab89573359886e4f5c4b41be8e86d
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|
|
|
|
|
|
|
| |
Pick-to: 6.1
Task-number: QTBUG-86726
Change-Id: I8372086c40043a6bd1d306b6bfb711e96ddc7cb7
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
| |
Setting the QT_NO_INTERNAL_COMPATIBILITY_FUNCTIONS variable
in the project ensures we ported away from old API calls.
Task-number: QTBUG-86815
Change-Id: I657ce43f65def5a13ca14030215a8adc37690d20
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Added pointer to graph in Abstract3DController.
Controller can use that pointer to check whether
the graph is ready when receiving
a themetypeChanged signal. Added manual test
for gradients.
Pick-to: 6.1
Fixes: QTBUG-93506
Change-Id: I13df962b807feb615e3267f580ef57dd62a0b058
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Added check for new theme's forcePredefinedType
in ThemeManager's setActiveTheme before resetting
new theme's dirtyBits.
Pick-to: 6.1 5.15
Fixes: QTBUG-91103
Fixes: QTBUG-65264
Change-Id: If0dd2dfe6a0e179ce8a21de74b3193650f3e76c1
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|
|
|
|
|
| |
Task-number: QTBUG-88742
Change-Id: I140a038ccb47433ff7fe437bfc002e580bfb21a6
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
|
|
|
|
|
|
| |
Task-number: QTBUG-88742
Change-Id: I155ad8d2d37a37b71851d95028bd0a26e2d034a9
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
* Restore removed example snippet tags
* Fix issues in the .qdocconf file
Pick-to: 6.1
Task-number: QTBUG-91875
Change-Id: Iff7068204b5713fbf9f9f568834b55c5c282abba
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
That there is a 'using namespace QtDataVisualization' statement in the
'galaxy' manual tests suggests that there used to be one, but there isn't
anymore.
This documentation appears to have been for that long-gone namespace, so
remove it to silence qdoc. Fix references to the now global
qDefaultSurfaceFormat utility function.
Pick-to: 6.1
Change-Id: Ide7689ee30af60f8c97649672f8a0f5ad455c35e
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|
|
|
|
|
| |
Pick-to: 6.1
Change-Id: Idb633687f84c08f1b873a44af6fc9e1a64a4bee5
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
Use PROJECT_VERSION instead of CMAKE_PROJECT_VERSION, so that the
repo project version is used in a top-level build, rather
than the version of the qt5 project.
Pick-to: 6.1
Task-number: QTBUG-92861
Change-Id: I540849455689e22f954e4f6eeb1ae6a79a583795
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
|
|
| |
Pick-to: 6.1.0
Pick-to: 6.1
Change-Id: Ib983262d4d90df3b976c91cbd2b6e9c652ae9932
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
| |
Pick-to: 6.1
Fixes: QTBUG-90663
Change-Id: Ifc972c20e273e5ae060bc70d289027350428599f
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tuomo Pelkonen <tuomo.pelkonen@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Adding one row causes an assert
ASSERT failure in QList::at: "index out of range", file include/QtCore/qlist.h, line 373
since there is no first row to check the column count against.
Check for empty as well.
Pick-to: 5.15 6.1
Task-number: PYSIDE-1438
Change-Id: I225b87b764545b7a430472dc5a4b2e476a26a7ff
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|
|
|
|
|
|
| |
Pick-to: 6.1
Fixes: QTBUG-91347
Change-Id: Ice76d050c47fa141749b77a0313c2f070151bbc1
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
Clang may interpret static inline function as unused, although
it should not. Pragma it out for clang.
Fixes: QTBUG-91053
Pick-to: 6.1
Change-Id: I8fd8bec5236752189deff8a2f6ceb62e572dca30
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
SW renderer doesn't have opengles2 config set, so we need to
make sure the pointer does not include garbage.
Fixes: QTBUG-91032
Pick-to: 6.1
Change-Id: I98aa2f10889fe04c2f6f4af6abd0fe559ba686bf
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
|
|
|
|
|
|
| |
Fixes: QTBUG-90737
Change-Id: Iab4a0f9d4ff3618dfb4c1675dfd731421de29f9f
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|
|
|
|
|
| |
Fixes: QTBUG-90400
Change-Id: Ia2f1974a21112bad97724717d073d367c4413a7f
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
|
|
|
|
|
|
|
| |
Task-number: QTBUG-89299
Change-Id: I5becbf39605e566c3d32cb5e210d974df9de27da
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|
|
|
|
|
| |
Task-number: QTBUG-89297
Change-Id: I57acf345b6fc64a93d08d41016c755cae4edd6db
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|
|
|
|
|
|
|
| |
Set QSG_RHI_BACKEND environment variable to "opengl" to force
RHI to use OpenGL backend.
Change-Id: Ie1fa0ffe466f97b1bbcc5281c49bbdf6e6d053c0
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Fixes c++ build issues with Qt 6.0, verified to work on Windows.
Changed QQmlListProperty constructors functions types from int to qsizetype
GeometryChanged changed to GeometryChange
createTextureFromNativeObject changed to QNativeInterface::QSGOpenGLTexture::fromNative
clearBeforeRendering and setClearBeforeRendering removed
Task-number: QTBUG-89297
Change-Id: I84c723560de2821572af00f62e7780445b6c2595
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
Replace QRegExp with QRegularExpression and change usage accordingly.
Replace shared QOpenGLFunctions_2_1 with our own copy. Fix header
include changes.
Task-number: QTBUG-89297
Change-Id: I6d3cf36ba9303ef62db3220816ea35f51eb26a3c
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
|
|
|
|
|
| |
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>
|
|\ |
|
| |\
| | |
| | |
| | | |
Change-Id: I9152493c8aed299f0bcffc03651b05d6ae01db22
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
colorgradient.cpp:80:61: warning: ‘QQmlListProperty<T>::QQmlListProperty(QObject*, QList<T*>&) [with T = QtDataVisualization::ColorGradientStop]’ is deprecated: Use constructor taking QList pointer, and gain improved performance [-Wdeprecated-declarations]
declarativerendernode.cpp:116:71: warning: ‘QSGTexture* QQuickWindow::createTextureFromId(uint, const QSize&, QQuickWindow::CreateTextureOptions) const’ is deprecated: Use createTextureFromNativeObject() instead [-Wdeprecated-declarations]
customformatter.cpp:167:34: warning: ‘QDateTime::QDateTime(const QDate&)’ is deprecated: Use QDate::startOfDay() [-Wdeprecated-declarations]
Change-Id: Iaf3b8814cd70a704b87b4970ad83ed5a7d4dc0f1
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
|
| | |\
| | | |
| | | |
| | | | |
Change-Id: Ie1823c477a005d44d7b12d1e6d9228d89b619298
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Fixes: QTBUG-81676
Change-Id: Ibe7f73e1fc529411ca92d7bdbb2ad8824cb97a62
Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
|
|/ / /
| | |
| | |
| | |
| | |
| | |
| | | |
Add missing Q_MOC_INCLUDE and adapt to OpenGL split.
Change-Id: I6150876a62ca55ad63c09a128226c2bac428b821
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
|
|\| |
| | |
| | |
| | | |
Change-Id: Ia189ad6a24e3284a538cea1f78fcbc9b4687f6b8
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Use QHash::contains() instead of checking for presence via value(),
fixing:
abstractdeclarative.cpp:681:48: warning: 'QList<ValueType> QHash<K, V>::values(const Key&) const [with Key = QQuickWindow*; T = bool]' is deprecated: Use QMultiHash for hashes storing multiple values with the same key. [-Wdeprecated-declarations]
abstractdeclarative.cpp:694:45: warning: 'QList<ValueType> QHash<K, V>::values(const Key&) const [with Key = QQuickWindow*; T = bool]' is deprecated: Use QMultiHash for hashes storing multiple values with the same key. [-Wdeprecated-declarations]
Change-Id: Ic858949514a647f62e74bff6ece346851dce413b
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
|
|\| |
| | |
| | |
| | | |
Change-Id: I8bfa9b1604d35abc2844c0a4e10c0f8c66cc2acd
|
| |/
| |
| |
| |
| |
| |
| | |
It is being deprecated.
Change-Id: I38e6bc29ac03108f56f445069b2dbbe8a3db201a
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
|
|\|
| |
| |
| | |
Change-Id: Ib309fe3b5adee4933ae9a66f4419aec28b088aa5
|
| |
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-78690
Change-Id: Ib264cb0294f02e2983cba0041a48ff87b7bc4f51
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|\ \
| |/
|/|
| |
| |
| |
| | |
Conflicts:
.qmake.conf
Change-Id: Ic4b3c490262e4a72bdd45b03828b88a784a4b9b8
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Modify all the qmlRegisterModule calls to use minor version 15
because minor version zero from 6.0.0 would make tests fail.
This is similar to what was done in qtdeclarative in
c147b20a2c1299b2d659fe7c9472ae3866b6a425.
Change-Id: If3202a887389351dd6efa760b0212e69582d9576
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
|
|\ \
| | |
| | |
| | | |
Change-Id: I08c9b0b57ccefc161815833ccd63208d2768cb54
|
| | |
| | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-77730
Change-Id: I827d727b103a9923a8b82163bfa4f77c81c0906b
Reviewed-by: Liang Qi <liang.qi@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-76491
Change-Id: I5831525f8ac4bf0cbec6a52a434b1d8c3b388b80
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
|
|\| |
| |/
|/|
| | |
Change-Id: I9d75a47adea2d20db06f66ffa844275cbcf928d3
|
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-74391
Change-Id: I8cefab01c450ad5b52ba57ba161ee9065e00a6b1
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: I6050b5269304ac6941d3a9d057c91d439f46b63c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|