diff options
| author | Tom Cooksey <thomas.cooksey@nokia.com> | 2009-04-01 11:07:16 +0200 |
|---|---|---|
| committer | Tom Cooksey <thomas.cooksey@nokia.com> | 2009-04-03 13:40:34 +0200 |
| commit | b652130dc00dfab7322751275e42f59943c7e8e3 (patch) | |
| tree | 656ac90ae4e61ff2d189f525ea7185c5bdd07e4d | |
| parent | dcff85182dda913b45867e27fde3f37e61ae86d6 (diff) | |
| download | qt4-tools-b652130dc00dfab7322751275e42f59943c7e8e3.tar.gz | |
Add config test for XLib
Previously, it was entirely possible to successfully configure Qt/X11
without any X11 installed. The problems would only start showing up once
you stated building. This is not very useful if you're cross-compiling
and trying to setup the paths correctly.
Reviewed-by: Denis
| -rw-r--r-- | config.tests/x11/xlib/xlib.cpp | 9 | ||||
| -rw-r--r-- | config.tests/x11/xlib/xlib.pro | 3 | ||||
| -rwxr-xr-x | configure | 8 |
3 files changed, 20 insertions, 0 deletions
diff --git a/config.tests/x11/xlib/xlib.cpp b/config.tests/x11/xlib/xlib.cpp new file mode 100644 index 0000000000..8d25bf57c0 --- /dev/null +++ b/config.tests/x11/xlib/xlib.cpp @@ -0,0 +1,9 @@ +#include <X11/Xlib.h> + +int main(int, char **) +{ + Display *d = XOpenDisplay(NULL); + XCloseDisplay(d); + return 0; +} + diff --git a/config.tests/x11/xlib/xlib.pro b/config.tests/x11/xlib/xlib.pro new file mode 100644 index 0000000000..658161ed9d --- /dev/null +++ b/config.tests/x11/xlib/xlib.pro @@ -0,0 +1,3 @@ +CONFIG += x11 +CONFIG -= qt +SOURCES = xlib.cpp @@ -4727,6 +4727,14 @@ if [ "$PLATFORM_X11" = "yes" ]; then X11TESTS_FLAGS="$X11TESTS_FLAGS -fpermissive" fi + # Check we actually have X11 :-) + if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xlib "XLib" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then + echo "Basic XLib functionality test failed!" + echo " You might need to modify the include and library search paths by editing" + echo " QMAKE_INCDIR_X11 and QMAKE_LIBDIR_X11 in ${XQMAKESPEC}." + exit 1 + fi + # auto-detect OpenGL support (es1 = OpenGL ES 1.x Common, es1cl = ES 1.x common lite, es2 = OpenGL ES 2.x) if [ "$CFG_OPENGL" = "auto" ] || [ "$CFG_OPENGL" = "yes" ]; then if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/opengl "OpenGL" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then |