[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

darin darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:18:53 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit 02ca5d6e6e0b818abf513c9eb9dbdb5b89e16e6f
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jun 14 23:31:01 2002 +0000

    	* kwq/KWQDateTime.mm: Add ifdefs needed to make Deployment build compile.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1358 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 9b46775..3082a07 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,9 @@
 2002-06-14  Darin Adler  <darin at apple.com>
 
+	* kwq/KWQDateTime.mm: Add ifdefs needed to make Deployment build compile.
+
+2002-06-14  Darin Adler  <darin at apple.com>
+
 	Worked on eliminating calls to WebKit. About 3/4 done.
 
 	* WebCore.exp: Export new WebCoreBridge class, fewer other things.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 9b46775..3082a07 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,9 @@
 2002-06-14  Darin Adler  <darin at apple.com>
 
+	* kwq/KWQDateTime.mm: Add ifdefs needed to make Deployment build compile.
+
+2002-06-14  Darin Adler  <darin at apple.com>
+
 	Worked on eliminating calls to WebKit. About 3/4 done.
 
 	* WebCore.exp: Export new WebCoreBridge class, fewer other things.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 9b46775..3082a07 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,9 @@
 2002-06-14  Darin Adler  <darin at apple.com>
 
+	* kwq/KWQDateTime.mm: Add ifdefs needed to make Deployment build compile.
+
+2002-06-14  Darin Adler  <darin at apple.com>
+
 	Worked on eliminating calls to WebKit. About 3/4 done.
 
 	* WebCore.exp: Export new WebCoreBridge class, fewer other things.
diff --git a/WebCore/kwq/KWQDateTime.mm b/WebCore/kwq/KWQDateTime.mm
index 9220926..bd4d306 100644
--- a/WebCore/kwq/KWQDateTime.mm
+++ b/WebCore/kwq/KWQDateTime.mm
@@ -303,6 +303,7 @@ void QDateTime::setTime_t(uint secsSince1Jan1970UTC)
     timeDT.timeMS = 3600000*localTime->tm_hour + 60000*localTime->tm_min + 1000*localTime->tm_sec;
 }
 
+#ifdef _KWQ_IOSTREAM_
 
 std::ostream &operator<<(std::ostream &o, const QDate &date)
 {
@@ -349,3 +350,5 @@ std::ostream &operator<<(std::ostream &o, const QDateTime &dateTime)
         dateTime.timeDT.msec() <<
         ']';
 }
+
+#endif // _KWQ_IOSTREAM_

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list