timeAgo test: Fix for qt4, clean up

ChangeLog

@@ -1,6 +1,6 @@
 ChangeLog
 =========
-version 2.2.0 (release 2016-05-  )
+version 2.2.0 (release 2016-05-12)
  * Overlay icons: Refactoring - mainly for performance improvements
  * Improved error handling with Sync Journal on USB storages (#4632)
  * Sharing Completion: Improved UI of completion in sharing from desktop. (#3737)

VERSION.cmake

@@ -5,7 +5,7 @@ set( MIRALL_VERSION_YEAR  2016 )
 set( MIRALL_SOVERSION 0 )
 
 if ( NOT DEFINED MIRALL_VERSION_SUFFIX )
-    set( MIRALL_VERSION_SUFFIX "git") #e.g. beta1, beta2, rc1
+    set( MIRALL_VERSION_SUFFIX "") #e.g. beta1, beta2, rc1
 endif( NOT DEFINED MIRALL_VERSION_SUFFIX )
 
 if( NOT DEFINED MIRALL_VERSION_BUILD )

test/testutility.cpp

@@ -136,34 +136,27 @@ private slots:
 
     void testTimeAgo()
     {
-        // Both times in local time
+        // Both times in same timezone
         QDateTime d1 = QDateTime::fromString("2015-01-24T09:20:30+01:00", Qt::ISODate);
         QDateTime d2 = QDateTime::fromString("2015-01-23T09:20:30+01:00", Qt::ISODate);
         QString s = timeAgoInWords(d2, d1);
         QCOMPARE(s, QLatin1String("1 day(s) ago"));
 
-        //
+        // Different timezones
         QDateTime earlyTS = QDateTime::fromString("2015-01-24T09:20:30+01:00", Qt::ISODate);
-        earlyTS.setTimeSpec(Qt::UTC);
-        QDateTime laterTS = earlyTS.toOffsetFromUtc(3600);
-        laterTS.setTimeSpec(Qt::UTC);
+        QDateTime laterTS = QDateTime::fromString("2015-01-24T09:20:30-01:00", Qt::ISODate);
         s = timeAgoInWords(earlyTS, laterTS);
-        QCOMPARE(s, QLatin1String("1 hour(s) ago"));
+        QCOMPARE(s, QLatin1String("2 hour(s) ago"));
 
+        // 'Now' in whatever timezone
         earlyTS = QDateTime::currentDateTime();
-
-        laterTS.setTimeSpec(Qt::LocalTime);
-        laterTS.setTimeZone( QTimeZone("Pacific/Easter") );
         laterTS = earlyTS;
-
         s = timeAgoInWords(earlyTS, laterTS );
         QCOMPARE(s, QLatin1String("now"));
 
         earlyTS = earlyTS.addSecs(-6);
         s = timeAgoInWords(earlyTS, laterTS );
         QCOMPARE(s, QLatin1String("Less than a minute ago"));
-
-
     }
 };