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 /mkspecs/macx-clang | |
| 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 'mkspecs/macx-clang')
| -rw-r--r-- | mkspecs/macx-clang/qmake.conf | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/mkspecs/macx-clang/qmake.conf b/mkspecs/macx-clang/qmake.conf index e34c08954d..259595221f 100644 --- a/mkspecs/macx-clang/qmake.conf +++ b/mkspecs/macx-clang/qmake.conf @@ -6,6 +6,25 @@ QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.10 QMAKE_APPLE_DEVICE_ARCHS = x86_64 +# Opt-in xcb QPA support with XQuartz: +# +# configure \ +# -pkg-config \ +# -fontconfig -system-freetype \ +# -system-xcb -xkb -no-opengl \ +# -qt-xkbcommon -qt-xkbcommon-x11 +# +# Ensure that pkg-config is properly configured, or that +# PKG_CONFIG_PATH=/opt/X11/lib/pkgconfig:/opt/X11/share/pkgconfig +# is set in your build environment. +# +# Due to irreconcilable differences between Cocoa +# and X11, OpenGL is currently not supported. + +QMAKE_LIBS_X11 = -lX11 -lXext -lm +QMAKE_LIBDIR_X11 = /opt/X11/lib +QMAKE_INCDIR_X11 = /opt/X11/include + include(../common/macx.conf) include(../common/gcc-base-mac.conf) include(../common/clang.conf) |