1 files changed, 25 insertions, 15 deletions
diff --git a/src/core/web_engine_settings.h b/src/core/web_engine_settings.h
index 3036a31a6..e131af50c 100644
--- a/src/core/web_engine_settings.h
+++ b/src/core/web_engine_settings.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtWebEngine module of the Qt Toolkit.
 **
@@ -11,24 +11,27 @@
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
 ** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
 ** packaging of this file. Please review the following information to
 ** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -72,6 +75,12 @@ public:
         ErrorPageEnabled,
         PluginsEnabled,
         FullScreenSupportEnabled,
+        ScreenCaptureEnabled,
+        WebGLEnabled,
+        Accelerated2dCanvasEnabled,
+        AutoLoadIconsForPage,
+        TouchIconsEnabled,
+        AllowRunningInsecureContent
     };
 
     // Must match the values from the public API in qwebenginesettings.h.
@@ -81,7 +90,8 @@ public:
         SerifFont,
         SansSerifFont,
         CursiveFont,
-        FantasyFont
+        FantasyFont,
+        PictographFont
     };
 
     // Must match the values from the public API in qwebenginesettings.h.
@@ -135,9 +145,9 @@ private:
     WebEngineSettings *parentSettings;
     QSet<WebEngineSettings *> childSettings;
 
-    static QHash<Attribute, bool> m_defaultAttributes;
-    static QHash<FontFamily, QString> m_defaultFontFamilies;
-    static QHash<FontSize, int> m_defaultFontSizes;
+    static QHash<Attribute, bool> s_defaultAttributes;
+    static QHash<FontFamily, QString> s_defaultFontFamilies;
+    static QHash<FontSize, int> s_defaultFontSizes;
 
     friend class BatchTimer;
     friend class WebContentsAdapter;