From 647aa53d72ad15f39dea676b97f6b4b21f8c9143 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Mon, 13 Feb 2012 14:35:58 +0100 Subject: Don't hard-code paths to /usr/X11R6 in linux-mkspecs It was causing issues when cross-compiling with a sysroot, as the paths were not prefixed with the sysroot. The right include paths should be taken care of by pkgconfig anyways. Change-Id: I2cf7bf6377c88e6bf3b015100444d082530337ec Reviewed-by: Thiago Macieira --- mkspecs/common/linux.conf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'mkspecs/common') diff --git a/mkspecs/common/linux.conf b/mkspecs/common/linux.conf index de28ec7d1f..0771bb79eb 100644 --- a/mkspecs/common/linux.conf +++ b/mkspecs/common/linux.conf @@ -7,12 +7,12 @@ QMAKE_CXXFLAGS_THREAD += $$QMAKE_CFLAGS_THREAD QMAKE_INCDIR = QMAKE_LIBDIR = -QMAKE_INCDIR_X11 = /usr/X11R6/include -QMAKE_LIBDIR_X11 = /usr/X11R6/lib +QMAKE_INCDIR_X11 = +QMAKE_LIBDIR_X11 = QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] -QMAKE_INCDIR_OPENGL = /usr/X11R6/include -QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib +QMAKE_INCDIR_OPENGL = +QMAKE_LIBDIR_OPENGL = QMAKE_INCDIR_OPENGL_ES1 = $$QMAKE_INCDIR_OPENGL QMAKE_LIBDIR_OPENGL_ES1 = $$QMAKE_LIBDIR_OPENGL QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL -- cgit v1.2.3