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/qitemmodelscatterdataproxy_p.h | |
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/qitemmodelscatterdataproxy_p.h')
-rw-r--r-- | src/datavisualization/data/qitemmodelscatterdataproxy_p.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/datavisualization/data/qitemmodelscatterdataproxy_p.h b/src/datavisualization/data/qitemmodelscatterdataproxy_p.h index a8d3c0e6..cb433a30 100644 --- a/src/datavisualization/data/qitemmodelscatterdataproxy_p.h +++ b/src/datavisualization/data/qitemmodelscatterdataproxy_p.h @@ -65,10 +65,10 @@ private: QString m_zPosRole; QString m_rotationRole; - QRegExp m_xPosRolePattern; - QRegExp m_yPosRolePattern; - QRegExp m_zPosRolePattern; - QRegExp m_rotationRolePattern; + QRegularExpression m_xPosRolePattern; + QRegularExpression m_yPosRolePattern; + QRegularExpression m_zPosRolePattern; + QRegularExpression m_rotationRolePattern; QString m_xPosRoleReplace; QString m_yPosRoleReplace; |