From 9e733622a605c841adf7da7304895758d307c843 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Thu, 2 Jul 2020 10:04:34 +0200 Subject: Move linuxaccessibility to QtGui MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change some too-generic file names. Task-number: QTBUG-83255 Change-Id: I4497ee2508bc323566f4061d4547707b7bda7a77 Reviewed-by: Tor Arne Vestbø --- src/gui/.prev_CMakeLists.txt | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) (limited to 'src/gui/.prev_CMakeLists.txt') diff --git a/src/gui/.prev_CMakeLists.txt b/src/gui/.prev_CMakeLists.txt index 31eb39fb95..a4820965e7 100644 --- a/src/gui/.prev_CMakeLists.txt +++ b/src/gui/.prev_CMakeLists.txt @@ -399,6 +399,23 @@ 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 + DBUS_ADAPTOR_SOURCES + accessibility_adaptors + DBUS_INTERFACE_SOURCES + accessibility_interfaces + PUBLIC_LIBRARIES + PkgConfig::ATSPI2_nolink +) + qt_extend_target(Gui CONDITION QT_FEATURE_action SOURCES kernel/qaction.cpp kernel/qaction.h kernel/qaction_p.h @@ -433,7 +450,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) @@ -676,7 +693,7 @@ qt_extend_target(Gui CONDITION QT_FEATURE_vulkan Vulkan::Vulkan_nolink ) -#### Keys ignored in scope 99:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vkgen: +#### Keys ignored in scope 101:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vkgen: # QMAKE_EXTRA_COMPILERS = "qvkgen_h" "qvkgen_ph" "qvkgen_pimpl" # QMAKE_QVKGEN_INPUT = "vulkan/vk.xml" # QMAKE_QVKGEN_LICENSE_HEADER = "$$QT_SOURCE_TREE/header.LGPL" @@ -692,10 +709,10 @@ qt_extend_target(Gui CONDITION QT_FEATURE_vulkan # 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 -- cgit v1.2.3