diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-16 09:19:06 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-04-16 09:19:06 +0000 |
| commit | 9195fc57faffde9682ef5b88ab89d07042ee194c (patch) | |
| tree | 5a42e9cc50c9fd11ef2d0270f780604814a4cb4d /src | |
| parent | 0504f954a33b5f287b37a9ea931c628aedd87452 (diff) | |
| parent | 031935bf9a5de495d85358a364fbec022d059b46 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.4' into 5.5" into refs/staging/5.5
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/browser_accessibility_manager_qt.cpp | 6 | ||||
| -rw-r--r-- | src/core/browser_accessibility_qt.cpp | 1 | ||||
| -rw-r--r-- | src/webenginewidgets/api/qwebenginepage.cpp | 1 |
3 files changed, 7 insertions, 1 deletions
diff --git a/src/core/browser_accessibility_manager_qt.cpp b/src/core/browser_accessibility_manager_qt.cpp index 7b0e8b49e..7c59db110 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 5b787b67d..7cd5ac21f 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 55bd67e5e..1b5a243df 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> |