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

Add the 'accessiblebridge' as a plugintype of gui module

Browse Source 
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>
This commit is contained in:
JeongBong Seo 2015-04-30 15:04:57 +09:00 committed by Dominik Holland
parent 3279c8e7d7
commit ea86f19319
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/.prev_CMakeLists.txt
View File

@ -6,8 +6,9 @@
qt_add_module(Gui qt_add_module(Gui
GENERATE_METATYPES 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 SOURCES
image/qabstractfileiconengine.cpp image/qabstractfileiconengine_p.h
image/qbitmap.cpp image/qbitmap.h image/qbitmap.cpp image/qbitmap.h
image/qbmphandler.cpp image/qbmphandler_p.h image/qbmphandler.cpp image/qbmphandler_p.h
image/qicon.cpp image/qicon.h image/qicon_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 SOURCES
accessible/qaccessible.cpp accessible/qaccessible.h accessible/qaccessible.cpp accessible/qaccessible.h
accessible/qaccessiblebridge.cpp accessible/qaccessiblebridge.h accessible/qaccessiblebridge.cpp accessible/qaccessiblebridge.h
accessible/qaccessiblebridgeutils.cpp accessible/qaccessiblebridgeutils_p.h
accessible/qaccessiblecache.cpp accessible/qaccessiblecache_p.h accessible/qaccessiblecache.cpp accessible/qaccessiblecache_p.h
accessible/qaccessibleobject.cpp accessible/qaccessibleobject.h accessible/qaccessibleobject.cpp accessible/qaccessibleobject.h
accessible/qaccessibleplugin.cpp accessible/qaccessibleplugin.h accessible/qaccessibleplugin.cpp accessible/qaccessibleplugin.h

4
src/gui/CMakeLists.txt
View File

@ -53,17 +53,17 @@ endif()
qt_add_module(Gui qt_add_module(Gui
GENERATE_METATYPES 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: FEATURE_DEPENDENCIES # special case:
Qt::Network # special case: Qt::Network # special case:
QMAKE_MODULE_CONFIG "${qmake_module_config}" # special case QMAKE_MODULE_CONFIG "${qmake_module_config}" # special case
SOURCES SOURCES
image/qabstractfileiconengine.cpp image/qabstractfileiconengine_p.h
image/qbitmap.cpp image/qbitmap.h image/qbitmap.cpp image/qbitmap.h
image/qbmphandler.cpp image/qbmphandler_p.h image/qbmphandler.cpp image/qbmphandler_p.h
image/qicon.cpp image/qicon.h image/qicon_p.h image/qicon.cpp image/qicon.h image/qicon_p.h
image/qiconengine.cpp image/qiconengine.h image/qiconengine.cpp image/qiconengine.h
image/qiconengineplugin.cpp image/qiconengineplugin.h image/qiconengineplugin.cpp image/qiconengineplugin.h
image/qabstractfileiconengine.cpp image/qabstractfileiconengine_p.h
image/qiconloader.cpp image/qiconloader_p.h image/qiconloader.cpp image/qiconloader_p.h
image/qimage.cpp image/qimage.h image/qimage_p.h image/qimage.cpp image/qimage.h image/qimage_p.h
image/qimage_conversions.cpp image/qimage_conversions.cpp

1
src/gui/gui.pro
View File

@ -8,6 +8,7 @@ DEFINES += QT_NO_USING_NAMESPACE QT_NO_FOREACH
QMAKE_DOCS = $$PWD/doc/qtgui.qdocconf QMAKE_DOCS = $$PWD/doc/qtgui.qdocconf
MODULE_PLUGIN_TYPES = \ MODULE_PLUGIN_TYPES = \
accessiblebridge \
platforms \ platforms \
platforms/darwin \ platforms/darwin \
xcbglintegrations \ xcbglintegrations \