diff options
| author | Kai Koehne <kai.koehne@digia.com> | 2012-10-29 12:59:09 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-07 16:55:50 +0100 |
| commit | 21bd66e1ea06e466754ab06ee2c5f8b737bb4bd7 (patch) | |
| tree | 2680ca806c003ca2b37d3f6c8b5431f51a3695fe /config.tests/qpa/xcb | |
| parent | f4121624e9067078249f0fad171c1f8c98271877 (diff) | |
Add configure option to minimize xcb runtime dependencies
Some of the xcb- libraries we depend upon are not (yet) common across
distributions. This is problematic for binaries that should be working
on different distributions. The patch mitigates this by:
Adding the files from
libxcb-proto (version 0.1.6), compiled with libxcb-1.5
xcb-util (version 0.3.9)
xcb-util-image (version 0.3.9)
xcb-util-keysyms (version 0.3.9)
xcb-util-renderutil (version 0.3.8)
xcb-util-wm (version 0.3.9)
from xcb.freedesktop.org/dist to src/3rdparty/xcb.
Adding a configure option '-qt-xcb' to use the sources instead of
linking to the respective runtime libraries.
Task-number: QTBUG-27803
Change-Id: I6ea87daa382871b2b9072a601511523fa0b9f44b
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Diffstat (limited to 'config.tests/qpa/xcb')
| -rw-r--r-- | config.tests/qpa/xcb/xcb.cpp | 19 | ||||
| -rw-r--r-- | config.tests/qpa/xcb/xcb.pro | 2 |
2 files changed, 2 insertions, 19 deletions
diff --git a/config.tests/qpa/xcb/xcb.cpp b/config.tests/qpa/xcb/xcb.cpp index 0a59ba708f..8f46e4c5d0 100644 --- a/config.tests/qpa/xcb/xcb.cpp +++ b/config.tests/qpa/xcb/xcb.cpp @@ -41,26 +41,9 @@ #include <xcb/xcb.h> -// FIXME This workaround can be removed for xcb-icccm > 3.8 -#define class class_name -#include <xcb/xcb_icccm.h> -#undef class - -#include <xcb/xfixes.h> -#include <xcb/xcb_image.h> -#include <xcb/xcb_keysyms.h> -#include <xcb/sync.h> -#include <xcb/randr.h> -#include <xcb/shm.h> - int main(int, char **) { int primaryScreen = 0; - - xcb_connection_t *connection = xcb_connect("", &primaryScreen); - - // This won't compile unless libxcb >= 1.5 which defines XCB_ATOM_PRIMARY. - int xcbAtomPrimary = XCB_ATOM_PRIMARY; - + xcb_connection_t *t = xcb_connect("", &primaryScreen); return 0; } diff --git a/config.tests/qpa/xcb/xcb.pro b/config.tests/qpa/xcb/xcb.pro index 23eedb03a7..a48fdbd15f 100644 --- a/config.tests/qpa/xcb/xcb.pro +++ b/config.tests/qpa/xcb/xcb.pro @@ -1,5 +1,5 @@ SOURCES = xcb.cpp CONFIG -= qt -LIBS += -lxcb -lxcb-image -lxcb-keysyms -lxcb-icccm -lxcb-sync -lxcb-xfixes -lxcb-randr +LIBS += -lxcb |