[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

eric at webkit.org eric at webkit.org
Thu Apr 8 02:09:58 UTC 2010


The following commit has been merged in the webkit-1.2 branch:
commit b77090a61709e341bc6a8e4c4dad8b752d584101
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Mar 4 19:12:12 2010 +0000

    2010-03-04  Simon Hausmann  <simon.hausmann at nokia.com>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [Qt] qwebelement.h does not include QtCore headers correctly
            https://bugs.webkit.org/show_bug.cgi?id=35748
    
            The header files of QtCore must be included as QtCore/foo.h.
    
            See also http://bugreports.qt.nokia.com/browse/QTBUG-8661
    
            * Api/qwebelement.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55539 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/qwebelement.h b/WebKit/qt/Api/qwebelement.h
index 156d24b..a87d388 100644
--- a/WebKit/qt/Api/qwebelement.h
+++ b/WebKit/qt/Api/qwebelement.h
@@ -20,11 +20,11 @@
 #ifndef QWEBELEMENT_H
 #define QWEBELEMENT_H
 
-#include <QString>
-#include <QStringList>
-#include <QRect>
-#include <QVariant>
-#include <QExplicitlySharedDataPointer>
+#include <QtCore/qstring.h>
+#include <QtCore/qstringlist.h>
+#include <QtCore/qrect.h>
+#include <QtCore/qvariant.h>
+#include <QtCore/qshareddata.h>
 
 #include "qwebkitglobal.h"
 namespace WebCore {
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index ac70270..09ec12f 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,16 @@
+2010-03-04  Simon Hausmann  <simon.hausmann at nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] qwebelement.h does not include QtCore headers correctly
+        https://bugs.webkit.org/show_bug.cgi?id=35748
+
+        The header files of QtCore must be included as QtCore/foo.h.
+
+        See also http://bugreports.qt.nokia.com/browse/QTBUG-8661
+
+        * Api/qwebelement.h:
+
 2010-03-04  Jocelyn Turcotte  <jocelyn.turcotte at nokia.com>
 
         Reviewed by Tor Arne Vestbø.

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list