From: csagan5 <32685696+csagan5@users.noreply.github.com>
Date: Mon, 12 Mar 2018 20:31:44 +0100
Subject: Add Qwant search engine

Specify image URL in upstream engine definition
Make search engine selectable in default list
---
 .../search_engines/prepopulated_engines.json       |   3 +-
 .../template_url_prepopulate_data.cc               | 218 ++++++++++-----------
 2 files changed, 111 insertions(+), 110 deletions(-)

diff --git a/components/search_engines/prepopulated_engines.json b/components/search_engines/prepopulated_engines.json
--- a/components/search_engines/prepopulated_engines.json
+++ b/components/search_engines/prepopulated_engines.json
@@ -28,7 +28,7 @@
     // Increment this if you change the data in ways that mean users with
     // existing data should get a new version. Otherwise, existing data may
     // continue to be used and updates made here will not always appear.
-    "kCurrentDataVersion": 113
+    "kCurrentDataVersion": 114
   },
 
   // The following engines are included in country lists and are added to the
@@ -187,6 +187,7 @@
       "favicon_url": "https://www.qwant.com/favicon.ico",
       "search_url": "https://www.qwant.com/?q={searchTerms}&client=opensearch",
       "suggest_url": "https://api.qwant.com/api/suggest/?q={searchTerms}&client=opensearch",
+      "image_url": "https://www.qwant.com/?t=images&q={searchTerms}",
       "type": "SEARCH_ENGINE_QWANT",
       "id": 94
     },
diff --git a/components/search_engines/template_url_prepopulate_data.cc b/components/search_engines/template_url_prepopulate_data.cc
--- a/components/search_engines/template_url_prepopulate_data.cc
+++ b/components/search_engines/template_url_prepopulate_data.cc
@@ -32,7 +32,7 @@ namespace {
 
 // Default (for countries with no better engine set)
 const PrepopulatedEngine* const engines_default[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &bing,
     &yahoo,
     &duckduckgo, &duckduckgo_light,
@@ -42,7 +42,7 @@ const PrepopulatedEngine* const engines_default[] = {
 // Engine selection by country ------------------------------------------------
 // United Arab Emirates
 const PrepopulatedEngine* const engines_AE[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &bing,
     &yahoo,
     &duckduckgo, &duckduckgo_light,
@@ -50,7 +50,7 @@ const PrepopulatedEngine* const engines_AE[] = {
 
 // Albania
 const PrepopulatedEngine* const engines_AL[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &yahoo,
     &bing,
     &ask,
@@ -58,7 +58,7 @@ const PrepopulatedEngine* const engines_AL[] = {
 
 // Argentina
 const PrepopulatedEngine* const engines_AR[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &bing,
     &yahoo_ar,
     &duckduckgo, &duckduckgo_light,
@@ -66,7 +66,7 @@ const PrepopulatedEngine* const engines_AR[] = {
 
 // Austria
 const PrepopulatedEngine* const engines_AT[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &bing,
     &yahoo_at,
     &duckduckgo, &duckduckgo_light,
@@ -74,7 +74,7 @@ const PrepopulatedEngine* const engines_AT[] = {
 
 // Australia
 const PrepopulatedEngine* const engines_AU[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &bing,
     &yahoo_au,
     &duckduckgo, &duckduckgo_light,
@@ -82,7 +82,7 @@ const PrepopulatedEngine* const engines_AU[] = {
 
 // Bosnia and Herzegovina
 const PrepopulatedEngine* const engines_BA[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &yahoo,
     &bing,
     &ask,
@@ -90,7 +90,7 @@ const PrepopulatedEngine* const engines_BA[] = {
 
 // Belgium
 const PrepopulatedEngine* const engines_BE[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &bing,
     &yahoo,
     &duckduckgo, &duckduckgo_light,
@@ -98,7 +98,7 @@ const PrepopulatedEngine* const engines_BE[] = {
 
 // Bulgaria
 const PrepopulatedEngine* const engines_BG[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &bing,
     &yahoo,
     &yandex_ru,
@@ -106,7 +106,7 @@ const PrepopulatedEngine* const engines_BG[] = {
 
 // Bahrain
 const PrepopulatedEngine* const engines_BH[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &bing,
     &yahoo,
     &ask,
@@ -114,7 +114,7 @@ const PrepopulatedEngine* const engines_BH[] = {
 
 // Burundi
 const PrepopulatedEngine* const engines_BI[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &bing,
     &yahoo,
     &yandex_ru,
@@ -122,7 +122,7 @@ const PrepopulatedEngine* const engines_BI[] = {
 
 // Brunei
 const PrepopulatedEngine* const engines_BN[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &bing,
     &yahoo,
     &duckduckgo, &duckduckgo_light,
@@ -130,7 +130,7 @@ const PrepopulatedEngine* const engines_BN[] = {
 
 // Bolivia
 const PrepopulatedEngine* const engines_BO[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &bing,
     &yahoo,
     &duckduckgo, &duckduckgo_light,
@@ -138,7 +138,7 @@ const PrepopulatedEngine* const engines_BO[] = {
 
 // Brazil
 const PrepopulatedEngine* const engines_BR[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &bing,
     &yahoo_br,
     &duckduckgo, &duckduckgo_light,
@@ -146,7 +146,7 @@ const PrepopulatedEngine* const engines_BR[] = {
 
 // Belarus
 const PrepopulatedEngine* const engines_BY[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &yandex_by,
     &mail_ru,
     &bing,
@@ -154,7 +154,7 @@ const PrepopulatedEngine* const engines_BY[] = {
 
 // Belize
 const PrepopulatedEngine* const engines_BZ[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &bing,
     &yahoo,
     &duckduckgo, &duckduckgo_light,
@@ -162,12 +162,12 @@ const PrepopulatedEngine* const engines_BZ[] = {
 
 // Canada
 const PrepopulatedEngine* const engines_CA[] = {
-    &googleen, &google, &startpage, &bing, &yahoo_ca, &yahoo_qc, &duckduckgo, &duckduckgo_light,
+    &googleen, &google, &startpage, &qwant, &bing, &yahoo_ca, &yahoo_qc, &duckduckgo, &duckduckgo_light,
 };
 
 // Switzerland
 const PrepopulatedEngine* const engines_CH[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &bing,
     &duckduckgo, &duckduckgo_light,
     &yahoo_ch,
@@ -175,7 +175,7 @@ const PrepopulatedEngine* const engines_CH[] = {
 
 // Chile
 const PrepopulatedEngine* const engines_CL[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &bing,
     &yahoo_cl,
     &duckduckgo, &duckduckgo_light,
@@ -183,12 +183,12 @@ const PrepopulatedEngine* const engines_CL[] = {
 
 // China
 const PrepopulatedEngine* const engines_CN[] = {
-    &baidu, &so_360, &googleen, &google, &startpage, &sogou, &bing,
+    &baidu, &so_360, &googleen, &google, &startpage, &qwant, &sogou, &bing,
 };
 
 // Colombia
 const PrepopulatedEngine* const engines_CO[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &yahoo_co,
     &bing,
     &duckduckgo, &duckduckgo_light,
@@ -196,7 +196,7 @@ const PrepopulatedEngine* const engines_CO[] = {
 
 // Costa Rica
 const PrepopulatedEngine* const engines_CR[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &bing,
     &yahoo,
     &duckduckgo, &duckduckgo_light,
@@ -204,7 +204,7 @@ const PrepopulatedEngine* const engines_CR[] = {
 
 // Czech Republic
 const PrepopulatedEngine* const engines_CZ[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &seznam,
     &bing,
     &yahoo,
@@ -212,7 +212,7 @@ const PrepopulatedEngine* const engines_CZ[] = {
 
 // Germany
 const PrepopulatedEngine* const engines_DE[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &bing,
     &yahoo_de,
     &duckduckgo, &duckduckgo_light,
@@ -220,7 +220,7 @@ const PrepopulatedEngine* const engines_DE[] = {
 
 // Denmark
 const PrepopulatedEngine* const engines_DK[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &bing,
     &yahoo_dk,
     &duckduckgo, &duckduckgo_light,
@@ -228,7 +228,7 @@ const PrepopulatedEngine* const engines_DK[] = {
 
 // Dominican Republic
 const PrepopulatedEngine* const engines_DO[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &bing,
     &yahoo,
     &duckduckgo, &duckduckgo_light,
@@ -236,7 +236,7 @@ const PrepopulatedEngine* const engines_DO[] = {
 
 // Algeria
 const PrepopulatedEngine* const engines_DZ[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &yahoo,
     &bing,
     &yandex_ru,
@@ -244,7 +244,7 @@ const PrepopulatedEngine* const engines_DZ[] = {
 
 // Ecuador
 const PrepopulatedEngine* const engines_EC[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &bing,
     &yahoo,
     &duckduckgo, &duckduckgo_light,
@@ -252,7 +252,7 @@ const PrepopulatedEngine* const engines_EC[] = {
 
 // Estonia
 const PrepopulatedEngine* const engines_EE[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &bing,
     &yandex_ru,
     &neti,
@@ -260,7 +260,7 @@ const PrepopulatedEngine* const engines_EE[] = {
 
 // Egypt
 const PrepopulatedEngine* const engines_EG[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &yahoo,
     &bing,
     &yandex_ru,
@@ -268,7 +268,7 @@ const PrepopulatedEngine* const engines_EG[] = {
 
 // Spain
 const PrepopulatedEngine* const engines_ES[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &bing,
     &yahoo_es,
     &duckduckgo, &duckduckgo_light,
@@ -276,7 +276,7 @@ const PrepopulatedEngine* const engines_ES[] = {
 
 // Finland
 const PrepopulatedEngine* const engines_FI[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &bing,
     &yahoo_fi,
     &duckduckgo, &duckduckgo_light,
@@ -284,7 +284,7 @@ const PrepopulatedEngine* const engines_FI[] = {
 
 // Faroe Islands
 const PrepopulatedEngine* const engines_FO[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &bing,
     &yahoo,
     &duckduckgo, &duckduckgo_light,
@@ -292,7 +292,7 @@ const PrepopulatedEngine* const engines_FO[] = {
 
 // France
 const PrepopulatedEngine* const engines_FR[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &bing,
     &yahoo_fr,
     &qwant,
@@ -300,7 +300,7 @@ const PrepopulatedEngine* const engines_FR[] = {
 
 // United Kingdom
 const PrepopulatedEngine* const engines_GB[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &bing,
     &yahoo_uk,
     &duckduckgo, &duckduckgo_light,
@@ -308,7 +308,7 @@ const PrepopulatedEngine* const engines_GB[] = {
 
 // Greece
 const PrepopulatedEngine* const engines_GR[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &bing,
     &yahoo,
     &duckduckgo, &duckduckgo_light,
@@ -316,7 +316,7 @@ const PrepopulatedEngine* const engines_GR[] = {
 
 // Guatemala
 const PrepopulatedEngine* const engines_GT[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &bing,
     &yahoo,
     &duckduckgo, &duckduckgo_light,
@@ -324,7 +324,7 @@ const PrepopulatedEngine* const engines_GT[] = {
 
 // Hong Kong
 const PrepopulatedEngine* const engines_HK[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &yahoo_hk,
     &bing,
     &baidu,
@@ -332,7 +332,7 @@ const PrepopulatedEngine* const engines_HK[] = {
 
 // Honduras
 const PrepopulatedEngine* const engines_HN[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &bing,
     &yahoo,
     &duckduckgo, &duckduckgo_light,
@@ -340,7 +340,7 @@ const PrepopulatedEngine* const engines_HN[] = {
 
 // Croatia
 const PrepopulatedEngine* const engines_HR[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &bing,
     &yahoo,
     &duckduckgo, &duckduckgo_light,
@@ -348,7 +348,7 @@ const PrepopulatedEngine* const engines_HR[] = {
 
 // Hungary
 const PrepopulatedEngine* const engines_HU[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &yahoo,
     &bing,
     &duckduckgo, &duckduckgo_light,
@@ -356,7 +356,7 @@ const PrepopulatedEngine* const engines_HU[] = {
 
 // Indonesia
 const PrepopulatedEngine* const engines_ID[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &yahoo_id,
     &bing,
     &duckduckgo, &duckduckgo_light,
@@ -364,7 +364,7 @@ const PrepopulatedEngine* const engines_ID[] = {
 
 // Ireland
 const PrepopulatedEngine* const engines_IE[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &bing,
     &yahoo,
     &duckduckgo, &duckduckgo_light,
@@ -372,7 +372,7 @@ const PrepopulatedEngine* const engines_IE[] = {
 
 // Israel
 const PrepopulatedEngine* const engines_IL[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &bing,
     &yahoo,
     &yandex_ru,
@@ -380,7 +380,7 @@ const PrepopulatedEngine* const engines_IL[] = {
 
 // India
 const PrepopulatedEngine* const engines_IN[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &yahoo_in,
     &bing,
     &duckduckgo, &duckduckgo_light,
@@ -388,7 +388,7 @@ const PrepopulatedEngine* const engines_IN[] = {
 
 // Iraq
 const PrepopulatedEngine* const engines_IQ[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &yahoo,
     &bing,
     &yandex_ru,
@@ -396,14 +396,14 @@ const PrepopulatedEngine* const engines_IQ[] = {
 
 // Iran
 const PrepopulatedEngine* const engines_IR[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &bing,
     &yahoo,
 };
 
 // Iceland
 const PrepopulatedEngine* const engines_IS[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &bing,
     &yahoo,
     &duckduckgo, &duckduckgo_light,
@@ -411,7 +411,7 @@ const PrepopulatedEngine* const engines_IS[] = {
 
 // Italy
 const PrepopulatedEngine* const engines_IT[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &bing,
     &yahoo,
     &duckduckgo, &duckduckgo_light,
@@ -419,7 +419,7 @@ const PrepopulatedEngine* const engines_IT[] = {
 
 // Jamaica
 const PrepopulatedEngine* const engines_JM[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &bing,
     &yahoo,
     &duckduckgo, &duckduckgo_light,
@@ -427,7 +427,7 @@ const PrepopulatedEngine* const engines_JM[] = {
 
 // Jordan
 const PrepopulatedEngine* const engines_JO[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &yahoo,
     &bing,
     &yandex_ru,
@@ -435,7 +435,7 @@ const PrepopulatedEngine* const engines_JO[] = {
 
 // Japan
 const PrepopulatedEngine* const engines_JP[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &yahoo_jp,
     &bing,
     &baidu,
@@ -443,7 +443,7 @@ const PrepopulatedEngine* const engines_JP[] = {
 
 // Kenya
 const PrepopulatedEngine* const engines_KE[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &yahoo,
     &bing,
     &duckduckgo, &duckduckgo_light,
@@ -451,7 +451,7 @@ const PrepopulatedEngine* const engines_KE[] = {
 
 // South Korea
 const PrepopulatedEngine* const engines_KR[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &naver,
     &daum,
     &bing,
@@ -459,7 +459,7 @@ const PrepopulatedEngine* const engines_KR[] = {
 
 // Kuwait
 const PrepopulatedEngine* const engines_KW[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &bing,
     &yahoo,
     &ask,
@@ -467,7 +467,7 @@ const PrepopulatedEngine* const engines_KW[] = {
 
 // Kazakhstan
 const PrepopulatedEngine* const engines_KZ[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &yandex_kz,
     &mail_ru,
     &bing,
@@ -475,7 +475,7 @@ const PrepopulatedEngine* const engines_KZ[] = {
 
 // Lebanon
 const PrepopulatedEngine* const engines_LB[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &bing,
     &yahoo,
     &duckduckgo, &duckduckgo_light,
@@ -483,7 +483,7 @@ const PrepopulatedEngine* const engines_LB[] = {
 
 // Liechtenstein
 const PrepopulatedEngine* const engines_LI[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &bing,
     &duckduckgo, &duckduckgo_light,
     &yahoo,
@@ -491,7 +491,7 @@ const PrepopulatedEngine* const engines_LI[] = {
 
 // Lithuania
 const PrepopulatedEngine* const engines_LT[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &bing,
     &yahoo,
     &yandex_ru,
@@ -499,7 +499,7 @@ const PrepopulatedEngine* const engines_LT[] = {
 
 // Luxembourg
 const PrepopulatedEngine* const engines_LU[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &bing,
     &duckduckgo, &duckduckgo_light,
     &yahoo,
@@ -507,7 +507,7 @@ const PrepopulatedEngine* const engines_LU[] = {
 
 // Latvia
 const PrepopulatedEngine* const engines_LV[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &bing,
     &yandex_ru,
     &yahoo,
@@ -515,7 +515,7 @@ const PrepopulatedEngine* const engines_LV[] = {
 
 // Libya
 const PrepopulatedEngine* const engines_LY[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &yahoo,
     &bing,
     &yandex_com,
@@ -523,7 +523,7 @@ const PrepopulatedEngine* const engines_LY[] = {
 
 // Morocco
 const PrepopulatedEngine* const engines_MA[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &yahoo,
     &bing,
     &yandex_ru,
@@ -531,7 +531,7 @@ const PrepopulatedEngine* const engines_MA[] = {
 
 // Monaco
 const PrepopulatedEngine* const engines_MC[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &bing,
     &yahoo,
     &duckduckgo, &duckduckgo_light,
@@ -539,7 +539,7 @@ const PrepopulatedEngine* const engines_MC[] = {
 
 // Moldova
 const PrepopulatedEngine* const engines_MD[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &yandex_ru,
     &mail_ru,
     &duckduckgo, &duckduckgo_light,
@@ -547,7 +547,7 @@ const PrepopulatedEngine* const engines_MD[] = {
 
 // Montenegro
 const PrepopulatedEngine* const engines_ME[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &yahoo,
     &bing,
     &yandex_ru,
@@ -555,7 +555,7 @@ const PrepopulatedEngine* const engines_ME[] = {
 
 // Macedonia
 const PrepopulatedEngine* const engines_MK[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &yahoo,
     &bing,
     &duckduckgo, &duckduckgo_light,
@@ -563,7 +563,7 @@ const PrepopulatedEngine* const engines_MK[] = {
 
 // Mexico
 const PrepopulatedEngine* const engines_MX[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &bing,
     &yahoo_mx,
     &duckduckgo, &duckduckgo_light,
@@ -571,7 +571,7 @@ const PrepopulatedEngine* const engines_MX[] = {
 
 // Malaysia
 const PrepopulatedEngine* const engines_MY[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &yahoo_my,
     &bing,
     &baidu,
@@ -579,7 +579,7 @@ const PrepopulatedEngine* const engines_MY[] = {
 
 // Nicaragua
 const PrepopulatedEngine* const engines_NI[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &bing,
     &yahoo,
     &duckduckgo, &duckduckgo_light,
@@ -587,7 +587,7 @@ const PrepopulatedEngine* const engines_NI[] = {
 
 // Netherlands
 const PrepopulatedEngine* const engines_NL[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &bing,
     &yahoo_nl,
     &duckduckgo, &duckduckgo_light,
@@ -595,7 +595,7 @@ const PrepopulatedEngine* const engines_NL[] = {
 
 // Norway
 const PrepopulatedEngine* const engines_NO[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &bing,
     &yahoo,
     &duckduckgo, &duckduckgo_light,
@@ -603,7 +603,7 @@ const PrepopulatedEngine* const engines_NO[] = {
 
 // New Zealand
 const PrepopulatedEngine* const engines_NZ[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &bing,
     &duckduckgo, &duckduckgo_light,
     &yahoo_nz,
@@ -611,7 +611,7 @@ const PrepopulatedEngine* const engines_NZ[] = {
 
 // Oman
 const PrepopulatedEngine* const engines_OM[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &bing,
     &yahoo,
     &ask,
@@ -619,7 +619,7 @@ const PrepopulatedEngine* const engines_OM[] = {
 
 // Panama
 const PrepopulatedEngine* const engines_PA[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &bing,
     &yahoo,
     &duckduckgo, &duckduckgo_light,
@@ -627,7 +627,7 @@ const PrepopulatedEngine* const engines_PA[] = {
 
 // Peru
 const PrepopulatedEngine* const engines_PE[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &yahoo_pe,
     &bing,
     &duckduckgo, &duckduckgo_light,
@@ -635,7 +635,7 @@ const PrepopulatedEngine* const engines_PE[] = {
 
 // Philippines
 const PrepopulatedEngine* const engines_PH[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &yahoo_ph,
     &bing,
     &duckduckgo, &duckduckgo_light,
@@ -643,7 +643,7 @@ const PrepopulatedEngine* const engines_PH[] = {
 
 // Pakistan
 const PrepopulatedEngine* const engines_PK[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &yahoo,
     &bing,
     &baidu,
@@ -651,7 +651,7 @@ const PrepopulatedEngine* const engines_PK[] = {
 
 // Poland
 const PrepopulatedEngine* const engines_PL[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &bing,
     &yahoo,
     &duckduckgo, &duckduckgo_light,
@@ -659,7 +659,7 @@ const PrepopulatedEngine* const engines_PL[] = {
 
 // Puerto Rico
 const PrepopulatedEngine* const engines_PR[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &bing,
     &yahoo,
     &duckduckgo, &duckduckgo_light,
@@ -667,7 +667,7 @@ const PrepopulatedEngine* const engines_PR[] = {
 
 // Portugal
 const PrepopulatedEngine* const engines_PT[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &bing,
     &yahoo,
     &duckduckgo, &duckduckgo_light,
@@ -675,7 +675,7 @@ const PrepopulatedEngine* const engines_PT[] = {
 
 // Paraguay
 const PrepopulatedEngine* const engines_PY[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &bing,
     &yahoo,
     &duckduckgo, &duckduckgo_light,
@@ -683,7 +683,7 @@ const PrepopulatedEngine* const engines_PY[] = {
 
 // Qatar
 const PrepopulatedEngine* const engines_QA[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &bing,
     &yahoo,
     &ask,
@@ -691,7 +691,7 @@ const PrepopulatedEngine* const engines_QA[] = {
 
 // Romania
 const PrepopulatedEngine* const engines_RO[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &bing,
     &yahoo,
     &duckduckgo, &duckduckgo_light,
@@ -699,7 +699,7 @@ const PrepopulatedEngine* const engines_RO[] = {
 
 // Serbia
 const PrepopulatedEngine* const engines_RS[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &yahoo,
     &bing,
     &duckduckgo, &duckduckgo_light,
@@ -708,14 +708,14 @@ const PrepopulatedEngine* const engines_RS[] = {
 // Russia
 const PrepopulatedEngine* const engines_RU[] = {
     &yandex_ru,
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &mail_ru,
     &bing,
 };
 
 // Rwanda
 const PrepopulatedEngine* const engines_RW[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &bing,
     &yahoo,
     &yandex_ru,
@@ -723,7 +723,7 @@ const PrepopulatedEngine* const engines_RW[] = {
 
 // Saudi Arabia
 const PrepopulatedEngine* const engines_SA[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &bing,
     &yahoo,
     &yandex_com,
@@ -731,7 +731,7 @@ const PrepopulatedEngine* const engines_SA[] = {
 
 // Sweden
 const PrepopulatedEngine* const engines_SE[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &bing,
     &yahoo_se,
     &duckduckgo, &duckduckgo_light,
@@ -739,7 +739,7 @@ const PrepopulatedEngine* const engines_SE[] = {
 
 // Singapore
 const PrepopulatedEngine* const engines_SG[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &bing,
     &yahoo_sg,
     &yandex_com,
@@ -747,7 +747,7 @@ const PrepopulatedEngine* const engines_SG[] = {
 
 // Slovenia
 const PrepopulatedEngine* const engines_SI[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &bing,
     &yahoo,
     &duckduckgo, &duckduckgo_light,
@@ -755,7 +755,7 @@ const PrepopulatedEngine* const engines_SI[] = {
 
 // Slovakia
 const PrepopulatedEngine* const engines_SK[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &bing,
     &yahoo,
     &duckduckgo, &duckduckgo_light,
@@ -763,7 +763,7 @@ const PrepopulatedEngine* const engines_SK[] = {
 
 // El Salvador
 const PrepopulatedEngine* const engines_SV[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &bing,
     &yahoo,
     &duckduckgo, &duckduckgo_light,
@@ -771,7 +771,7 @@ const PrepopulatedEngine* const engines_SV[] = {
 
 // Syria
 const PrepopulatedEngine* const engines_SY[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &bing,
     &yahoo,
     &yandex_ru,
@@ -779,7 +779,7 @@ const PrepopulatedEngine* const engines_SY[] = {
 
 // Thailand
 const PrepopulatedEngine* const engines_TH[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &yahoo_th,
     &bing,
     &ask,
@@ -787,7 +787,7 @@ const PrepopulatedEngine* const engines_TH[] = {
 
 // Tunisia
 const PrepopulatedEngine* const engines_TN[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &yahoo,
     &bing,
     &yandex_ru,
@@ -795,7 +795,7 @@ const PrepopulatedEngine* const engines_TN[] = {
 
 // Turkey
 const PrepopulatedEngine* const engines_TR[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &yandex_tr,
     &yahoo_tr,
     &bing,
@@ -803,7 +803,7 @@ const PrepopulatedEngine* const engines_TR[] = {
 
 // Trinidad and Tobago
 const PrepopulatedEngine* const engines_TT[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &bing,
     &yahoo,
     &duckduckgo, &duckduckgo_light,
@@ -811,7 +811,7 @@ const PrepopulatedEngine* const engines_TT[] = {
 
 // Taiwan
 const PrepopulatedEngine* const engines_TW[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &yahoo_tw,
     &bing,
     &baidu,
@@ -819,7 +819,7 @@ const PrepopulatedEngine* const engines_TW[] = {
 
 // Tanzania
 const PrepopulatedEngine* const engines_TZ[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &bing,
     &yahoo,
     &yandex_ru,
@@ -827,7 +827,7 @@ const PrepopulatedEngine* const engines_TZ[] = {
 
 // Ukraine
 const PrepopulatedEngine* const engines_UA[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &yandex_ua,
     &mail_ru,
     &bing,
@@ -835,7 +835,7 @@ const PrepopulatedEngine* const engines_UA[] = {
 
 // United States
 const PrepopulatedEngine* const engines_US[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &bing,
     &yahoo,
     &duckduckgo, &duckduckgo_light,
@@ -843,7 +843,7 @@ const PrepopulatedEngine* const engines_US[] = {
 
 // Uruguay
 const PrepopulatedEngine* const engines_UY[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &bing,
     &yahoo,
     &duckduckgo, &duckduckgo_light,
@@ -851,7 +851,7 @@ const PrepopulatedEngine* const engines_UY[] = {
 
 // Venezuela
 const PrepopulatedEngine* const engines_VE[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &yahoo_ve,
     &bing,
     &duckduckgo, &duckduckgo_light,
@@ -859,7 +859,7 @@ const PrepopulatedEngine* const engines_VE[] = {
 
 // Vietnam
 const PrepopulatedEngine* const engines_VN[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &coccoc,
     &bing,
     &yahoo_vn,
@@ -867,7 +867,7 @@ const PrepopulatedEngine* const engines_VN[] = {
 
 // Yemen
 const PrepopulatedEngine* const engines_YE[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &bing,
     &yahoo,
     &baidu,
@@ -875,7 +875,7 @@ const PrepopulatedEngine* const engines_YE[] = {
 
 // South Africa
 const PrepopulatedEngine* const engines_ZA[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &bing,
     &yahoo,
     &duckduckgo, &duckduckgo_light,
@@ -883,7 +883,7 @@ const PrepopulatedEngine* const engines_ZA[] = {
 
 // Zimbabwe
 const PrepopulatedEngine* const engines_ZW[] = {
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &bing,
     &yahoo,
     &baidu,
@@ -899,7 +899,7 @@ const PrepopulatedEngine* const kAllEngines[] = {
     &coccoc,
     &daum,
     &duckduckgo, &duckduckgo_light,
-    &googleen, &google, &startpage,
+    &googleen, &google, &startpage, &qwant,
     &mail_ru,
     &naver,
     &qwant,
-- 
2.11.0

