diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-08-14 22:09:33 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-22 18:40:17 +0200 |
| commit | 4d7921b819c9966eb0732a3e672f18833d65c7fc (patch) | |
| tree | a2628ee343329962cdfaaa5cf7b2c03a03a7d9af /tools/configure/configureapp.cpp | |
| parent | 03307980379293c9127e5aa01dcd9c7b1c3fbf06 (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 'tools/configure/configureapp.cpp')
| -rw-r--r-- | tools/configure/configureapp.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
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 |