Qt 5.9 compatibility

merge-requests/9/merge
Phil Taylor 2022-01-30 10:55:12 +00:00
rodzic 156d03706a
commit 21a8bbc1a6
2 zmienionych plików z 4 dodań i 1 usunięć

Wyświetl plik

@ -535,8 +535,9 @@ void servermain::loadSettings()
guid = QUuid::createUuid().toString();
settings->setValue("GUID", guid);
}
#if (QT_VERSION >= QT_VERSION_CHECK(5,10,0))
memcpy(tempPrefs->guid, QUuid::fromString(guid).toRfc4122().constData(), GUIDLEN);
#endif
tempPrefs->rxAudioSetup.isinput = true;
tempPrefs->txAudioSetup.isinput = false;
tempPrefs->rxAudioSetup.localAFgain = 255;

Wyświetl plik

@ -1693,7 +1693,9 @@ void wfmain::loadSettings()
guid = QUuid::createUuid().toString();
settings->setValue("GUID", guid);
}
#if (QT_VERSION >= QT_VERSION_CHECK(5,10,0))
memcpy(rigTemp->guid, QUuid::fromString(guid).toRfc4122().constData(), GUIDLEN);
#endif
ui->serverRXAudioInputCombo->blockSignals(true);
rigTemp->rxAudioSetup.name = settings->value("ServerAudioInput", "").toString();