diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-07-02 10:04:34 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-07-06 11:15:08 +0200 |
| commit | 9e733622a605c841adf7da7304895758d307c843 (patch) | |
| tree | e859f7cf4dee099c49835c65e5c0498bcec6f87c /src/gui/CMakeLists.txt | |
| parent | 7067b2ca6e08e683bb9c202a7e3c1b10d08622ee (diff) | |
Move linuxaccessibility to QtGui
Change some too-generic file names.
Task-number: QTBUG-83255
Change-Id: I4497ee2508bc323566f4061d4547707b7bda7a77
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/gui/CMakeLists.txt')
| -rw-r--r-- | src/gui/CMakeLists.txt | 31 |
1 files changed, 28 insertions, 3 deletions
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index db6f463c0b..21dc18721e 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -487,6 +487,31 @@ qt_extend_target(Gui CONDITION QT_FEATURE_accessibility AND WIN32 accessible/windows/apisupport/uiatypes_p.h ) +qt_extend_target(Gui CONDITION QT_FEATURE_accessibility AND QT_FEATURE_accessibility_atspi_bridge + SOURCES + accessible/linux/atspiadaptor.cpp accessible/linux/atspiadaptor_p.h + accessible/linux/dbusconnection.cpp accessible/linux/dbusconnection_p.h + accessible/linux/qspi_constant_mappings.cpp accessible/linux/qspi_constant_mappings_p.h + accessible/linux/qspi_struct_marshallers.cpp accessible/linux/qspi_struct_marshallers_p.h + accessible/linux/qspiaccessiblebridge.cpp accessible/linux/qspiaccessiblebridge_p.h + accessible/linux/qspiapplicationadaptor.cpp accessible/linux/qspiapplicationadaptor_p.h + accessible/linux/qspidbuscache.cpp accessible/linux/qspidbuscache_p.h +# special case begin + DBUS_ADAPTOR_SOURCES + accessible/linux/dbusxml/Cache.xml + accessible/linux/dbusxml/DeviceEventController.xml + DBUS_ADAPTOR_FLAGS + "-i" "QtGui/private/qspi_struct_marshallers_p.h" + DBUS_INTERFACE_SOURCES + accessible/linux/dbusxml/Bus.xml + accessible/linux/dbusxml/Socket.xml + DBUS_INTERFACE_FLAGS + "-i" "QtGui/private/qspi_struct_marshallers_p.h" +# special case end + PUBLIC_LIBRARIES + PkgConfig::ATSPI2_nolink +) + qt_extend_target(Gui CONDITION QT_FEATURE_action SOURCES kernel/qaction.cpp kernel/qaction.h kernel/qaction_p.h @@ -521,7 +546,7 @@ qt_extend_target(Gui CONDITION QT_FEATURE_png WrapPNG::WrapPNG ) -#### Keys ignored in scope 38:.:image:image/image.pri:WIN32 AND MINGW: +#### Keys ignored in scope 40:.:image:image/image.pri:WIN32 AND MINGW: # GCC_VERSION = "$${QMAKE_GCC_MAJOR_VERSION}.$${QMAKE_GCC_MINOR_VERSION}.$${QMAKE_GCC_PATCH_VERSION}" qt_extend_target(Gui CONDITION ((QT_FEATURE_png) AND (WIN32 AND MINGW)) AND (GCC_VERSION___equals___8.1.0) @@ -839,10 +864,10 @@ add_custom_command( # qvkgen_pimpl.input = "QMAKE_QVKGEN_INPUT" # qvkgen_pimpl.output = "$$OUT_PWD/vulkan/qvulkanfunctions_p.cpp" -#### Keys ignored in scope 100:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vulkan: +#### Keys ignored in scope 102:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vulkan: # qvkgen_h.variable_out = "HEADERS" -#### Keys ignored in scope 101:.:vulkan:vulkan/vulkan.pri:else: +#### Keys ignored in scope 103:.:vulkan:vulkan/vulkan.pri:else: # qvkgen_h.CONFIG = "target_predeps" "no_link" qt_extend_target(Gui CONDITION WASM |