From e62a99d588eaf2b7443250f36c42762a0631c02a Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@nokia.com>
Date: Fri, 5 Mar 2010 19:03:51 +0100
Subject: Bugfix the Symbian implementation

---
 mkspecs/common/symbian/symbian.conf         |  4 ++--
 src/corelib/tools/qdatetime.cpp             |  4 ++--
 src/corelib/tools/qelapsedtimer_symbian.cpp | 20 +++++++++++++++++++-
 src/corelib/tools/tools.pri                 |  2 +-
 4 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf
index 16b9a28..239b998 100644
--- a/mkspecs/common/symbian/symbian.conf
+++ b/mkspecs/common/symbian/symbian.conf
@@ -74,8 +74,8 @@ QMAKE_LINK_OBJECT_MAX   =
 QMAKE_LINK_OBJECT_SCRIPT=
 
 QMAKE_LIBS		= -llibc -llibm -leuser -llibdl
-QMAKE_LIBS_CORE         = $$QMAKE_LIBS -llibpthread -lefsrv
-QMAKE_LIBS_GUI          = $$QMAKE_LIBS_CORE -lfbscli -lbitgdi -lhal -lgdi -lws32 -lapgrfx -lcone -leikcore -lmediaclientaudio -leikcoctl -leiksrv -lapparc -lcentralrepository
+QMAKE_LIBS_CORE         = $$QMAKE_LIBS -llibpthread -lefsrv -lhal
+QMAKE_LIBS_GUI          = $$QMAKE_LIBS_CORE -lfbscli -lbitgdi -lgdi -lws32 -lapgrfx -lcone -leikcore -lmediaclientaudio -leikcoctl -leiksrv -lapparc -lcentralrepository
 QMAKE_LIBS_NETWORK      = 
 QMAKE_LIBS_EGL          = -llibEGL
 QMAKE_LIBS_OPENGL       = 
diff --git a/src/corelib/tools/qdatetime.cpp b/src/corelib/tools/qdatetime.cpp
index 7e03777..54a4205 100644
--- a/src/corelib/tools/qdatetime.cpp
+++ b/src/corelib/tools/qdatetime.cpp
@@ -2953,8 +2953,8 @@ qint64 QDateTime::currentMsecsSinceEpoch()
     qint64 value = gmTime.Int64();
 
     // whereas 1970-01-01T00:00:00 is (in the same representation):
-    static const qint64 unixEpoch = qint64(1970 * 365 + 1970 / 4 - 1970 / 100 + 1970 / 400) * Q_INT64_C(86400)
-                                    * Q_INT64_C(1000000);
+    //   ((1970 * 365) + (1970 / 4) - (1970 / 100) + (1970 / 400) - 13) * 86400 * 1000000
+    static const qint64 unixEpoch = Q_INT64_C(0xdcddb30f2f8000);
 
     return (value - unixEpoch) / 1000;
 }
diff --git a/src/corelib/tools/qelapsedtimer_symbian.cpp b/src/corelib/tools/qelapsedtimer_symbian.cpp
index 6360dbf..038b102 100644
--- a/src/corelib/tools/qelapsedtimer_symbian.cpp
+++ b/src/corelib/tools/qelapsedtimer_symbian.cpp
@@ -40,12 +40,15 @@
 ****************************************************************************/
 
 #include "qelapsedtimer.h"
+#include "qpair.h"
 #include <e32std.h>
+#include <sys/time.h>
+#include <hal.h>
 
 QT_BEGIN_NAMESPACE
 
 // return quint64 to avoid sign-extension
-static quint64 getMillisecondFromTick()
+static quint64 getMicrosecondFromTick()
 {
     static TInt nanokernel_tick_period;
     if (!nanokernel_tick_period)
@@ -61,6 +64,21 @@ static quint64 getMillisecondFromTick()
     return nanokernel_tick_period * (val | (quint64(highdword) << 32));
 }
 
+static quint64 getMillisecondFromTick()
+{
+    return getMicrosecondFromTick() / 1000;
+}
+
+timeval qt_gettime()
+{
+    timeval tv;
+    quint64 now = getMicrosecondFromTick();
+    tv.tv_sec = now / 1000000;
+    tv.tv_usec = now % 1000000;
+
+    return tv;
+}
+
 QElapsedTimer::ClockType QElapsedTimer::clockType()
 {
     return TickCounter;
diff --git a/src/corelib/tools/tools.pri b/src/corelib/tools/tools.pri
index 73dae7a..4e0ebbc 100644
--- a/src/corelib/tools/tools.pri
+++ b/src/corelib/tools/tools.pri
@@ -84,7 +84,7 @@ SOURCES += \
 symbian:SOURCES+=tools/qlocale_symbian.cpp
 
 mac:SOURCES += tools/qelapsedtimer_mac.cpp
-else:symbian:SOURCES += tools/qelapsedtimer_generic.cpp
+else:symbian:SOURCES += tools/qelapsedtimer_symbian.cpp
 else:unix:SOURCES += tools/qelapsedtimer_unix.cpp
 else:win32:SOURCES += tools/qelapsedtimer_win.cpp
 else:SOURCES += tools/qelapsedtimer_generic.cpp
-- 
cgit v0.12