diff options
author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-06-01 16:51:15 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-06-03 10:27:01 +0000 |
commit | 2f68d08be08715a51f6d3f9ce1fae5843b3c17af (patch) | |
tree | 3c7361e7bf0c6e67a90e91938f4ceecbbc5b1f4c /config.tests | |
parent | 3726aed78868e4ecce4ea6af17f3fcdd7a8cf0b6 (diff) | |
download | qtbase-2f68d08be08715a51f6d3f9ce1fae5843b3c17af.tar.gz |
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 <gatis.paeglis@qt.io>
Diffstat (limited to 'config.tests')
-rw-r--r-- | config.tests/qpa/xcb-syslibs/xcb.cpp | 3 | ||||
-rw-r--r-- | 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; } |