diff --git a/Software/PC_Application/LibreVNA-GUI/Calibration/calibrationmeasurement.cpp b/Software/PC_Application/LibreVNA-GUI/Calibration/calibrationmeasurement.cpp index a061291..a3ee57e 100644 --- a/Software/PC_Application/LibreVNA-GUI/Calibration/calibrationmeasurement.cpp +++ b/Software/PC_Application/LibreVNA-GUI/Calibration/calibrationmeasurement.cpp @@ -124,7 +124,7 @@ QWidget *CalibrationMeasurement::Base::createStandardWidget() { auto cbStandard = new QComboBox(); for(auto s : supportedStandards()) { - cbStandard->addItem(s->getDescription(), qVariantFromValue((void*) s)); + cbStandard->addItem(s->getDescription(), QVariant::fromValue((void*) s)); if(standard == s) { cbStandard->setCurrentText(s->getDescription()); } diff --git a/Software/PC_Application/LibreVNA-GUI/Util/qpointervariant.h b/Software/PC_Application/LibreVNA-GUI/Util/qpointervariant.h index b44f5d1..d9b75a9 100644 --- a/Software/PC_Application/LibreVNA-GUI/Util/qpointervariant.h +++ b/Software/PC_Application/LibreVNA-GUI/Util/qpointervariant.h @@ -19,7 +19,7 @@ public: mt.construct(ptr, variant.constData()); } QVariant value() { - return QVariant(variant.type(), ptr); + return QVariant(variant.metaType(), ptr); } void* getPtr(){return ptr;} private: