summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeongBong Seo <jb.seo@lge.com>2015-04-30 15:04:57 +0900
committerDominik Holland <dominik.holland@qt.io>2020-06-08 09:34:02 +0200
commitea86f1931991fed9034e67399a2a88c7939eca6c (patch)
treeb77b139a513f5cb19b9c2e0ae7eb1a0b182f5039
parent3279c8e7d72c5eee379fa8e4a2789acfe40445c0 (diff)
Add the 'accessiblebridge' as a plugintype of gui module
This patch makes the 'accesiblebridge' plugin configurable. Change-Id: I99f01fcd434be25bbbe5460bbc8cc1d76aa744b9 Task-number: QTBUG-83126 Pick-to: 5.15 Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
-rw-r--r--src/gui/.prev_CMakeLists.txt4
-rw-r--r--src/gui/CMakeLists.txt4
-rw-r--r--src/gui/gui.pro1
3 files changed, 6 insertions, 3 deletions
diff --git a/src/gui/.prev_CMakeLists.txt b/src/gui/.prev_CMakeLists.txt
index 6670408378..36f4334fdc 100644
--- a/src/gui/.prev_CMakeLists.txt
+++ b/src/gui/.prev_CMakeLists.txt
@@ -6,8 +6,9 @@
qt_add_module(Gui
GENERATE_METATYPES
- PLUGIN_TYPES platforms platforms/darwin xcbglintegrations platformthemes platforminputcontexts generic iconengines imageformats egldeviceintegrations
+ PLUGIN_TYPES accessiblebridge platforms platforms/darwin xcbglintegrations platformthemes platforminputcontexts generic iconengines imageformats egldeviceintegrations
SOURCES
+ image/qabstractfileiconengine.cpp image/qabstractfileiconengine_p.h
image/qbitmap.cpp image/qbitmap.h
image/qbmphandler.cpp image/qbmphandler_p.h
image/qicon.cpp image/qicon.h image/qicon_p.h
@@ -352,6 +353,7 @@ qt_extend_target(Gui CONDITION QT_FEATURE_accessibility
SOURCES
accessible/qaccessible.cpp accessible/qaccessible.h
accessible/qaccessiblebridge.cpp accessible/qaccessiblebridge.h
+ accessible/qaccessiblebridgeutils.cpp accessible/qaccessiblebridgeutils_p.h
accessible/qaccessiblecache.cpp accessible/qaccessiblecache_p.h
accessible/qaccessibleobject.cpp accessible/qaccessibleobject.h
accessible/qaccessibleplugin.cpp accessible/qaccessibleplugin.h
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index 3c844c7f51..246e8aef2c 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -53,17 +53,17 @@ endif()
qt_add_module(Gui
GENERATE_METATYPES
- PLUGIN_TYPES platforms platforms/darwin xcbglintegrations platformthemes platforminputcontexts generic iconengines imageformats egldeviceintegrations
+ PLUGIN_TYPES accessiblebridge platforms platforms/darwin xcbglintegrations platformthemes platforminputcontexts generic iconengines imageformats egldeviceintegrations
FEATURE_DEPENDENCIES # special case:
Qt::Network # special case:
QMAKE_MODULE_CONFIG "${qmake_module_config}" # special case
SOURCES
+ image/qabstractfileiconengine.cpp image/qabstractfileiconengine_p.h
image/qbitmap.cpp image/qbitmap.h
image/qbmphandler.cpp image/qbmphandler_p.h
image/qicon.cpp image/qicon.h image/qicon_p.h
image/qiconengine.cpp image/qiconengine.h
image/qiconengineplugin.cpp image/qiconengineplugin.h
- image/qabstractfileiconengine.cpp image/qabstractfileiconengine_p.h
image/qiconloader.cpp image/qiconloader_p.h
image/qimage.cpp image/qimage.h image/qimage_p.h
image/qimage_conversions.cpp
diff --git a/src/gui/gui.pro b/src/gui/gui.pro
index 5ca16b169a..4e79e31e6e 100644
--- a/src/gui/gui.pro
+++ b/src/gui/gui.pro
@@ -8,6 +8,7 @@ DEFINES += QT_NO_USING_NAMESPACE QT_NO_FOREACH
QMAKE_DOCS = $$PWD/doc/qtgui.qdocconf
MODULE_PLUGIN_TYPES = \
+ accessiblebridge \
platforms \
platforms/darwin \
xcbglintegrations \