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

[gramps]

The following commit has been merged in the debian/unstable branch:
commit 7becc63d1d673b555d3c41bbb886e723ca630361
Author: gramps <gramps at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 19 01:40:05 2001 +0000

    Disable when using borrowed qstring
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@369 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/kwq/KWQTextCodec.h b/WebCore/kwq/KWQTextCodec.h
index b5467f6..e01edac 100644
--- a/WebCore/kwq/KWQTextCodec.h
+++ b/WebCore/kwq/KWQTextCodec.h
@@ -30,6 +30,14 @@
 #include <config.h>
 #endif
 
+// USING_BORROWED_QSTRING ======================================================
+#ifdef USING_BORROWED_QSTRING
+
+#undef QT_NO_TEXTCODEC
+#include <_qtextcodec.h>
+
+#else
+
 #include "qstring.h"
 #include "qcstring.h"
 
@@ -99,4 +107,6 @@ private:
 
 }; // class QTextCodec =========================================================
 
+#endif // USING_BORROWED_QSTRING
+
 #endif
diff --git a/WebCore/kwq/KWQTextCodec.mm b/WebCore/kwq/KWQTextCodec.mm
index 2a55e8f..b159dac 100644
--- a/WebCore/kwq/KWQTextCodec.mm
+++ b/WebCore/kwq/KWQTextCodec.mm
@@ -28,6 +28,9 @@
 #include <qtextcodec.h>
 #include <kwqdebug.h>
 
+// USING_BORROWED_QSTRING ======================================================
+#ifndef USING_BORROWED_QSTRING
+
 // FIXME: do we need this once we have a real implementation?
 static QTextCodec latin1TextCodec(kCFStringEncodingISOLatin1);
 
@@ -132,3 +135,8 @@ QString QTextCodec::toUnicode(const char *chs) const
 {
     return QString::fromStringWithEncoding(chs, -1, encoding);
 }
+
+#else // USING_BORROWED_QSTRING
+// This will help to keep the linker from complaining about empty archives
+void KWQtextcodec_Dummy() {}
+#endif // USING_BORROWED_QSTRING
diff --git a/WebCore/kwq/qt/qtextcodec.h b/WebCore/kwq/qt/qtextcodec.h
index b5467f6..e01edac 100644
--- a/WebCore/kwq/qt/qtextcodec.h
+++ b/WebCore/kwq/qt/qtextcodec.h
@@ -30,6 +30,14 @@
 #include <config.h>
 #endif
 
+// USING_BORROWED_QSTRING ======================================================
+#ifdef USING_BORROWED_QSTRING
+
+#undef QT_NO_TEXTCODEC
+#include <_qtextcodec.h>
+
+#else
+
 #include "qstring.h"
 #include "qcstring.h"
 
@@ -99,4 +107,6 @@ private:
 
 }; // class QTextCodec =========================================================
 
+#endif // USING_BORROWED_QSTRING
+
 #endif
diff --git a/WebCore/src/kwq/KWQtextcodec.mm b/WebCore/src/kwq/KWQtextcodec.mm
index 2a55e8f..b159dac 100644
--- a/WebCore/src/kwq/KWQtextcodec.mm
+++ b/WebCore/src/kwq/KWQtextcodec.mm
@@ -28,6 +28,9 @@
 #include <qtextcodec.h>
 #include <kwqdebug.h>
 
+// USING_BORROWED_QSTRING ======================================================
+#ifndef USING_BORROWED_QSTRING
+
 // FIXME: do we need this once we have a real implementation?
 static QTextCodec latin1TextCodec(kCFStringEncodingISOLatin1);
 
@@ -132,3 +135,8 @@ QString QTextCodec::toUnicode(const char *chs) const
 {
     return QString::fromStringWithEncoding(chs, -1, encoding);
 }
+
+#else // USING_BORROWED_QSTRING
+// This will help to keep the linker from complaining about empty archives
+void KWQtextcodec_Dummy() {}
+#endif // USING_BORROWED_QSTRING
diff --git a/WebCore/src/kwq/qt/qtextcodec.h b/WebCore/src/kwq/qt/qtextcodec.h
index b5467f6..e01edac 100644
--- a/WebCore/src/kwq/qt/qtextcodec.h
+++ b/WebCore/src/kwq/qt/qtextcodec.h
@@ -30,6 +30,14 @@
 #include <config.h>
 #endif
 
+// USING_BORROWED_QSTRING ======================================================
+#ifdef USING_BORROWED_QSTRING
+
+#undef QT_NO_TEXTCODEC
+#include <_qtextcodec.h>
+
+#else
+
 #include "qstring.h"
 #include "qcstring.h"
 
@@ -99,4 +107,6 @@ private:
 
 }; // class QTextCodec =========================================================
 
+#endif // USING_BORROWED_QSTRING
+
 #endif

-- 
WebKit Debian packaging