bbandix

diff --git a/src/core/core_module.pro b/src/core/core_module.pro
index df86894..70a04fb 100644
--- a/src/core/core_module.pro
+++ b/src/core/core_module.pro
@@ -1,6 +1,9 @@
 MODULE = webenginecore
 
 include(core_common.pri)
+
+QT+= gui

bbandix

diff --git a/src/core/api/qwebenginecallback.cpp b/src/core/api/qwebenginecallback.cpp
index adddd37..03d0ffa 100644
--- a/src/core/api/qwebenginecallback.cpp
+++ b/src/core/api/qwebenginecallback.cpp
@@ -136,9 +136,9 @@ void CallbackDirectory::CallbackSharedDataPointer<T>::invokeEmpty()
 
 #define DECLATE_SUPPORTED_CALLBACK_TYPE(T) \
     template struct CallbackDirectory::CallbackSharedDataPointer<T>; \
-    template void CallbackDirectory::invokeInternal<T>(quint64, T); \
+    template void CallbackDirectory::invokeInternal<T>(QT_PREPEND_NAMESPACE(quint64), T); \

bbandix

import QtQuick 2.1
import QtQuick.Controls 1.4

ApplicationWindow {
    height: 600
    width: 800
    visible: true

    toolBar: TextField { }
    Rectangle {

bbandix

import QtQuick 2.1
import QtQuick.Controls 1.4

ApplicationWindow {
    height: 600
    width: 800
    visible: true

    toolBar: TextField { }
    Rectangle {

bbandix

diff --git a/src/core/location_provider_qt.cpp b/src/core/location_provider_qt.cpp
index d17fc3d..5b61e9d 100644
--- a/src/core/location_provider_qt.cpp
+++ b/src/core/location_provider_qt.cpp
@@ -100,8 +100,7 @@ bool QtPositioningHelper::start(bool highAccuracy)
 
     connect(m_positionInfoSource, &QGeoPositionInfoSource::positionUpdated, this, &QtPositioningHelper::updatePosition);
     // disambiguate the error getter and the signal in QGeoPositionInfoSource.
-    connect(m_positionInfoSource, static_cast<void (QGeoPositionInfoSource::*)(QGeoPositionInfoSource::Error)>(&QGeoPositionInfoSource::error)
-            , this, &QtPositioningHelper::error);

bbandix

diff --git a/chromium/third_party/mesa/src/include/GL/glext.h b/chromium/third_party/mesa/src/include/GL/glext.h
index 050455b..bb66eab 100644
--- a/chromium/third_party/mesa/src/include/GL/glext.h
+++ b/chromium/third_party/mesa/src/include/GL/glext.h
@@ -6147,19 +6147,6 @@ extern "C" {
 typedef char GLchar;
 #endif
 
-#ifndef GL_VERSION_1_5
-#ifndef GLEXT_PTR_TYPES_DEFINED

bbandix

diff --git a/chromium/third_party/mesa/src/include/GL/glext.h b/chromium/third_party/mesa/src/include/GL/glext.h
index cb19ed4..87efe91 100644
--- a/chromium/third_party/mesa/src/include/GL/glext.h
+++ b/chromium/third_party/mesa/src/include/GL/glext.h
@@ -6148,6 +6148,7 @@ typedef char GLchar;
 #endif
 
 #ifndef GL_VERSION_1_5
+#if !defined(BUILDING_CHROMIUM)
 /* GL types for handling large vertex buffer objects */

bbandix

diff --git a/chromium/third_party/mesa/src/include/GL/glext.h b/chromium/third_party/mesa/src/include/GL/glext.h
index cb19ed4..a2ef5c2 100644
--- a/chromium/third_party/mesa/src/include/GL/glext.h
+++ b/chromium/third_party/mesa/src/include/GL/glext.h
@@ -6148,6 +6148,7 @@ typedef char GLchar;
 #endif
 
 #ifndef GL_VERSION_1_5
+#if !defined(TOOLKIT_QT)
 /* GL types for handling large vertex buffer objects */

bbandix

diff --git a/chromium/gpu/command_buffer/common/gles2_cmd_format.h b/chromium/gpu/command_buffer/common/gles2_cmd_format.h
index 04a3dc3..03029d2 100644
--- a/chromium/gpu/command_buffer/common/gles2_cmd_format.h
+++ b/chromium/gpu/command_buffer/common/gles2_cmd_format.h
@@ -40,6 +40,8 @@ typedef double GLdouble;
 typedef double GLclampd;
 typedef void GLvoid;
 
+#ifndef GLEXT_PTR_TYPES_DEFINED
+#define GLEXT_PTR_TYPES_DEFINED 1

bbandix

diff --git a/src/core/gl_surface_qt.cpp b/src/core/gl_surface_qt.cpp
index 85b78cc..4fe2f21 100644
--- a/src/core/gl_surface_qt.cpp
+++ b/src/core/gl_surface_qt.cpp
@@ -98,7 +98,6 @@ public:
     virtual bool Initialize() Q_DECL_OVERRIDE;
     virtual void Destroy() Q_DECL_OVERRIDE;
     virtual void* GetHandle() Q_DECL_OVERRIDE;
-    virtual void* GetShareHandle() Q_DECL_OVERRIDE;
     virtual bool Resize(const gfx::Size &size) Q_DECL_OVERRIDE;