Skip to content

Commit 2ce58f0

Browse files
committed
m2k: fix Qt6 removed APIs and module compatibility
- Remove qRegisterMetaTypeStreamOperators calls (auto-registered in Qt6) - Fix QLabel::setNum overload ambiguity in powercontrol.ui by moving the connection to code with qOverload<int> disambiguation - Qt3DRender/QGeometry -> Qt3DCore/QGeometry (moved in Qt6) - Qt3DRender/QAttribute -> Qt3DCore/QAttribute (moved in Qt6) Signed-off-by: IonutMuthi <Ionut.Muthi@analog.com>
1 parent c9aaa07 commit 2ce58f0

File tree

5 files changed

+4
-30
lines changed

5 files changed

+4
-30
lines changed

packages/imu/plugins/imuanalyzer/include/imuanalyzer/scenerenderer.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@
4444
#include <Qt3DRender/QCamera>
4545

4646
#include <Qt3DCore/QEntity>
47-
#include <Qt3DRender/QGeometry>
47+
#include <Qt3DCore/QGeometry>
4848
#include <Qt3DRender/QGeometryRenderer>
49-
#include <Qt3DRender/QAttribute>
49+
#include <Qt3DCore/QAttribute>
5050
#include <QColor>
5151
#include <QBuffer>
5252

packages/m2k/plugins/m2k/src/old/logicanalyzer/logicanalyzer_api.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,19 +70,13 @@ class LogicAnalyzer_API : public ApiObject
7070
// Register type. TODO: maybe a cleaner way of doing this
7171
// QVariant needs qRegisterMetaTypeStreamOperators for serialization/deserialization
7272
qRegisterMetaType<QPair<int, int>>("pair");
73-
qRegisterMetaTypeStreamOperators<QPair<int, int>>("pair");
7473
qRegisterMetaType<QList<QPair<int, int>>>("list(pair)");
75-
qRegisterMetaTypeStreamOperators<QList<QPair<int, int>>>("list(pair)");
7674
qRegisterMetaType<QList<QList<QPair<int, int>>>>("list(list(pair))");
77-
qRegisterMetaTypeStreamOperators<QList<QList<QPair<int, int>>>>("list(list(pair))");
7875

7976
qRegisterMetaType<QList<QStringList>>("list(stringlist)");
80-
qRegisterMetaTypeStreamOperators<QList<QStringList>>("list(stringlist)");
8177

8278
qRegisterMetaType<QVector<int>>("vector(int)");
83-
qRegisterMetaTypeStreamOperators<QVector<int>>("vector(int)");
8479
qRegisterMetaType<QVector<QVector<int>>>("vector(vector(int))");
85-
qRegisterMetaTypeStreamOperators<QVector<QVector<int>>>("vector(vector(int))");
8680
}
8781
~LogicAnalyzer_API() {}
8882

packages/m2k/plugins/m2k/src/old/patterngenerator/pattern_generator_api.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,15 +52,10 @@ class PatternGenerator_API : public ApiObject
5252
, m_pattern(pattern)
5353
{
5454
qRegisterMetaType<QVector<int>>("vector(int)");
55-
qRegisterMetaTypeStreamOperators<QVector<int>>("vector(int)");
5655
qRegisterMetaType<QVector<QVector<int>>>("vector(vector(int))");
57-
qRegisterMetaTypeStreamOperators<QVector<QVector<int>>>("vector(vector(int))");
5856

5957
qRegisterMetaType<QPair<QVector<int>, QString>>("pair(vector(int), string)");
60-
qRegisterMetaTypeStreamOperators<QPair<QVector<int>, QString>>("pair(vector(int), string)");
6158
qRegisterMetaType<QVector<QPair<QVector<int>, QString>>>("vector(pair(vector(int), string))");
62-
qRegisterMetaTypeStreamOperators<QVector<QPair<QVector<int>, QString>>>(
63-
"vector(pair(vector(int), string))");
6459
}
6560
~PatternGenerator_API() {}
6661

packages/m2k/plugins/m2k/src/old/power_controller.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ PowerController::PowerController(libm2k::context::M2k *m2k, ToolMenuEntry *tme,
5454
, m_m2k_powersupply(m_m2k_context->getPowerSupply())
5555
{
5656
ui->setupUi(this);
57+
connect(ui->trackingRatio, &QSlider::valueChanged, ui->trackingRatioLbl, qOverload<int>(&QLabel::setNum));
5758

5859
try {
5960
m_m2k_powersupply->enableChannel(0, false);

packages/m2k/plugins/m2k/ui/powercontrol.ui

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1150,23 +1150,7 @@ QPushButton:disabled {
11501150
</hint>
11511151
</hints>
11521152
</connection>
1153-
<connection>
1154-
<sender>trackingRatio</sender>
1155-
<signal>valueChanged(int)</signal>
1156-
<receiver>trackingRatioLbl</receiver>
1157-
<slot>setNum(int)</slot>
1158-
<hints>
1159-
<hint type="sourcelabel">
1160-
<x>844</x>
1161-
<y>151</y>
1162-
</hint>
1163-
<hint type="destinationlabel">
1164-
<x>903</x>
1165-
<y>115</y>
1166-
</hint>
1167-
</hints>
1168-
</connection>
1169-
<connection>
1153+
<connection>
11701154
<sender>btnSync</sender>
11711155
<signal>toggled(bool)</signal>
11721156
<receiver>trackingRatio</receiver>

0 commit comments

Comments
 (0)