From 5ff733cfb7a2533db2fa661f4aed1cd023767e96 Mon Sep 17 00:00:00 2001 From: Christian Kamm Date: Thu, 2 Jul 2015 11:40:16 +0200 Subject: [PATCH] Fix travis build. It does not like 'constexpr const' and for object declarations like this one it should indeed be redundant. --- src/libsync/utility.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libsync/utility.cpp b/src/libsync/utility.cpp index d60faabb3..b39b293ff 100644 --- a/src/libsync/utility.cpp +++ b/src/libsync/utility.cpp @@ -308,7 +308,7 @@ static QList > timeMapping = QList QString Utility::durationToDescriptiveString(quint64 msecs) { struct Period { const char *name; quint64 msec; }; - Q_DECL_CONSTEXPR const Period periods[] = { + Q_DECL_CONSTEXPR Period periods[] = { { QT_TRANSLATE_NOOP("Utility", "%Ln year(s)") , 365*24*3600*1000L }, { QT_TRANSLATE_NOOP("Utility", "%Ln month(s)") , 30*24*3600*1000L }, { QT_TRANSLATE_NOOP("Utility", "%Ln day(s)") , 24*3600*1000L },