From kde-commits  Thu Apr 30 21:24:15 2009
From: Allen Winter <winter () kde ! org>
Date: Thu, 30 Apr 2009 21:24:15 +0000
To: kde-commits
Subject: KDE/kdepim/kresources/kolab/shared
Message-Id: <1241126655.043322.9597.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=124112937929340

SVN commit 961893 by winterz:

forwardport 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.


 M  +4 -1      kolabbase.cpp  


--- trunk/KDE/kdepim/kresources/kolab/shared/kolabbase.cpp #961892:961893
@@ -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 );
 }