From 4d7921b819c9966eb0732a3e672f18833d65c7fc Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 14 Aug 2012 22:09:33 +0200 Subject: 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 Reviewed-by: Oswald Buddenhagen --- tools/configure/configureapp.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'tools/configure') diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index f031cfcf11..29f6de9b2a 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -2888,6 +2888,11 @@ void Configure::generateQConfigPri() configStream << "QT_HOST_ARCH = " << dictionary["QT_HOST_ARCH"] << endl; configStream << "QT_CPU_FEATURES = " << dictionary["QT_CPU_FEATURES"] << endl; configStream << "QT_HOST_CPU_FEATURES = " << dictionary["QT_HOST_CPU_FEATURES"] << endl; + if (!dictionary["XQMAKESPEC"].isEmpty() && !dictionary["XQMAKESPEC"].startsWith("wince")) { + // FIXME: add detection + configStream << "QMAKE_DEFAULT_LIBDIRS = /lib /usr/lib" << endl; + configStream << "QMAKE_DEFAULT_INCDIRS = /usr/include /usr/local/include" << endl; + } if (dictionary["QT_EDITION"].contains("OPENSOURCE")) configStream << "QT_EDITION = " << QLatin1String("OpenSource") << endl; else -- cgit v1.2.3