Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Revert "Daylight savings time for Symbian take 2"
  Further bug fixes for enable/disables DEF files mechanism on Symbian

7 files changed, 63 insertions, 70 deletions

diff --git a/configure.exe b/configure.exe
index 21fdcfa..8913de1 100644
--- a/configure.exe
+++ b/configure.exe
diff --git a/mkspecs/features/symbian/def_files.prf b/mkspecs/features/symbian/def_files.prf
index c29d4ec..48d91aa 100644
--- a/mkspecs/features/symbian/def_files.prf
+++ b/mkspecs/features/symbian/def_files.prf
@@ -3,24 +3,32 @@
 
 CONFIG -= def_files_disabled
 
-!isEmpty(defFilePath) {
-    defBlock = \
-    "$${LITERAL_HASH}ifdef WINSCW" \
-    "DEFFILE $$defFilePath/bwins/$${TARGET}.def" \
-    "$${LITERAL_HASH}elif defined EABI" \
-    "DEFFILE $$defFilePath/eabi/$${TARGET}.def" \
-    "$${LITERAL_HASH}endif"
-
-    MMP_RULES += defBlock
-} else {
-    # If defFilePath is not defined, then put the folders containing the DEF files at the
-    # same level as the .pro (and generated MMP) file(s)
-    defBlock = \
-    "$${LITERAL_HASH}ifdef WINSCW" \
-    "DEFFILE ./bwins/$${TARGET}.def" \
-    "$${LITERAL_HASH}elif defined EABI" \
-    "DEFFILE ./eabi/$${TARGET}.def" \
-    "$${LITERAL_HASH}endif"
-
-    MMP_RULES += defBlock
+# Firstly, if the MMP_RULES already contain a defBlock variable, don't generate another one
+# (this bit is slightly magic, because it depends upon everyone creating their DEFFILE statements
+# in a defBlock variable; but otherwise we have to expand MMP_RULES then scan for the DEFFILE keyword)
+!contains(MMP_RULES, defBlock) {
+    # Apps are executables on Symbian, so don't have exports, and therefore don't have DEF files
+    # Plugins use standard DEF files, which qmake generates, so shouldn't be using these DEFFILE
+    # statements - they use the qmake generated statements instead
+    # Static libraries obviously don't have DEF files, as they don't take part in dynamic linkage
+    !contains(TEMPLATE, app):!contains(CONFIG, plugin):!contains(CONFIG, staticlib): {
+        !isEmpty(defFilePath) {
+            defBlock = \
+            "$${LITERAL_HASH}ifdef WINSCW" \
+            "DEFFILE $$defFilePath/bwins/$${TARGET}.def" \
+            "$${LITERAL_HASH}elif defined EABI" \
+            "DEFFILE $$defFilePath/eabi/$${TARGET}.def" \
+            "$${LITERAL_HASH}endif"
+        } else {
+            # If defFilePath is not defined, then put the folders containing the DEF files at the
+            # same level as the .pro (and generated MMP) file(s)
+            defBlock = \
+            "$${LITERAL_HASH}ifdef WINSCW" \
+            "DEFFILE ./bwins/$${TARGET}.def" \
+            "$${LITERAL_HASH}elif defined EABI" \
+            "DEFFILE ./eabi/$${TARGET}.def" \
+            "$${LITERAL_HASH}endif"
+        }
+        MMP_RULES += defBlock
+    }
 }
diff --git a/mkspecs/features/symbian/def_files_disabled.prf b/mkspecs/features/symbian/def_files_disabled.prf
index d5c9505..557c5e3 100644
--- a/mkspecs/features/symbian/def_files_disabled.prf
+++ b/mkspecs/features/symbian/def_files_disabled.prf
@@ -2,6 +2,12 @@
 
 CONFIG -= def_files
 
-# with EXPORTUNFROZEN enabled, new exports are included in the dll without
-# needing to run abld/sbs freeze
-MMP_RULES += EXPORTUNFROZEN
+# See def_files.prf for reasoning on the slight nastiness of this
+!contains(MMP_RULES, defBlock) {
+    # See def_files.prf for reasoning for excluding target types and configs below
+    !contains(TEMPLATE, app):!contains(CONFIG, plugin):!contains(CONFIG, staticlib): {
+        # with EXPORTUNFROZEN enabled, new exports are included in the dll and dso/lib without
+        # needing to run abld/sbs freeze
+        MMP_RULES += EXPORTUNFROZEN
+    }
+}
diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro
index 7f33791..9a15bf1 100644
--- a/src/corelib/corelib.pro
+++ b/src/corelib/corelib.pro
@@ -35,6 +35,4 @@ symbian: {
     # Workaroud for problems with paging this dll
     MMP_RULES -= PAGED
     MMP_RULES *= UNPAGED
-    # Timezone server
-    LIBS += -ltzclient
 }
diff --git a/src/corelib/tools/qdatetime.cpp b/src/corelib/tools/qdatetime.cpp
index 9a361c0..c1027ed 100644
--- a/src/corelib/tools/qdatetime.cpp
+++ b/src/corelib/tools/qdatetime.cpp
@@ -75,7 +75,6 @@
 
 #if defined(Q_OS_SYMBIAN)
 #include <e32std.h>
-#include <tz.h>
 #endif
 
 QT_BEGIN_NAMESPACE
@@ -3722,32 +3721,23 @@ static QDateTimePrivate::Spec utcToLocal(QDate &date, QTime &time)
 #elif defined(Q_OS_SYMBIAN)
     // months and days are zero index based
     _LIT(KUnixEpoch, "19700000:000000.000000");
+    TTimeIntervalSeconds utcOffset = User::UTCOffset();
     TTimeIntervalSeconds tTimeIntervalSecsSince1Jan1970UTC(secsSince1Jan1970UTC);
     TTime epochTTime;
     TInt err = epochTTime.Set(KUnixEpoch);
     tm res;
     if(err == KErrNone) {
         TTime utcTTime = epochTTime + tTimeIntervalSecsSince1Jan1970UTC;
-        TRAP(err,
-            RTz tz;
-            User::LeaveIfError(tz.Connect());
-            CleanupClosePushL(tz);
-            res.tm_isdst = tz.IsDaylightSavingOnL(*tz.GetTimeZoneIdL(),utcTTime);
-            User::LeaveIfError(tz.ConvertToLocalTime(utcTTime));
-            CleanupStack::PopAndDestroy(&tz));
-        if (KErrNone == err) {
-            TDateTime localDateTime = utcTTime.DateTime();
-            res.tm_sec = localDateTime.Second();
-            res.tm_min = localDateTime.Minute();
-            res.tm_hour = localDateTime.Hour();
-            res.tm_mday = localDateTime.Day() + 1; // non-zero based index for tm struct
-            res.tm_mon = localDateTime.Month();
-            res.tm_year = localDateTime.Year() - 1900;
-            // Symbian's timezone server doesn't know how to handle DST before year 1997
-            if (res.tm_year < 97)
-                res.tm_isdst = -1;
-            brokenDown = &res;
-        }
+        utcTTime = utcTTime + utcOffset;
+        TDateTime utcDateTime = utcTTime.DateTime();
+        res.tm_sec = utcDateTime.Second();
+        res.tm_min = utcDateTime.Minute();
+        res.tm_hour = utcDateTime.Hour();
+        res.tm_mday = utcDateTime.Day() + 1; // non-zero based index for tm struct
+        res.tm_mon = utcDateTime.Month();
+        res.tm_year = utcDateTime.Year() - 1900;
+        res.tm_isdst = 0;
+        brokenDown = &res;
     }
 #elif !defined(QT_NO_THREAD) && defined(_POSIX_THREAD_SAFE_FUNCTIONS)
     // use the reentrant version of localtime() where available
@@ -3822,27 +3812,23 @@ static void localToUtc(QDate &date, QTime &time, int isdst)
 #elif defined(Q_OS_SYMBIAN)
     // months and days are zero index based
     _LIT(KUnixEpoch, "19700000:000000.000000");
+    TTimeIntervalSeconds utcOffset = TTimeIntervalSeconds(0 - User::UTCOffset().Int());
     TTimeIntervalSeconds tTimeIntervalSecsSince1Jan1970UTC(secsSince1Jan1970UTC);
     TTime epochTTime;
     TInt err = epochTTime.Set(KUnixEpoch);
     tm res;
     if(err == KErrNone) {
-        TTime localTTime = epochTTime + tTimeIntervalSecsSince1Jan1970UTC;
-        RTz tz;
-        if (KErrNone == tz.Connect()) {
-            if (KErrNone == tz.ConvertToUniversalTime(localTTime)) {
-                TDateTime utcDateTime = localTTime.DateTime();
-                res.tm_sec = utcDateTime.Second();
-                res.tm_min = utcDateTime.Minute();
-                res.tm_hour = utcDateTime.Hour();
-                res.tm_mday = utcDateTime.Day() + 1; // non-zero based index for tm struct
-                res.tm_mon = utcDateTime.Month();
-                res.tm_year = utcDateTime.Year() - 1900;
-                res.tm_isdst = (int)isdst;
-                brokenDown = &res;
-            }
-        tz.Close();
-        }
+        TTime utcTTime = epochTTime + tTimeIntervalSecsSince1Jan1970UTC;
+        utcTTime = utcTTime + utcOffset;
+        TDateTime utcDateTime = utcTTime.DateTime();
+        res.tm_sec = utcDateTime.Second();
+        res.tm_min = utcDateTime.Minute();
+        res.tm_hour = utcDateTime.Hour();
+        res.tm_mday = utcDateTime.Day() + 1; // non-zero based index for tm struct
+        res.tm_mon = utcDateTime.Month();
+        res.tm_year = utcDateTime.Year() - 1900;
+        res.tm_isdst = (int)isdst;
+        brokenDown = &res;
     }
 #elif !defined(QT_NO_THREAD) && defined(_POSIX_THREAD_SAFE_FUNCTIONS)
     // use the reentrant version of gmtime() where available
diff --git a/tests/auto/qdatetime/tst_qdatetime.cpp b/tests/auto/qdatetime/tst_qdatetime.cpp
index b9d1d7c..86a4c80 100644
--- a/tests/auto/qdatetime/tst_qdatetime.cpp
+++ b/tests/auto/qdatetime/tst_qdatetime.cpp
@@ -147,16 +147,9 @@ Q_DECLARE_METATYPE(QTime)
 
 tst_QDateTime::tst_QDateTime()
 {
-#ifdef Q_OS_SYMBIAN
-    // Symbian's timezone server cannot handle DST correctly for dates before year 1997
-    uint x1 = QDateTime(QDate(2000, 1, 1), QTime()).toTime_t();
-    uint x2 = QDateTime(QDate(2000, 6, 1), QTime()).toTime_t();
-    europeanTimeZone = (x1 == 946681200 && x2 == 959810400);
-#else
     uint x1 = QDateTime(QDate(1990, 1, 1), QTime()).toTime_t();
     uint x2 = QDateTime(QDate(1990, 6, 1), QTime()).toTime_t();
     europeanTimeZone = (x1 == 631148400 && x2 == 644191200);
-#endif
 }
 
 tst_QDateTime::~tst_QDateTime()
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 8d1b640..83b4d9c 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -482,7 +482,9 @@ void Configure::parseCmdLine()
             dictionary[ "BUILDNOKIA" ] = "yes";
             dictionary[ "BUILDDEV" ] = "yes";
             dictionary["LICENSE_CONFIRMED"] = "yes";
-            dictionary[ "SYMBIAN_DEFFILES" ] = "no";
+            if (dictionary.contains("XQMAKESPEC") && dictionary["XQMAKESPEC"].startsWith("symbian")) {
+                dictionary[ "SYMBIAN_DEFFILES" ] = "no";
+            }
         }
         else if( configCmdLine.at(i) == "-opensource" ) {
             dictionary[ "BUILDTYPE" ] = "opensource";