summaryrefslogtreecommitdiffstats
path: root/mkspecs/linux-kcc/qmake.conf
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@nokia.com>2012-02-13 14:35:58 +0100
committerQt by Nokia <qt-info@nokia.com>2012-02-14 02:48:35 +0100
commit647aa53d72ad15f39dea676b97f6b4b21f8c9143 (patch)
tree7703e00ff22fd4adb81e3f04192216ade06d5d38 /mkspecs/linux-kcc/qmake.conf
parentac02eaa8a7676ff9a10159bc1be4961d32a7e842 (diff)
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>
Diffstat (limited to 'mkspecs/linux-kcc/qmake.conf')
-rw-r--r--mkspecs/linux-kcc/qmake.conf8
1 files changed, 4 insertions, 4 deletions
diff --git a/mkspecs/linux-kcc/qmake.conf b/mkspecs/linux-kcc/qmake.conf
index 01e3b73479..23fd6298ac 100644
--- 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