Imported WebKit commit 356d83016b090995d08ad568f2d2c243aa55e831 (http://svn.webkit.org/repository/webkit/trunk@126147)

New snapshot including various build fixes for newer Qt 5

6 files changed, 18 insertions, 19 deletions

diff --git a/Tools/MiniBrowser/efl/CMakeLists.txt b/Tools/MiniBrowser/efl/CMakeLists.txt
index ae359a668..753c4495a 100644
--- a/Tools/MiniBrowser/efl/CMakeLists.txt
+++ b/Tools/MiniBrowser/efl/CMakeLists.txt
@@ -25,7 +25,7 @@ SET(MiniBrowser_LIBRARIES
     ${EFLDEPS_LIBRARIES}
     ${EVAS_LIBRARIES}
     ${FONTCONFIG_LIBRARIES}
-    ${LIBSOUP24_LIBRARIES}
+    ${LIBSOUP_LIBRARIES}
     ${LIBXML2_LIBRARIES}
     ${LIBXSLT_LIBRARIES}
     ${OPENGL_LIBRARIES}
@@ -37,13 +37,12 @@ SET(MiniBrowser_LINK_FLAGS
     ${EDJE_LDFLAGS}
     ${EFLDEPS_LDFLAGS}
     ${EVAS_LDFLAGS}
-    ${LIBSOUP24_LDFLAGS}
 )
 
 IF (ENABLE_GLIB_SUPPORT)
     LIST(APPEND MiniBrowser_LIBRARIES
-        ${Glib_LIBRARIES}
-        ${Gthread_LIBRARIES}
+        ${GLIB_LIBRARIES}
+        ${GLIB_GTHREAD_LIBRARIES}
     )
 ENDIF ()
 
diff --git a/Tools/MiniBrowser/mac/AppDelegate.m b/Tools/MiniBrowser/mac/AppDelegate.m
index a620c798e..285736175 100644
--- a/Tools/MiniBrowser/mac/AppDelegate.m
+++ b/Tools/MiniBrowser/mac/AppDelegate.m
@@ -35,17 +35,17 @@ static NSString *defaultURL = @"http://www.webkit.org/";
 
 @implementation BrowserAppDelegate
 
-void didRecieveMessageFromInjectedBundle(WKContextRef context, WKStringRef messageName, WKTypeRef messageBody, const void *clientInfo)
+void didReceiveMessageFromInjectedBundle(WKContextRef context, WKStringRef messageName, WKTypeRef messageBody, const void *clientInfo)
 {
     CFStringRef cfMessageName = WKStringCopyCFString(0, messageName);
 
     WKTypeID typeID = WKGetTypeID(messageBody);
     if (typeID == WKStringGetTypeID()) {
         CFStringRef cfMessageBody = WKStringCopyCFString(0, (WKStringRef)messageBody);
-        LOG(@"ContextInjectedBundleClient - didRecieveMessage - MessageName: %@ MessageBody %@", cfMessageName, cfMessageBody);
+        LOG(@"ContextInjectedBundleClient - didReceiveMessage - MessageName: %@ MessageBody %@", cfMessageName, cfMessageBody);
         CFRelease(cfMessageBody);
     } else {
-        LOG(@"ContextInjectedBundleClient - didRecieveMessage - MessageName: %@ (MessageBody Unhandeled)\n", cfMessageName);
+        LOG(@"ContextInjectedBundleClient - didReceiveMessage - MessageName: %@ (MessageBody Unhandled)\n", cfMessageName);
     }
     
     CFRelease(cfMessageName);
@@ -130,7 +130,7 @@ static void populateVisitedLinks(WKContextRef context, const void *clientInfo)
         WKContextInjectedBundleClient bundleClient = {
             kWKContextInjectedBundleClientCurrentVersion,
             0,      /* clientInfo */
-            didRecieveMessageFromInjectedBundle,
+            didReceiveMessageFromInjectedBundle,
             0,      /* didReceiveSynchronousMessageFromInjectedBundle */
             0       /* getInjectedBundleInitializationUserData */
         };
diff --git a/Tools/MiniBrowser/mac/WebBundle/WebBundleMain.m b/Tools/MiniBrowser/mac/WebBundle/WebBundleMain.m
index 509038a9c..46a8c1cbf 100644
--- a/Tools/MiniBrowser/mac/WebBundle/WebBundleMain.m
+++ b/Tools/MiniBrowser/mac/WebBundle/WebBundleMain.m
@@ -73,17 +73,17 @@ void willDestroyPage(WKBundleRef bundle, WKBundlePageRef page, const void* clien
     LOG(@"WKBundleClient - willDestroyPage\n");
 }
 
-void didRecieveMessage(WKBundleRef bundle, WKStringRef messageName, WKTypeRef messageBody, const void *clientInfo)
+void didReceiveMessage(WKBundleRef bundle, WKStringRef messageName, WKTypeRef messageBody, const void *clientInfo)
 {
     CFStringRef cfMessageName = WKStringCopyCFString(0, messageName);
 
     WKTypeID typeID = WKGetTypeID(messageBody);
     if (typeID == WKStringGetTypeID()) {
         CFStringRef cfMessageBody = WKStringCopyCFString(0, (WKStringRef)messageBody);
-        LOG(@"WKBundleClient - didRecieveMessage - MessageName: %@ MessageBody %@", cfMessageName, cfMessageBody);
+        LOG(@"WKBundleClient - didReceiveMessage - MessageName: %@ MessageBody %@", cfMessageName, cfMessageBody);
         CFRelease(cfMessageBody);
     } else {
-        LOG(@"WKBundleClient - didRecieveMessage - MessageName: %@ (MessageBody Unhandeled)\n", cfMessageName);
+        LOG(@"WKBundleClient - didReceiveMessage - MessageName: %@ (MessageBody Unhandled)\n", cfMessageName);
     }
 
     CFRelease(cfMessageName);
@@ -99,7 +99,7 @@ void WKBundleInitialize(WKBundleRef bundle, WKTypeRef initializationUserData)
         didCreatePage,
         willDestroyPage,
         0, // didInitializePageGroup
-        didRecieveMessage
+        didReceiveMessage
     };
     WKBundleSetClient(bundle, &client);
 }
diff --git a/Tools/MiniBrowser/qt/BrowserWindow.h b/Tools/MiniBrowser/qt/BrowserWindow.h
index 1e7f7f52d..0f30e2c99 100644
--- a/Tools/MiniBrowser/qt/BrowserWindow.h
+++ b/Tools/MiniBrowser/qt/BrowserWindow.h
@@ -50,13 +50,13 @@ public:
 
     void updateVisualMockTouchPoints(const QList<QTouchEvent::TouchPoint>& touchPoints);
 
-public slots:
+public Q_SLOTS:
     BrowserWindow* newWindow(const QString& url = "about:blank");
 
-protected slots:
+protected Q_SLOTS:
     void screenshot();
 
-private slots:
+private Q_SLOTS:
     void onTitleChanged(QString);
 
 private:
diff --git a/Tools/MiniBrowser/qt/MiniBrowserApplication.h b/Tools/MiniBrowser/qt/MiniBrowserApplication.h
index aa6ecdef3..3dc380aec 100644
--- a/Tools/MiniBrowser/qt/MiniBrowserApplication.h
+++ b/Tools/MiniBrowser/qt/MiniBrowserApplication.h
@@ -75,7 +75,7 @@ public:
         }
     }
 
-signals:
+Q_SIGNALS:
     void touchMockingEnabledChanged();
 
 private:
diff --git a/Tools/MiniBrowser/qt/UrlLoader.h b/Tools/MiniBrowser/qt/UrlLoader.h
index 01e67c3bd..8ac58dfdd 100644
--- a/Tools/MiniBrowser/qt/UrlLoader.h
+++ b/Tools/MiniBrowser/qt/UrlLoader.h
@@ -41,15 +41,15 @@ class UrlLoader : public QObject {
 public:
     UrlLoader(BrowserWindow*, const QString&, int, int);
 
-public slots:
+public Q_SLOTS:
     void loadNext();
 
-private slots:
+private Q_SLOTS:
     void checkIfFinished();
     void frameLoadStarted();
     void frameLoadFinished();
 
-signals:
+Q_SIGNALS:
     void pageLoadFinished();
 
 private: