phantomjs.patch

commit 30b34746b1c90c6085a0fc553adc9f4acb192345
Author: Kenta Murata <mrkn@cookpad.com>
Date:   Fri Jul 18 16:35:59 2014 +0200

    Prevent to break cookie domain

diff --git a/src/cookiejar.cpp b/src/cookiejar.cpp
index a953d4b..eb9e3ba 100644
--- a/src/cookiejar.cpp
+++ b/src/cookiejar.cpp
@@ -488,7 +488,7 @@ bool CookieJar::contains(const QNetworkCookie &cookie) const
     for (int i = cookiesList.length() -1; i >= 0; --i) {
         if (cookie.name() == cookiesList.at(i).name() &&
             cookie.value() == cookiesList.at(i).value() &&
-            (cookie.domain().isEmpty() || cookiesList.at(i).domain().prepend('.').endsWith(cookie.domain())) &&
+            (cookie.domain().isEmpty() || ('.' + cookiesList.at(i).domain()).endsWith(cookie.domain())) &&
             (cookie.path().isEmpty() || cookiesList.at(i).path() == cookie.path()) &&
             cookie.isSecure() == cookiesList.at(i).isSecure() &&
             cookie.isHttpOnly() == cookiesList.at(i).isHttpOnly() &&
diff --git a/src/qt/src/gui/kernel/qt_cocoa_helpers_mac_p.h b/src/qt/src/gui/kernel/qt_cocoa_helpers_mac_p.h
index c068234..90d2ca0 100644
--- a/src/qt/src/gui/kernel/qt_cocoa_helpers_mac_p.h
+++ b/src/qt/src/gui/kernel/qt_cocoa_helpers_mac_p.h
@@ -110,6 +110,7 @@
 #include "private/qt_mac_p.h"
 
 struct HIContentBorderMetrics;
+struct TabletProximityRec;
 
 #ifdef Q_WS_MAC32
 typedef struct _NSPoint NSPoint; // Just redefine here so I don't have to pull in all of Cocoa.
@@ -155,7 +156,6 @@ bool qt_dispatchKeyEvent(void * /*NSEvent * */ keyEvent, QWidget *widgetToGetEve
 void qt_dispatchModifiersChanged(void * /*NSEvent * */flagsChangedEvent, QWidget *widgetToGetEvent);
 bool qt_mac_handleTabletEvent(void * /*QCocoaView * */view, void * /*NSEvent * */event);
 inline QApplication *qAppInstance() { return static_cast<QApplication *>(QCoreApplication::instance()); }
-struct ::TabletProximityRec;
 void qt_dispatchTabletProximityEvent(const ::TabletProximityRec &proxRec);
 Qt::KeyboardModifiers qt_cocoaModifiers2QtModifiers(ulong modifierFlags);
 Qt::KeyboardModifiers qt_cocoaDragOperation2QtModifiers(uint dragOperations);