Merge pull request #505 from llange/qt6.3-qmetatype
remove qRegisterMetaTypeStreamOperators (qt6)
This commit is contained in:
@@ -501,8 +501,10 @@ CANConnection* ConnectionWindow::create(CANCon::type pTye, QString pPortName, QS
|
|||||||
|
|
||||||
void ConnectionWindow::loadConnections()
|
void ConnectionWindow::loadConnections()
|
||||||
{
|
{
|
||||||
|
#if QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 )
|
||||||
qRegisterMetaTypeStreamOperators<CANBus>();
|
qRegisterMetaTypeStreamOperators<CANBus>();
|
||||||
qRegisterMetaTypeStreamOperators<QList<CANBus>>();
|
qRegisterMetaTypeStreamOperators<QList<CANBus>>();
|
||||||
|
#endif
|
||||||
|
|
||||||
QSettings settings;
|
QSettings settings;
|
||||||
|
|
||||||
|
|||||||
@@ -30,8 +30,10 @@ MainWindow::MainWindow(QWidget *parent) :
|
|||||||
ui(new Ui::MainWindow)
|
ui(new Ui::MainWindow)
|
||||||
{
|
{
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
|
#if QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 )
|
||||||
qRegisterMetaTypeStreamOperators<QVector<QString>>();
|
qRegisterMetaTypeStreamOperators<QVector<QString>>();
|
||||||
qRegisterMetaTypeStreamOperators<QVector<int>>();
|
qRegisterMetaTypeStreamOperators<QVector<int>>();
|
||||||
|
#endif
|
||||||
|
|
||||||
useHex = true;
|
useHex = true;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user