summaryrefslogtreecommitdiffstats
path: root/mkspecs/common/unix.conf
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2012-08-14 22:09:33 +0200
committerQt by Nokia <qt-info@nokia.com>2012-08-22 18:40:17 +0200
commit4d7921b819c9966eb0732a3e672f18833d65c7fc (patch)
treea2628ee343329962cdfaaa5cf7b2c03a03a7d9af /mkspecs/common/unix.conf
parent03307980379293c9127e5aa01dcd9c7b1c3fbf06 (diff)
make configure set up QMAKE_DEFAULT_{INC,LIB}DIRS
hard-coding it in unix.conf was no particularly good idea for hopefully obvious reasons. the windows version is so far just a stub that does what the makespecs hard-coded - more doesn't seem worth the effort. the guys interested in x-building may want to rectify it at some point, but it's not going to be easy. Change-Id: I8fedd841a8416f8c0c57018752eae9510b5d00d0 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'mkspecs/common/unix.conf')
-rw-r--r--mkspecs/common/unix.conf3
1 files changed, 0 insertions, 3 deletions
diff --git a/mkspecs/common/unix.conf b/mkspecs/common/unix.conf
index 5bbc25bb1d..9ee626562b 100644
--- a/mkspecs/common/unix.conf
+++ b/mkspecs/common/unix.conf
@@ -13,7 +13,4 @@ QMAKE_PREFIX_SHLIB = lib
QMAKE_PREFIX_STATICLIB = lib
QMAKE_EXTENSION_STATICLIB = a
-QMAKE_DEFAULT_INCDIRS = /usr/include /usr/local/include
-QMAKE_DEFAULT_LIBDIRS = /usr/lib /usr/local/lib
-
include(shell-unix.conf)