Merge branch 'compileerror' into 'master'

Contect selector: fix ESM date and version data encoding/decoding (#7764)

Closes #7764

See merge request OpenMW/openmw!3742
revert-c3c8fa1e
psi29a 12 months ago
commit bfb60c5504

@ -51,7 +51,8 @@ QByteArray ContentSelectorModel::EsmFile::encodedData() const
QByteArray encodedData; QByteArray encodedData;
QDataStream stream(&encodedData, QIODevice::WriteOnly); QDataStream stream(&encodedData, QIODevice::WriteOnly);
stream << mFileName << mAuthor << mVersion << mModified.toString() << mPath << mDescription << mGameFiles; stream << mFileName << mAuthor << mVersion << mModified.toString(Qt::ISODate) << mPath << mDescription
<< mGameFiles;
return encodedData; return encodedData;
} }
@ -113,11 +114,11 @@ void ContentSelectorModel::EsmFile::setFileProperty(const FileProperty prop, con
break; break;
case FileProperty_Format: case FileProperty_Format:
mVersion = value.toInt(); mVersion = value;
break; break;
case FileProperty_DateModified: case FileProperty_DateModified:
mModified = QDateTime::fromString(value); mModified = QDateTime::fromString(value, Qt::ISODate);
break; break;
case FileProperty_FilePath: case FileProperty_FilePath:

Loading…
Cancel
Save