diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-10 01:00:25 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-10 01:00:26 +0200 |
| commit | e027c7241f073f5fc8c1db88700cc83635b6454f (patch) | |
| tree | 69920e408b5eeb1547c0241696cfa845af85e4be /mkspecs/macx-clang | |
| parent | b2035d38e8dfdfe2ba8da96df5c1174f01dfbb5b (diff) | |
| parent | 3b85d53913741660473dbc242a48c2ee65d51421 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I0120f804522c0c652e9537b6e9fe08189f071ed2
Diffstat (limited to 'mkspecs/macx-clang')
| -rw-r--r-- | mkspecs/macx-clang/qmake.conf | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/mkspecs/macx-clang/qmake.conf b/mkspecs/macx-clang/qmake.conf index 170464d08f..14c885fd78 100644 --- a/mkspecs/macx-clang/qmake.conf +++ b/mkspecs/macx-clang/qmake.conf @@ -11,13 +11,16 @@ QMAKE_APPLE_DEVICE_ARCHS = x86_64 # configure \ # -pkg-config \ # -fontconfig -system-freetype \ -# -system-xcb -xkb -no-opengl \ -# -qt-xkbcommon -qt-xkbcommon-x11 +# -system-xcb -no-opengl # # 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. # +# If you don't want to use pkg-config, you can add: +# -L/opt/X11/lib -I/opt/X11/include +# to the configure options. +# # Due to irreconcilable differences between Cocoa # and X11, OpenGL is currently not supported. |