Index: sources/device/DeviceModels.cpp =================================================================== diff -u -r3e682c5afdadcf4dd2006e3d975fbee58e48619e -rc2f474ff07c98aa350c445a2474976a3cf985f40 --- sources/device/DeviceModels.cpp (.../DeviceModels.cpp) (revision 3e682c5afdadcf4dd2006e3d975fbee58e48619e) +++ sources/device/DeviceModels.cpp (.../DeviceModels.cpp) (revision c2f474ff07c98aa350c445a2474976a3cf985f40) @@ -230,9 +230,12 @@ // get the value QString val = vByteArray; +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) // TODO: Qt6 port - find replacement for deprecated QString::isSimpleText(). - // ok = ! val.isNull() && val.isSimpleText(); ok = ! val.isNull(); +#else + ok = ! val.isNull() && val.isSimpleText(); +#endif // check if the vExitCode passed and it has a value other than zero if ( ! ok ){ _data.mReason = Device::DeviceError::eDevice_Scripts_Error_Incorrect_Rsp_Type ; goto lError; } // there is not a valid value @@ -277,8 +280,12 @@ // get the value QString val = vByteArray; - // TODO: Qt6 Port: ok = ! val.isNull() && val.isSimpleText(); - ok = ! val.isNull(); // TODO: Qt6 Port +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + // TODO: Qt6 port - find replacement for deprecated QString::isSimpleText(). + ok = ! val.isNull(); +#else + ok = ! val.isNull() && val.isSimpleText(); +#endif // check if the vExitCode passed and it has a value other than zero if ( ! ok ){ _data.mReason = Device::DeviceError::eDevice_Scripts_Error_Incorrect_Rsp_Type ; goto lError; } // there is not a valid value @@ -323,8 +330,12 @@ // get the value QString val = vByteArray; - // TODO: Qt6 Port: ok = ! val.isNull() && val.isSimpleText(); - ok = ! val.isNull(); // TODO: Qt6 Port +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + // TODO: Qt6 port - find replacement for deprecated QString::isSimpleText(). + ok = ! val.isNull(); +#else + ok = ! val.isNull() && val.isSimpleText(); +#endif // check if the vExitCode passed and it has a value other than zero if ( ! ok ){ _data.mReason = Device::DeviceError::eDevice_Scripts_Error_Incorrect_Rsp_Type ; goto lError; } // there is not a valid value