diff options
| author | Gabriel de Dietrich <gabriel.dedietrich@qt.io> | 2017-11-27 12:46:47 -0800 |
|---|---|---|
| committer | Gabriel de Dietrich <gabriel.dedietrich@qt.io> | 2017-12-01 01:19:46 +0000 |
| commit | 32326a4b3b8234f56bb1c5f47b5bdd6c8fec7917 (patch) | |
| tree | 46a0f2e1d9b1aaad0b1e533aab44bcf23ec01a18 /src/gui | |
| parent | 728c325a51d7e7863dc9bbffb730dfce11dc3d68 (diff) | |
macx-clang: Opt-in xcb QPA support with XQuartz
Enable xcb QPA plugin when XQuartz is available. This is done
in a single build, alongside the Cocoa version.
We delegate part of the configuration stage to pkg-config, so
this becomes a requirement. Ensure that
PKG_CONFIG_PATH=/opt/X11/lib/pkgconfig:/opt/X11/share/pkgconfig
is in your environment, or pkg-config is properly set up.
Tested with the following configure options:
configure \
-pkg-config \
-fontconfig -system-freetype \
-system-xcb -xkb -no-opengl \
-qt-xkbcommon -qt-xkbcommon-x11
Change-Id: I2eb5a0491172368afc4c629c540cbef08580348d
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/configure.json | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/gui/configure.json b/src/gui/configure.json index 0a591e110c..a68f2eed16 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -928,7 +928,8 @@ }, "fontconfig": { "label": "Fontconfig", - "condition": "!config.win32 && !config.darwin && features.system-freetype && libs.fontconfig", + "autoDetect": "!config.darwin", + "condition": "!config.win32 && features.system-freetype && libs.fontconfig", "output": [ "privateFeature", "feature" ] }, "gbm": { @@ -1501,6 +1502,13 @@ XKB configuration data. This is required for keyboard input support." }, { "type": "note", + "condition": "features.xcb && config.darwin", + "message": "XCB support on macOS is minimal and untested. Some features will +not work properly or at all (e.g. OpenGL, desktop services or accessibility), +or may depend on your system and XQuartz setup." + }, + { + "type": "note", "condition": "features.accessibility && features.xcb && !features.accessibility-atspi-bridge", "message": "Disabling X11 Accessibility Bridge: D-Bus or AT-SPI is missing." }, |