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

Add support for building QtWayland on macOS

Browse Source 
Change-Id: Ibed63a01abf32e10a31c610996ae93d3bd9ce153
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
This commit is contained in:
Robert Griebl 2018-05-17 12:58:53 +02:00
parent dbad7bd234
commit 427e5d61b7
4 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mkspecs/common/mac.conf
View File

@ -33,6 +33,13 @@ QMAKE_LIBS_DYNLOAD =
QMAKE_LIBS_OPENGL = -framework OpenGL -framework AGL QMAKE_LIBS_OPENGL = -framework OpenGL -framework AGL
QMAKE_LIBS_THREAD = QMAKE_LIBS_THREAD =
QMAKE_INCDIR_WAYLAND =
QMAKE_LIBS_WAYLAND_CLIENT = -lwayland-client
QMAKE_LIBS_WAYLAND_SERVER = -lwayland-server
QMAKE_LIBDIR_WAYLAND =
QMAKE_DEFINES_WAYLAND =
QMAKE_WAYLAND_SCANNER = wayland-scanner
QMAKE_ACTOOL = actool QMAKE_ACTOOL = actool
QMAKE_DSYMUTIL = dsymutil QMAKE_DSYMUTIL = dsymutil

25
mkspecs/features/wayland-scanner.prf
View File

@ -34,25 +34,32 @@ defineReplace(waylandScannerHeaderFiles) {
return($$wayland_header_files_for_side) return($$wayland_header_files_for_side)
} }
qt_install_headers { # 1) if we are a module, we need to create the headers in our private inc dir in qtbase
# 2) if also qt_install_headers is set, we need to generate INSTALLS rules in addition
# 3) if we are not a module, we just generate the headers in the current directory
!isEmpty(MODULE) {
header_dest = $$MODULE_BASE_OUTDIR/include/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/private header_dest = $$MODULE_BASE_OUTDIR/include/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/private
header_files_client = $$waylandScannerHeaderFiles(client, $$header_dest) header_files_client = $$waylandScannerHeaderFiles(client, $$header_dest)
!isEmpty(header_files_client) { !isEmpty(header_files_client) {
wayland_generated_client_headers.files = $$header_files_client qt_install_headers {
wayland_generated_client_headers.path = $$private_headers.path wayland_generated_client_headers.files = $$header_files_client
wayland_generated_client_headers.CONFIG = no_check_exist wayland_generated_client_headers.path = $$private_headers.path
INSTALLS += wayland_generated_client_headers wayland_generated_client_headers.CONFIG = no_check_exist
INSTALLS += wayland_generated_client_headers
}
WAYLAND_CLIENT_HEADER_DEST = $$header_dest/ WAYLAND_CLIENT_HEADER_DEST = $$header_dest/
WAYLAND_CLIENT_INCLUDE_DIR = $$MODULE_INCNAME/private WAYLAND_CLIENT_INCLUDE_DIR = $$MODULE_INCNAME/private
} }
header_files_server = $$waylandScannerHeaderFiles(server, $$header_dest) header_files_server = $$waylandScannerHeaderFiles(server, $$header_dest)
!isEmpty(header_files_server) { !isEmpty(header_files_server) {
wayland_generated_server_headers.files = $$header_files_server qt_install_headers {
wayland_generated_server_headers.path = $$private_headers.path wayland_generated_server_headers.files = $$header_files_server
wayland_generated_server_headers.CONFIG = no_check_exist wayland_generated_server_headers.path = $$private_headers.path
INSTALLS += wayland_generated_server_headers wayland_generated_server_headers.CONFIG = no_check_exist
INSTALLS += wayland_generated_server_headers
}
WAYLAND_SERVER_HEADER_DEST = $$header_dest/ WAYLAND_SERVER_HEADER_DEST = $$header_dest/
WAYLAND_SERVER_INCLUDE_DIR = $$MODULE_INCNAME/private WAYLAND_SERVER_INCLUDE_DIR = $$MODULE_INCNAME/private
} }

2
src/platformsupport/platformsupport.pro
View File

@ -16,7 +16,7 @@ qtConfig(evdev)|qtConfig(tslib)|qtConfig(libinput)|qtConfig(integrityhid) {
input.depends += devicediscovery input.depends += devicediscovery
} }
if(unix:!darwin)|qtConfig(xcb): \ if(unix:!uikit)|qtConfig(xcb): \
SUBDIRS += services SUBDIRS += services
qtConfig(opengl): \ qtConfig(opengl): \

2
src/platformsupport/themes/themes.pro
View File

@ -6,7 +6,7 @@ CONFIG += static internal_module
DEFINES += QT_NO_CAST_FROM_ASCII DEFINES += QT_NO_CAST_FROM_ASCII
if(unix:!darwin)|qtConfig(xcb): \ if(unix:!uikit)|qtConfig(xcb): \
include($$PWD/genericunix/genericunix.pri) include($$PWD/genericunix/genericunix.pri)
HEADERS += \ HEADERS += \