diff options
| author | Tomi Korpipaa <tomi.korpipaa@qt.io> | 2020-12-10 07:12:10 +0200 |
|---|---|---|
| committer | Tomi Korpipaa <tomi.korpipaa@qt.io> | 2020-12-14 06:57:52 +0200 |
| commit | 471a6cbd07fddd3f392204d532ac8d3639c7dc7f (patch) | |
| tree | cd4aa8b6cda0bb52e851d7ced1a3a93b8a8fa622 /src/datavisualization/data/scatteritemmodelhandler.cpp | |
| parent | 058eab02a5c1d8d8de8917d473eb39aa18a1c888 (diff) | |
Migrate C++ API rendering path to Qt 6
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>
Diffstat (limited to 'src/datavisualization/data/scatteritemmodelhandler.cpp')
| -rw-r--r-- | src/datavisualization/data/scatteritemmodelhandler.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/datavisualization/data/scatteritemmodelhandler.cpp b/src/datavisualization/data/scatteritemmodelhandler.cpp index 67b9bb3a..7cbaa8de 100644 --- a/src/datavisualization/data/scatteritemmodelhandler.cpp +++ b/src/datavisualization/data/scatteritemmodelhandler.cpp @@ -211,10 +211,10 @@ void ScatterItemModelHandler::resolveModel() m_yPosReplace = m_proxy->yPosRoleReplace(); m_zPosReplace = m_proxy->zPosRoleReplace(); m_rotationReplace = m_proxy->rotationRoleReplace(); - m_haveXPosPattern = !m_xPosPattern.isEmpty() && m_xPosPattern.isValid(); - m_haveYPosPattern = !m_yPosPattern.isEmpty() && m_yPosPattern.isValid(); - m_haveZPosPattern = !m_zPosPattern.isEmpty() && m_zPosPattern.isValid(); - m_haveRotationPattern = !m_rotationPattern.isEmpty() && m_rotationPattern.isValid(); + m_haveXPosPattern = !m_xPosPattern.namedCaptureGroups().isEmpty() && m_xPosPattern.isValid(); + m_haveYPosPattern = !m_yPosPattern.namedCaptureGroups().isEmpty() && m_yPosPattern.isValid(); + m_haveZPosPattern = !m_zPosPattern.namedCaptureGroups().isEmpty() && m_zPosPattern.isValid(); + m_haveRotationPattern = !m_rotationPattern.namedCaptureGroups().isEmpty() && m_rotationPattern.isValid(); QHash<int, QByteArray> roleHash = m_itemModel->roleNames(); m_xPosRole = roleHash.key(m_proxy->xPosRole().toLatin1(), noRoleIndex); |