bbandix

diff --git a/src/core/config/mac_osx.pri b/src/core/config/mac_osx.pri
index b24d981..61855dd 100644
--- a/src/core/config/mac_osx.pri
+++ b/src/core/config/mac_osx.pri
@@ -1,5 +1,6 @@
 GYP_CONFIG += \
     qt_os=\"mac\" \
     mac_sdk_min=\"10.7\" \
+    mac_sdk_path=\"$${QMAKE_MAC_SDK_PATH}\" \
     mac_deployment_target=\"$${QMAKE_MACOSX_DEPLOYMENT_TARGET}\" \

bbandix

diff --git a/src/core/config/embedded_linux.pri b/src/core/config/embedded_linux.pri
index 88af144..2005454 100644
--- a/src/core/config/embedded_linux.pri
+++ b/src/core/config/embedded_linux.pri
@@ -28,6 +28,7 @@ GYP_CONFIG += \
     ozone_platform_test=0 \
     p2p_apis=0 \
     safe_browsing=0 \
+    test_isolation_mode=noop \
     toolkit_uses_gtk=0 \

bbandix

diff --git a/src/core/config/embedded_android.pri b/src/core/config/embedded_android.pri
index 6ffa1c0..8787087 100644
--- a/src/core/config/embedded_android.pri
+++ b/src/core/config/embedded_android.pri
@@ -12,6 +12,7 @@ GYP_CONFIG += \
     build_ffmpegsumo=0 \
     configuration_policy=0 \
     disable_nacl=1 \
+    embedded=1 \
     enable_autofill_dialog=0 \

bbandix

commit 6bfcac58acf55f20346bb495a5464a3b937ce247
Author: Andras Becsi <andras.becsi@digia.com>
Date:   Thu Sep 4 17:00:56 2014 +0200

    Fix an assertion in net/url_request/url_request.cc:656
    
    There is no need to call the URLRequest::BeforeRequestComplete
    callback if the request has been ignored by the user since
    URLRequest::Cancel already resets all the needed states.
    Return early after cancelling the request since this is

bbandix

commit 87135f3602d0ded5eac22885a757c3a2f75fd350
Author: Andras Becsi <andras.becsi@digia.com>
Date:   Thu Sep 4 17:00:56 2014 +0200

    Fix an assertion in net/url_request/url_request.cc:656
    
    There is no need to call the URLRequest::BeforeRequestComplete
    callback if the request has been ignored by the user since
    URLRequest::Cancel already resets all the needed states.
    Return early after cancelling the request since this is

bbandix

diff --git a/src/core/network_delegate_qt.cpp b/src/core/network_delegate_qt.cpp
index 8a79bbc..81ab4b6 100644
--- a/src/core/network_delegate_qt.cpp
+++ b/src/core/network_delegate_qt.cpp
@@ -136,9 +136,7 @@ void NetworkDelegateQt::CompleteURLRequestOnIOThread(net::URLRequest *request,
         error = net::OK;
         break;
     case WebContentsAdapterClient::IgnoreRequest:
-        error = net::OK;
-        // We can cancel the request here since we are on the IO thread.

bbandix

diff --git a/tools/scripts/git_submodule.py b/tools/scripts/git_submodule.py
index fa5e969..5376e87 100644
--- a/tools/scripts/git_submodule.py
+++ b/tools/scripts/git_submodule.py
@@ -171,8 +171,8 @@ class Submodule:
             error = subprocessCall(['git', 'checkout', 'FETCH_HEAD']);
 
             if self.revision:
-                search_string = '\"git-svn-id: .*@' + str(self.revision) + '\"'
-                line = subprocessCheckOutput(['git', 'log', '-n1', '--pretty=oneline', '--grep=' + search_string])

bbandix

diff --git a/qeglplatformintegration.cpp b/qeglplatformintegration.cpp
index 820c433..3abf1fc 100644
--- a/src/platformsupport/eglconvenience/qeglplatformintegration.cpp
+++ b/src/platformsupport/eglconvenience/qeglplatformintegration.cpp
@@ -190,6 +190,7 @@ enum ResourceType {
     EglDisplay,
     EglWindow,
     EglContext,
+    EglConfig,
     NativeDisplay

bbandix

From 38721c0f398460001939d4518d34b69bae9a5ef1 Mon Sep 17 00:00:00 2001
From: Andras Becsi <andras.becsi@digia.com>
Date: Thu, 12 Jun 2014 13:19:05 +0200
Subject: [PATCH] WIP: Exclude reimplemented function definitions from
 GLSurfaceEGL

We implement these in QtWebEngine so we end up with the same
configuration for the EGLContexts as Qt.
---
 chromium/ui/gl/gl_surface_egl.cc | 6 +++++-

bbandix

From bb98735dba1e2b5bfa909d194b456dabcc04d273 Mon Sep 17 00:00:00 2001
From: Andras Becsi <andras.becsi@digia.com>
Date: Thu, 12 Jun 2014 13:21:45 +0200
Subject: [PATCH] WIP: Use the same EGLConfig as Qt for EGLContexts

Change-Id: I691d78cbf1d0e1088364b6de8d14249cd494c85e
---
 src/core/core_gyp_generator.pro |   1 +
 src/core/gl_context_qt.cpp      |  18 ++++-
 src/core/gl_context_qt.h        |   1 +