From 2f68d08be08715a51f6d3f9ce1fae5843b3c17af Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 1 Jun 2016 16:51:15 +0200 Subject: move xcb 1.5 compile check from qpa/xcb-syslibs to qpa/xcb the test should be executed in every case. configure's use of pkg-config implies that intention. Change-Id: I722c88da5c2a0f2cc1f926d796093b78cd79bea8 Reviewed-by: Gatis Paeglis --- config.tests/qpa/xcb-syslibs/xcb.cpp | 3 --- config.tests/qpa/xcb/xcb.cpp | 4 ++++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/config.tests/qpa/xcb-syslibs/xcb.cpp b/config.tests/qpa/xcb-syslibs/xcb.cpp index 0e1bd76e6c..00d0da1b6c 100644 --- a/config.tests/qpa/xcb-syslibs/xcb.cpp +++ b/config.tests/qpa/xcb-syslibs/xcb.cpp @@ -57,8 +57,5 @@ int main(int, char **) 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; - return 0; } diff --git a/config.tests/qpa/xcb/xcb.cpp b/config.tests/qpa/xcb/xcb.cpp index a5b419e695..efb4f0ca2e 100644 --- a/config.tests/qpa/xcb/xcb.cpp +++ b/config.tests/qpa/xcb/xcb.cpp @@ -43,5 +43,9 @@ int main(int, char **) { int primaryScreen = 0; xcb_connection_t *t = xcb_connect("", &primaryScreen); + + // This won't compile unless libxcb >= 1.5 which defines XCB_ATOM_PRIMARY. + int xcbAtomPrimary = XCB_ATOM_PRIMARY; + return 0; } -- cgit v1.2.3