summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2015-04-16 09:19:06 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2015-04-16 09:19:06 +0000
commit9195fc57faffde9682ef5b88ab89d07042ee194c (patch)
tree5a42e9cc50c9fd11ef2d0270f780604814a4cb4d
parent0504f954a33b5f287b37a9ea931c628aedd87452 (diff)
parent031935bf9a5de495d85358a364fbec022d059b46 (diff)
Merge "Merge remote-tracking branch 'origin/5.4' into 5.5" into refs/staging/5.5
-rw-r--r--examples/webenginewidgets/browser/data/defaultbookmarks.xbel6
-rw-r--r--src/core/browser_accessibility_manager_qt.cpp6
-rw-r--r--src/core/browser_accessibility_qt.cpp1
-rw-r--r--src/webenginewidgets/api/qwebenginepage.cpp1
4 files changed, 10 insertions, 4 deletions
diff --git a/examples/webenginewidgets/browser/data/defaultbookmarks.xbel b/examples/webenginewidgets/browser/data/defaultbookmarks.xbel
index 65b0b841..fef7f551 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 7b0e8b49..7c59db11 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 5b787b67..7cd5ac21 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 55bd67e5..1b5a243d 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>