From 1eb503f526b548705c3695cdfd4932562726cc52 Mon Sep 17 00:00:00 2001 From: David Kelly Date: Thu, 31 Aug 2017 16:49:12 -0700 Subject: [PATCH] we are qt5.6 on mac --- interface/src/commerce/Ledger.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/interface/src/commerce/Ledger.cpp b/interface/src/commerce/Ledger.cpp index 0f7f533e13..7937fa4bbb 100644 --- a/interface/src/commerce/Ledger.cpp +++ b/interface/src/commerce/Ledger.cpp @@ -142,7 +142,11 @@ void Ledger::historySuccess(QNetworkReply& reply) { // turns out on my machine, toLocalTime convert to some weird timezone, yet the // systemTimeZone is correct. To avoid a strange bug with other's systems too, lets // be explicit +#ifdef Q_OS_MAC + QDateTime createdAt = QDateTime::fromTime_t(valueObject["created_at"].toInt(), Qt::UTC); +#elif QDateTime createdAt = QDateTime::fromSecsSinceEpoch(valueObject["created_at"].toInt(), Qt::UTC); +#endif QDateTime localCreatedAt = createdAt.toTimeZone(QTimeZone::systemTimeZone()); valueObject["text"] = QString("%1 sent %2 %3 %4 on %5 with message \"%6\""). arg(from, to, QString::number(valueObject["quantity"].toInt()), valueObject["asset_title"].toString(), localCreatedAt.toString(Qt::SystemLocaleShortDate), valueObject["message"].toString());