Fix compilation on Qt 5.12
This commit is contained in:
parent
05632f429a
commit
49c145e603
|
@ -15,7 +15,7 @@
|
||||||
<value>style=allman, convert-tabs, align-pointer=type, align-reference=middle, indent=spaces, indent-namespaces, indent-col1-comments, pad-oper, unpad-paren, keep-one-line-blocks, close-templates</value>
|
<value>style=allman, convert-tabs, align-pointer=type, align-reference=middle, indent=spaces, indent-namespaces, indent-col1-comments, pad-oper, unpad-paren, keep-one-line-blocks, close-templates</value>
|
||||||
</setting>
|
</setting>
|
||||||
<setting name="Ignore" serializeAs="String">
|
<setting name="Ignore" serializeAs="String">
|
||||||
<value>src/cross/vendor</value>
|
<value>src/cross/vendor;src/gui/Src/ThirdPartyLibs/md4c</value>
|
||||||
</setting>
|
</setting>
|
||||||
<setting name="License" serializeAs="String">
|
<setting name="License" serializeAs="String">
|
||||||
<value />
|
<value />
|
||||||
|
|
|
@ -1065,7 +1065,9 @@ void MainWindow::loadWindowSettings()
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef X64DBG_RELEASE
|
#ifdef X64DBG_RELEASE
|
||||||
auto compileEpoch = GetCompileDate().startOfDay(Qt::UTC).toSecsSinceEpoch();
|
auto compileDate = QDateTime(GetCompileDate());
|
||||||
|
compileDate.setTimeSpec(Qt::UTC);
|
||||||
|
auto compileEpoch = compileDate.toSecsSinceEpoch();
|
||||||
duint releaseNotesEpoch = 0;
|
duint releaseNotesEpoch = 0;
|
||||||
BridgeSettingGetUint("Gui", "ReleaseNotesEpoch", &releaseNotesEpoch);
|
BridgeSettingGetUint("Gui", "ReleaseNotesEpoch", &releaseNotesEpoch);
|
||||||
if(releaseNotesEpoch < compileEpoch)
|
if(releaseNotesEpoch < compileEpoch)
|
||||||
|
@ -1231,8 +1233,9 @@ void MainWindow::showReleaseNotes(duint cutoffEpoch)
|
||||||
{
|
{
|
||||||
QRegularExpressionMatch match = i.next();
|
QRegularExpressionMatch match = i.next();
|
||||||
auto matchText = match.captured(1);
|
auto matchText = match.captured(1);
|
||||||
auto matchDate = QDate::fromString(matchText, "yyyy.MM.dd");
|
auto matchDate = QDateTime::fromString(matchText, "yyyy.MM.dd");
|
||||||
auto matchEpoch = matchDate.startOfDay(Qt::UTC).toSecsSinceEpoch();
|
matchDate.setTimeSpec(Qt::UTC);
|
||||||
|
auto matchEpoch = matchDate.toSecsSinceEpoch();
|
||||||
if(matchEpoch <= cutoffEpoch)
|
if(matchEpoch <= cutoffEpoch)
|
||||||
{
|
{
|
||||||
markdown = markdown.left(match.capturedStart(0));
|
markdown = markdown.left(match.capturedStart(0));
|
||||||
|
|
Loading…
Reference in New Issue