diff options
| author | Andras Becsi <andras.becsi@theqtcompany.com> | 2015-04-15 12:19:47 +0200 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@theqtcompany.com> | 2015-04-15 12:36:22 +0200 |
| commit | 031935bf9a5de495d85358a364fbec022d059b46 (patch) | |
| tree | 5ab832b132369fa4bd552f69f16f824ae4f65d07 /src/core | |
| parent | d65bd6b6bad8de8eeebf88ba6ccd93a50f78a172 (diff) | |
| parent | b0c48cb3a0c9630899a357fb8a01ba13ccad5395 (diff) | |
Merge remote-tracking branch 'origin/5.4' into 5.5
Change-Id: I1e414bb2252ee4b2204ef50a9d122d1d1504115d
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/browser_accessibility_manager_qt.cpp | 6 | ||||
| -rw-r--r-- | src/core/browser_accessibility_qt.cpp | 1 |
2 files changed, 6 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" |