summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPeter Varga <pvarga@inf.u-szeged.hu>2014-05-16 13:47:22 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-05-21 13:36:48 +0200
commit1f124e50cde3250e11efaec306f2a07ace3185de (patch)
tree37663dcdcc2c6875a2103fe8a137506816be5e1e /src
parent560f10aee4f3294b65f58a9579b0e76009c1de4a (diff)
Windows: Use single process binary on Windows and fix GL context
Change-Id: Iee7f3dc7fb9deba03e57a80ed48b74069490fe0d Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'src')
m---------src/3rdparty0
-rw-r--r--src/core/content_browser_client_qt.cpp7
-rw-r--r--src/core/qtwebengine_extras.gypi1
-rw-r--r--src/core/web_engine_context.cpp5
4 files changed, 12 insertions, 1 deletions
diff --git a/src/3rdparty b/src/3rdparty
-Subproject a462a800bdf84baf6eca4fcc583684582d5419c
+Subproject 1b5dc494c6547be044ab5fed57dc0419bba3f95
diff --git a/src/core/content_browser_client_qt.cpp b/src/core/content_browser_client_qt.cpp
index 200ebd35f..8a917c72f 100644
--- a/src/core/content_browser_client_qt.cpp
+++ b/src/core/content_browser_client_qt.cpp
@@ -222,7 +222,12 @@ public:
m_handle = pni->nativeResourceForContext(QByteArrayLiteral("eglcontext"), qtContext);
else if (platform == QStringLiteral("eglfs"))
m_handle = pni->nativeResourceForContext(QByteArrayLiteral("eglcontext"), qtContext);
- else {
+ else if (platform == QStringLiteral("windows")) {
+ if (gfx::GetGLImplementation() == gfx::kGLImplementationEGLGLES2)
+ m_handle = pni->nativeResourceForContext(QByteArrayLiteral("eglcontext"), qtContext);
+ else
+ qFatal("Only the EGLGLES2 implementation is supported on %s platform.", platform.toLatin1().constData());
+ } else {
qFatal("%s platform not yet supported", platform.toLatin1().constData());
// Add missing platforms once they work.
Q_UNREACHABLE();
diff --git a/src/core/qtwebengine_extras.gypi b/src/core/qtwebengine_extras.gypi
index a93d7b8e4..8cd2ff913 100644
--- a/src/core/qtwebengine_extras.gypi
+++ b/src/core/qtwebengine_extras.gypi
@@ -5,6 +5,7 @@
'win_use_allocator_shim': 0,
'win_release_RuntimeLibrary': 2,
'win_debug_RuntimeLibrary': 3,
+ 'chrome_multiple_dll': 0,
},
'target_defaults': {
# patterns used to exclude chromium files from the build when we have a drop-in replacement
diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp
index ff433027e..4623b0aab 100644
--- a/src/core/web_engine_context.cpp
+++ b/src/core/web_engine_context.cpp
@@ -138,6 +138,11 @@ WebEngineContext::WebEngineContext()
parsedCommandLine->AppendSwitch(switches::kEnableThreadedCompositing);
parsedCommandLine->AppendSwitch(switches::kInProcessGPU);
+#if defined(OS_WIN)
+ // FIXME: The renderer process should be fixed on windows.
+ parsedCommandLine->AppendSwitch(switches::kSingleProcess);
+#endif
+
#if defined(QTWEBENGINE_MOBILE_SWITCHES)
// Inspired from the Android port's default switches
parsedCommandLine->AppendSwitch(switches::kEnableOverlayScrollbars);