summaryrefslogtreecommitdiffstats
path: root/src/datavisualization/data/baritemmodelhandler_p.h
diff options
context:
space:
mode:
authorTomi Korpipaa <tomi.korpipaa@qt.io>2020-12-10 07:12:10 +0200
committerTomi Korpipaa <tomi.korpipaa@qt.io>2020-12-14 06:57:52 +0200
commit471a6cbd07fddd3f392204d532ac8d3639c7dc7f (patch)
treecd4aa8b6cda0bb52e851d7ced1a3a93b8a8fa622 /src/datavisualization/data/baritemmodelhandler_p.h
parent058eab02a5c1d8d8de8917d473eb39aa18a1c888 (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/baritemmodelhandler_p.h')
-rw-r--r--src/datavisualization/data/baritemmodelhandler_p.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/datavisualization/data/baritemmodelhandler_p.h b/src/datavisualization/data/baritemmodelhandler_p.h
index 4b3acdd5..0363ad05 100644
--- a/src/datavisualization/data/baritemmodelhandler_p.h
+++ b/src/datavisualization/data/baritemmodelhandler_p.h
@@ -64,8 +64,8 @@ protected:
int m_columnCount;
int m_valueRole;
int m_rotationRole;
- QRegExp m_valuePattern;
- QRegExp m_rotationPattern;
+ QRegularExpression m_valuePattern;
+ QRegularExpression m_rotationPattern;
QString m_valueReplace;
QString m_rotationReplace;
bool m_haveValuePattern;