diff --git a/src/Base/PreCompiled.h b/src/Base/PreCompiled.h
index 018dbd6a4..5043da9a5 100644
--- a/src/Base/PreCompiled.h
+++ b/src/Base/PreCompiled.h
@@ -110,6 +110,7 @@
 #include <QEvent>
 #include <QIODevice>
 #include <QDataStream>
+#include <QDateTime>
 #include <QWriteLocker>
 #include <QReadLocker>
 #include <QReadWriteLock>
diff --git a/src/Base/TimeInfo.cpp b/src/Base/TimeInfo.cpp
index a35259da1..908272893 100644
--- a/src/Base/TimeInfo.cpp
+++ b/src/Base/TimeInfo.cpp
@@ -25,6 +25,7 @@
 
 #ifndef _PreComp_
 # include <sstream>
+# include <QDateTime>
 #endif
 
 #include "TimeInfo.h"
@@ -70,14 +71,13 @@ void TimeInfo::setTime_t (uint64_t seconds)
 
 std::string TimeInfo::currentDateTimeString()
 {
-    char timebuff[30]= {0};
-    struct tm* systime;
-    time_t sec;
-
-    time(&sec);
-    systime = localtime(&sec);
-    strftime(timebuff,30,"%Y-%m-%dT%H:%M:%S%z",systime);
-    return std::string(timebuff);
+    QDateTime local = QDateTime::currentDateTime();
+    QDateTime utc = local.toUTC();
+    utc.setTimeSpec(Qt::LocalTime);
+    int utcOffset = utc.secsTo(local);
+    local.setUtcOffset(utcOffset);
+    QString dm = local.toString(Qt::ISODate);
+    return dm.toStdString();
 }
 
 std::string TimeInfo::diffTime(const TimeInfo &timeStart,const TimeInfo &timeEnd )
@@ -89,10 +89,10 @@ std::string TimeInfo::diffTime(const TimeInfo &timeStart,const TimeInfo &timeEnd
 
 float TimeInfo::diffTimeF(const TimeInfo &timeStart,const TimeInfo &timeEnd )
 {
-	int64_t ds = int64_t(timeEnd.getSeconds() - timeStart.getSeconds());
-	int dms = int(timeEnd.getMiliseconds()) - int(timeStart.getMiliseconds());
+    int64_t ds = int64_t(timeEnd.getSeconds() - timeStart.getSeconds());
+    int dms = int(timeEnd.getMiliseconds()) - int(timeStart.getMiliseconds());
 
-	return float(ds) + float(dms) * 0.001;
+    return float(ds) + float(dms) * 0.001;
 }
 
 TimeInfo TimeInfo::null()