diff options
author | Samuel Rødal <samuel.rodal@digia.com> | 2012-11-02 15:08:25 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-07 08:42:29 +0100 |
commit | 04f6edc37947dee62bf735e39aa5ae9cf5a637c7 (patch) | |
tree | e00bb11596246af2765ac9726db92e2ac1b69426 /configure | |
parent | 565b6bd6354f9edd63e493aa41087550b4e08ae5 (diff) |
Resolve xcb_poll_for_queued_event at run-time.
By not making this a compile time decision we ensure forward
compatibility for older xcb versions if the xcb plugin is built against
a newer xcb.
Change-Id: I744777d53bf7b8deb6eff372494f4403d19d364c
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 12 |
1 files changed, 1 insertions, 11 deletions
@@ -803,7 +803,6 @@ CFG_XINPUT=runtime CFG_XKB=auto CFG_XCB=auto CFG_XCB_GLX=no -CFG_XCB_LIMITED=yes CFG_EGLFS=auto CFG_DIRECTFB=auto CFG_LINUXFB=auto @@ -4815,11 +4814,6 @@ if [ "$CFG_XCB" != "no" ]; then QT_CONFIG="$QT_CONFIG xcb-glx" fi - if compileTest qpa/xcb-poll-for-queued-event "xcb-poll-for-queued-event" $QMAKE_CFLAGS_XCB $QMAKE_LIBS_XCB; then - CFG_XCB_LIMITED=no - QT_CONFIG="$QT_CONFIG xcb-poll-for-queued-event" - fi - if compileTest qpa/xcb-xlib "xcb-xlib" $QMAKE_CFLAGS_XCB $QMAKE_LIBS_XCB; then QT_CONFIG="$QT_CONFIG xcb-xlib" fi @@ -6308,11 +6302,7 @@ if [ "$BUILD_ON_MAC" = "yes" ]; then fi echo "libICU support ......... $CFG_ICU" echo "PCRE support ........... $CFG_PCRE" -if [ "$CFG_XCB_LIMITED" = "yes" ] && [ "$CFG_XCB" = "yes" ]; then - echo "Xcb support ............ limited (old version)" -else - echo "Xcb support ............ $CFG_XCB" -fi +echo "Xcb support ............ $CFG_XCB" echo "Xrender support ........ $CFG_XRENDER" if [ "$XPLATFORM_MAEMO" = "yes" ] && [ "$CFG_XCB" = "yes" ]; then echo "XInput2 support ........ $CFG_XINPUT2" |