diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2013-03-21 13:08:09 -0700 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-23 04:33:11 +0100 |
| commit | 7067c3268a6838fcfa7d2e7584f4296e71d947ec (patch) | |
| tree | c86dc8b97858a21a5539496315817b0fd941184d /configure | |
| parent | 93acff78831be7a6a69613306ad96a74752f13cd (diff) | |
Suppress warning about xkbcommon unless we're building XCB
I don't need that warning on my Mac.
Change-Id: I18c06135ba88a037103fdda0982976f4a87c553e
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Reviewed-by: Gatis Paeglis <gatis.paeglis@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -5217,8 +5217,8 @@ if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists "xkbcommon >= 0.2.0" 2>/dev/null QMAKE_CFLAGS_XKBCOMMON="`$PKG_CONFIG --cflags xkbcommon 2>/dev/null`" QMAKE_LIBS_XKBCOMMON="`$PKG_CONFIG --libs xkbcommon 2>/dev/null`" QT_CONFIG="$QT_CONFIG xkbcommon" -else - echo "WARNING: Qt requires the libxkbcommon version 0.2.0 (or higher)." +elif [ "$CFG_XCB" != "no" ]; then + echo "WARNING: XCB support enabled but libxkbcommon 0.2.0 (or higher) not found." echo "Not satisfying this requirement will disable the compose key functionality," echo "which includes text input with dead keys." QMakeVar add DEFINES QT_NO_XKBCOMMON |