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 <thiago.macieira@intel.com>

diff --git a/mkspecs/common/linux.conf b/mkspecs/common/linux.conf
index de28ec7..0771bb7 100644 (file)
--- 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

diff --git a/mkspecs/linux-cxx/qmake.conf b/mkspecs/linux-cxx/qmake.conf
index ce303b7..79aa834 100644 (file)
--- a/mkspecs/linux-cxx/qmake.conf
+++ b/mkspecs/linux-cxx/qmake.conf
@@ -38,12 +38,12 @@ QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC
 
 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_LINK             = cxx
 QMAKE_LINK_SHLIB       = cxx

diff --git a/mkspecs/linux-ecc-64/qmake.conf b/mkspecs/linux-ecc-64/qmake.conf
index 61a056b..50f841f 100644 (file)
--- a/mkspecs/linux-ecc-64/qmake.conf
+++ b/mkspecs/linux-ecc-64/qmake.conf
@@ -40,12 +40,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_LINK             = ecpc
 QMAKE_LINK_SHLIB       = ecpc

diff --git a/mkspecs/linux-icc/qmake.conf b/mkspecs/linux-icc/qmake.conf
index 38916ec..4ff63cd 100644 (file)
--- a/mkspecs/linux-icc/qmake.conf
+++ b/mkspecs/linux-icc/qmake.conf
@@ -46,12 +46,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_LINK             = icpc
 QMAKE_LINK_SHLIB       = icpc

diff --git a/mkspecs/linux-kcc/qmake.conf b/mkspecs/linux-kcc/qmake.conf
index 01e3b73..23fd629 100644 (file)
--- a/mkspecs/linux-kcc/qmake.conf
+++ b/mkspecs/linux-kcc/qmake.conf
@@ -49,12 +49,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_LINK             = KCC
 QMAKE_LINK_SHLIB       = KCC

diff --git a/mkspecs/linux-pgcc/qmake.conf b/mkspecs/linux-pgcc/qmake.conf
index 63ede78..ed88215 100644 (file)
--- a/mkspecs/linux-pgcc/qmake.conf
+++ b/mkspecs/linux-pgcc/qmake.conf
@@ -40,12 +40,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_LINK             = pgCC
 QMAKE_LINK_SHLIB       = pgCC

diff --git a/mkspecs/unsupported/linux-host-g++/qmake.conf b/mkspecs/unsupported/linux-host-g++/qmake.conf
index 46ecf37..1ad529e 100644 (file)
--- a/mkspecs/unsupported/linux-host-g++/qmake.conf
+++ b/mkspecs/unsupported/linux-host-g++/qmake.conf
@@ -80,12 +80,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