diff --git a/examples/webenginewidgets/browser/data/defaultbookmarks.xbel b/examples/webenginewidgets/browser/data/defaultbookmarks.xbel index 65b0b84152a7109742c88be48d000b4d31d7d36b..fef7f55148f28181fe60746ce27d97f8955a850d 100644 --- a/examples/webenginewidgets/browser/data/defaultbookmarks.xbel +++ b/examples/webenginewidgets/browser/data/defaultbookmarks.xbel @@ -6,10 +6,10 @@ <bookmark href="http://qt.io/"> <title>Qt Home Page</title> </bookmark> - <bookmark href="http://qt-project.org/doc/"> + <bookmark href="http://doc.qt.io/"> <title>Qt Documentation</title> </bookmark> - <bookmark href="http://planet.qt-project.org/"> + <bookmark href="http://planet.qt.io/"> <title>Qt Blog</title> </bookmark> <bookmark href="http://www.qtcentre.org/"> @@ -18,7 +18,7 @@ <bookmark href="http://qt-apps.org/"> <title>Qt-Apps.org</title> </bookmark> - <bookmark href="http://wiki.qt.io/?title=OnlineCommunities"> + <bookmark href="http://wiki.qt.io/OnlineCommunities"> <title>Online Communities</title> </bookmark> <bookmark href="http://www.chromium.org/"> diff --git a/src/core/browser_accessibility_manager_qt.cpp b/src/core/browser_accessibility_manager_qt.cpp index 7b0e8b49ee322323dc29bba03682c01bf454163c..7c59db110547d6447d3b2f56233059057212abf4 100644 --- a/src/core/browser_accessibility_manager_qt.cpp +++ b/src/core/browser_accessibility_manager_qt.cpp @@ -55,12 +55,16 @@ BrowserAccessibilityManager* BrowserAccessibilityManager::Create( #endif // QT_NO_ACCESSIBILITY } -#ifndef QT_NO_ACCESSIBILITY BrowserAccessibility *BrowserAccessibilityFactoryQt::Create() { +#ifndef QT_NO_ACCESSIBILITY return new BrowserAccessibilityQt(); +#else + return 0; +#endif // QT_NO_ACCESSIBILITY } +#ifndef QT_NO_ACCESSIBILITY BrowserAccessibilityManagerQt::BrowserAccessibilityManagerQt( QObject* parentObject, const ui::AXTreeUpdate& initialTree, diff --git a/src/core/browser_accessibility_qt.cpp b/src/core/browser_accessibility_qt.cpp index 5b787b67dd616428e6fb328121ede6aaf730f6b8..7cd5ac21f842d55b09b6ce5f373c5f40a823d30e 100644 --- a/src/core/browser_accessibility_qt.cpp +++ b/src/core/browser_accessibility_qt.cpp @@ -39,6 +39,7 @@ // found in the LICENSE file. #include "browser_accessibility_qt.h" + #ifndef QT_NO_ACCESSIBILITY #include "third_party/WebKit/public/web/WebAXEnums.h" diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp index 55bd67e5e74381e184706b81db911ff4a17a52bc..1b5a243df52cfb08620bd0b3698330e0d384f2db 100644 --- a/src/webenginewidgets/api/qwebenginepage.cpp +++ b/src/webenginewidgets/api/qwebenginepage.cpp @@ -46,6 +46,7 @@ #include <QApplication> #include <QAuthenticator> #include <QClipboard> +#include <QContextMenuEvent> #include <QFileDialog> #include <QKeyEvent> #include <QIcon>