[Pkg-owncloud-commits] [owncloud-client] 231/498: Fix travis build.

Sandro Knauß hefee-guest at moszumanska.debian.org
Tue Aug 11 14:48:53 UTC 2015


This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 5ff733cfb7a2533db2fa661f4aed1cd023767e96
Author: Christian Kamm <kamm at incasoftware.de>
Date:   Thu Jul 2 11:40:16 2015 +0200

    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 d60faab..b39b293 100644
--- a/src/libsync/utility.cpp
+++ b/src/libsync/utility.cpp
@@ -308,7 +308,7 @@ static QList<QPair<QString,quint32> > timeMapping = QList<QPair<QString,quint32>
 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 },

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git



More information about the Pkg-owncloud-commits mailing list