Skip to content

Commit e15a0b9

Browse files
fix compilation errors.
1 parent 70a29cf commit e15a0b9

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

src/test/mailmessage/main.cpp

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,13 @@ void TestMailMessage::dateTime_data()
154154
QTest::addColumn<QString>("result");
155155

156156
// Timezone
157+
#if QT_VERSION >= 0x060700
157158
uint utc = QDateTime(QDate(2000,1,1), QTime(0,0,0), QTimeZone::UTC).toSecsSinceEpoch();
158159
uint local = QDateTime(QDate(2000,1,1), QTime(0,0,0), QTimeZone::LocalTime).toSecsSinceEpoch();
160+
#else
161+
uint utc = QDateTime(QDate(2000,1,1), QTime(0,0,0), Qt::UTC).toSecsSinceEpoch();
162+
uint local = QDateTime(QDate(2000,1,1), QTime(0,0,0), Qt::LocalTime).toSecsSinceEpoch();
163+
#endif
159164
int offset = (utc - local) / 60;
160165
QString offsetStr = QString("%1%2%3")
161166
.arg(offset > 0 ? '+' : '-')
@@ -169,8 +174,8 @@ void TestMailMessage::dateTime_data()
169174
QTest::newRow("1") << QDateTime(QDate(2011,3,28), QTime(12,11,04), Qt::LocalTime) << "Mon, 28 Mar 2011 12:11:04 " + offsetStr;
170175
QTest::newRow("2") << QDateTime(QDate(2014,3,31), QTime( 1, 0, 0), Qt::LocalTime) << "Mon, 31 Mar 2014 01:00:00 " + offsetStr;
171176
#endif
172-
QTest::newRow("3") << QDateTime(QDate(2011,3,28), QTime(12,11,04), QTimeZone::UTC) << "Mon, 28 Mar 2011 12:11:04 +0000";
173-
QTest::newRow("4") << QDateTime(QDate(2014,3,31), QTime( 1, 0, 0), QTimeZone::UTC) << "Mon, 31 Mar 2014 01:00:00 +0000";
177+
QTest::newRow("3") << QDateTime(QDate(2011,3,28), QTime(12,11,04), QTimeZone::UTC) << "Mon, 28 Mar 2011 12:11:04 +0000";
178+
QTest::newRow("4") << QDateTime(QDate(2014,3,31), QTime( 1, 0, 0), QTimeZone::UTC) << "Mon, 31 Mar 2014 01:00:00 +0000";
174179
}
175180

176181
void TestMailMessage::dateTime()

0 commit comments

Comments
 (0)