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

Fix macOS build with -no-feature-accessibility

Browse Source 
Change-Id: Id16b102feb7b57efcf1a36385a009774cb023f41
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
André Klitzing 2019-08-14 15:40:26 +02:00 committed by Jörg Bornemann
parent ec940f898b
commit 88d1909871
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/platforms/cocoa/cocoa.pro
View File

@ -21,8 +21,6 @@ SOURCES += main.mm \
qcocoamenuloader.mm \ qcocoamenuloader.mm \
qcocoahelpers.mm \ qcocoahelpers.mm \
qmultitouch_mac.mm \ qmultitouch_mac.mm \
qcocoaaccessibilityelement.mm \
qcocoaaccessibility.mm \
qcocoacursor.mm \ qcocoacursor.mm \
qcocoaclipboard.mm \ qcocoaclipboard.mm \
qcocoadrag.mm \ qcocoadrag.mm \
@ -57,8 +55,6 @@ HEADERS += qcocoaintegration.h \
qcocoamenuloader.h \ qcocoamenuloader.h \
qcocoahelpers.h \ qcocoahelpers.h \
qmultitouch_mac_p.h \ qmultitouch_mac_p.h \
qcocoaaccessibilityelement.h \
qcocoaaccessibility.h \
qcocoacursor.h \ qcocoacursor.h \
qcocoaclipboard.h \ qcocoaclipboard.h \
qcocoadrag.h \ qcocoadrag.h \
@ -83,13 +79,21 @@ qtConfig(vulkan) {
HEADERS += qcocoavulkaninstance.h HEADERS += qcocoavulkaninstance.h
} }
qtConfig(accessibility) {
QT += accessibility_support-private
SOURCES += qcocoaaccessibilityelement.mm \
qcocoaaccessibility.mm
HEADERS += qcocoaaccessibilityelement.h \
qcocoaaccessibility.h
}
RESOURCES += qcocoaresources.qrc RESOURCES += qcocoaresources.qrc
LIBS += -framework AppKit -framework CoreServices -framework Carbon -framework IOKit -framework QuartzCore -framework CoreVideo -framework Metal -framework IOSurface -lcups LIBS += -framework AppKit -framework CoreServices -framework Carbon -framework IOKit -framework QuartzCore -framework CoreVideo -framework Metal -framework IOSurface -lcups
QT += \ QT += \
core-private gui-private \ core-private gui-private \
accessibility_support-private clipboard_support-private theme_support-private \ clipboard_support-private theme_support-private \
fontdatabase_support-private graphics_support-private fontdatabase_support-private graphics_support-private
qtConfig(vulkan): QT += vulkan_support-private qtConfig(vulkan): QT += vulkan_support-private