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

kocienda kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 05:48:14 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit 199b371d8c9b34fa516722d964d8f59c521b868c
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 1 15:40:26 2001 +0000

    Build fixes, primarilt focused on getting KURL and QStrList to work.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@239 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/khtml/java/kjavaprocess.h b/WebCore/khtml/java/kjavaprocess.h
index fe883a1..fc113ff 100644
--- a/WebCore/khtml/java/kjavaprocess.h
+++ b/WebCore/khtml/java/kjavaprocess.h
@@ -26,6 +26,7 @@
 
 #include <kprocess.h>
 #include <qcstring.h>
+#include <qlist.h>
 
 /**
  * @short A class for invoking a Java VM
diff --git a/WebCore/kwq/KWQStrList.h b/WebCore/kwq/KWQStrList.h
index f88a879..b31f713 100644
--- a/WebCore/kwq/KWQStrList.h
+++ b/WebCore/kwq/KWQStrList.h
@@ -63,9 +63,6 @@ public:
 
 }; // class QStrList ===========================================================
 
-#else // USING_BORROWED_QSTRINGLIST
-// This will help to keep the linker from complaining about empty archives
-void KWQStrList_Dummy() {}
-#endif
+#endif // USING_BORROWED_QSTRINGLIST
 
 #endif
diff --git a/WebCore/kwq/qt/_qstringlist.h b/WebCore/kwq/qt/_qstringlist.h
index 0b54fac..33f86fc 100644
--- a/WebCore/kwq/qt/_qstringlist.h
+++ b/WebCore/kwq/qt/_qstringlist.h
@@ -52,12 +52,11 @@
 #include "qvaluelist.h"
 #include "qstring.h"
 #include "qregexp.h"
+#include "_qstrlist.h"
 #endif // QT_H
 
 #ifndef QT_NO_STRINGLIST
 
-class QStrList;
-
 class Q_EXPORT QStringList : public QValueList<QString>
 {
 public:
diff --git a/WebCore/src/kdelibs/khtml/java/kjavaprocess.h b/WebCore/src/kdelibs/khtml/java/kjavaprocess.h
index fe883a1..fc113ff 100644
--- a/WebCore/src/kdelibs/khtml/java/kjavaprocess.h
+++ b/WebCore/src/kdelibs/khtml/java/kjavaprocess.h
@@ -26,6 +26,7 @@
 
 #include <kprocess.h>
 #include <qcstring.h>
+#include <qlist.h>
 
 /**
  * @short A class for invoking a Java VM
diff --git a/WebCore/src/kwq/KWQStrList.h b/WebCore/src/kwq/KWQStrList.h
index f88a879..b31f713 100644
--- a/WebCore/src/kwq/KWQStrList.h
+++ b/WebCore/src/kwq/KWQStrList.h
@@ -63,9 +63,6 @@ public:
 
 }; // class QStrList ===========================================================
 
-#else // USING_BORROWED_QSTRINGLIST
-// This will help to keep the linker from complaining about empty archives
-void KWQStrList_Dummy() {}
-#endif
+#endif // USING_BORROWED_QSTRINGLIST
 
 #endif
diff --git a/WebCore/src/kwq/qt/_qstringlist.h b/WebCore/src/kwq/qt/_qstringlist.h
index 0b54fac..33f86fc 100644
--- a/WebCore/src/kwq/qt/_qstringlist.h
+++ b/WebCore/src/kwq/qt/_qstringlist.h
@@ -52,12 +52,11 @@
 #include "qvaluelist.h"
 #include "qstring.h"
 #include "qregexp.h"
+#include "_qstrlist.h"
 #endif // QT_H
 
 #ifndef QT_NO_STRINGLIST
 
-class QStrList;
-
 class Q_EXPORT QStringList : public QValueList<QString>
 {
 public:

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list