1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add ATSPI2 library support

Browse Source 
Change-Id: I304ba2b9df65008340b698eb3a74dc3b4abfb826
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
This commit is contained in:
Tobias Hunger 2018-10-29 17:09:14 +01:00
parent b5aaea7998
commit b102b41be7
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmake/FindATSPI2.cmake Normal file
View File

@ -0,0 +1,3 @@
include(FindPkgConfig)
pkg_check_modules(ATSPI2 atspi-2 IMPORTED_TARGET)

4
src/gui/configure.cmake
View File

@ -34,6 +34,8 @@ set_property(CACHE INPUT_xkbcommon_x11 PROPERTY STRINGS undefined no qt system)
#### Libraries #### Libraries
find_package(ATSPI2)
set_package_properties(ATSPI2 PROPERTIES TYPE OPTIONAL)
find_package(Libdrm) find_package(Libdrm)
set_package_properties(Libdrm PROPERTIES TYPE OPTIONAL) set_package_properties(Libdrm PROPERTIES TYPE OPTIONAL)
find_package(OpenGL) find_package(OpenGL)
@ -430,7 +432,7 @@ XCloseDisplay(d);
qt_feature("accessibility_atspi_bridge" PUBLIC PRIVATE qt_feature("accessibility_atspi_bridge" PUBLIC PRIVATE
LABEL "ATSPI Bridge" LABEL "ATSPI Bridge"
CONDITION QT_FEATURE_accessibility AND QT_FEATURE_xcb AND QT_FEATURE_dbus AND libs.atspi OR FIXME CONDITION QT_FEATURE_accessibility AND QT_FEATURE_xcb AND QT_FEATURE_dbus AND ATSPI2_FOUND
) )
qt_feature_definition("accessibility_atspi_bridge" "QT_NO_ACCESSIBILITY_ATSPI_BRIDGE" NEGATE VALUE "1") qt_feature_definition("accessibility_atspi_bridge" "QT_NO_ACCESSIBILITY_ATSPI_BRIDGE" NEGATE VALUE "1")
qt_feature("angle" PUBLIC qt_feature("angle" PUBLIC

1
util/cmake/configurejson2cmake.py
View File

@ -47,6 +47,7 @@ class LibraryMapping:
def map_library(lib: str) -> Union[str, LibraryMapping, List[str]]: def map_library(lib: str) -> Union[str, LibraryMapping, List[str]]:
libmap = { libmap = {
'atspi': 'ATSPI2',
'double-conversion': 'WrapDoubleConversion', 'double-conversion': 'WrapDoubleConversion',
'drm': 'Libdrm', 'drm': 'Libdrm',
'egl': LibraryMapping(package="OpenGL", resultVariable="OpenGL_EGL"), 'egl': LibraryMapping(package="OpenGL", resultVariable="OpenGL_EGL"),