From cd093557e1853556f66c17efd120f8fa9da4aeb9 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Mon, 5 Feb 2018 14:24:28 +0100
Subject: [PATCH] Initialize FeatureList early
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

To avoid crashing on a check of features being accessed before.

Change-Id: I7aa97141b6a71ded534b1ebd3d2a750892b07221
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
---
 src/core/web_engine_context.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp
index e98dcd961..a10aef115 100644
--- a/src/core/web_engine_context.cpp
+++ b/src/core/web_engine_context.cpp
@@ -391,6 +391,9 @@ WebEngineContext::WebEngineContext()
         parsedCommandLine->AppendSwitch(switches::kDisable2dCanvasAntialiasing);
         parsedCommandLine->AppendSwitch(cc::switches::kDisableCompositedAntialiasing);
     }
+    base::FeatureList::InitializeInstance(
+        parsedCommandLine->GetSwitchValueASCII(switches::kEnableFeatures),
+        parsedCommandLine->GetSwitchValueASCII(switches::kDisableFeatures));
 
     GLContextHelper::initialize();
 
-- 
GitLab