[Qt] Debug build fails with debug qt5

https://bugs.webkit.org/show_bug.cgi?id=76463

Reviewed by Simon Hausmann.

Add QNetworkCookie include in order to satisfy sizeof in QTypeInfo in debug builds.

Source/WebKit/qt:

* WebCoreSupport/FrameNetworkingContextQt.cpp:

Tools:

* QtTestBrowser/cookiejar.h:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@105206 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit/qt/ChangeLog b/Source/WebKit/qt/ChangeLog
index 6335694..8a50f65 100644 (file)
--- a/Source/WebKit/qt/ChangeLog
+++ b/Source/WebKit/qt/ChangeLog
@@ -1,3 +1,14 @@
+2012-01-17  Viatcheslav Ostapenko  <ostapenko.viatcheslav@nokia.com>
+
+        [Qt] Debug build fails with debug qt5
+        https://bugs.webkit.org/show_bug.cgi?id=76463
+
+        Reviewed by Simon Hausmann.
+
+        Add QNetworkCookie include in order to satisfy sizeof in QTypeInfo in debug builds.
+
+        * WebCoreSupport/FrameNetworkingContextQt.cpp:
+
 2012-01-13  Marcelo Lira  <marcelo.lira@openbossa.org>
 
         [Qt] Fix missing signal in qwebframe API test for Qt5

diff --git a/Source/WebKit/qt/WebCoreSupport/FrameNetworkingContextQt.cpp b/Source/WebKit/qt/WebCoreSupport/FrameNetworkingContextQt.cpp
index 02b64a4..7e99624 100644 (file)
--- a/Source/WebKit/qt/WebCoreSupport/FrameNetworkingContextQt.cpp
+++ b/Source/WebKit/qt/WebCoreSupport/FrameNetworkingContextQt.cpp
@@ -25,6 +25,7 @@
 #include "qwebframe_p.h"
 #include "qwebpage.h"
 #include <QNetworkAccessManager>
+#include <QNetworkCookie>
 #include <QNetworkCookieJar>
 
 namespace WebCore {

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index e7fee55..11cd4d5 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,14 @@
+2012-01-17  Viatcheslav Ostapenko  <ostapenko.viatcheslav@nokia.com>
+
+        [Qt] Debug build fails with debug qt5
+        https://bugs.webkit.org/show_bug.cgi?id=76463
+
+        Reviewed by Simon Hausmann.
+
+        Add QNetworkCookie include in order to satisfy sizeof in QTypeInfo in debug builds.
+
+        * QtTestBrowser/cookiejar.h:
+
 2012-01-17  Dirk Pranke  <dpranke@chromium.org>
 
         webkitpy: fix json import on linux

diff --git a/Tools/QtTestBrowser/cookiejar.h b/Tools/QtTestBrowser/cookiejar.h
index ad6bd3c..6e5e73b 100644 (file)
--- a/Tools/QtTestBrowser/cookiejar.h
+++ b/Tools/QtTestBrowser/cookiejar.h
@@ -29,6 +29,7 @@
 #define cookiejar_h
 
 #include <QFile>
+#include <QNetworkCookie>
 #include <QNetworkCookieJar>
 #include <QTimer>