[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/4.2/kdepim/kresources/kolab/shared
From:       Allen Winter <winter () kde ! org>
Date:       2009-04-30 21:19:55
Message-ID: 1241126395.713320.8815.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 961889 by winterz:

merge from e4 SVN commit 961853 by winterz: 

deal with dates that end with a "ZZ" by removing the last "Z" only and leaving
1 trailing "Z".  One trailing "Z" is required of ISO UTC dates.

Dirk, can you make sure this goes into the 4.2.3 tag please?

BUG: 190909
CCMAIL: mueller@kde.org


 M  +4 -1      kolabbase.cpp  


--- branches/KDE/4.2/kdepim/kresources/kolab/shared/kolabbase.cpp #961888:961889
@@ -422,7 +422,10 @@
 
 KDateTime KolabBase::stringToDateTime( const QString& _date )
 {
-  const QString date( _date );
+  QString date( _date );
+  //In Qt4, Qt::ISODate must see a trailing Z for UTC, so keep one trailing Z.
+  if ( date.endsWith( "ZZ" ) )
+    date.chop( 1 );
   return KDateTime::fromString( date, KDateTime::ISODate );
 }
 
[prev in list] [next in list] [prev in thread] [next in thread]