AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Only set QMAKE_DEFAULT_LIB/INCDIRS for target builds

Browse Source 
The default lib and include dirs are resolved using the target
compiler and with a sysroot, so they are not relevant for host
builds.

Change-Id: Iceb2eb865d0732b9a6f5896ad126200ae8e8a04e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
This commit is contained in:
Tor Arne Vestbø 2013-04-01 15:26:23 +02:00 committed by The Qt Project
parent 83f473b2cd
commit 382d99173a
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure vendored
View File

@ -6394,9 +6394,9 @@ host_build {
} else { } else {
QT_ARCH = $CFG_ARCH QT_ARCH = $CFG_ARCH
QT_CPU_FEATURES = $CFG_CPUFEATURES QT_CPU_FEATURES = $CFG_CPUFEATURES
QMAKE_DEFAULT_LIBDIRS = `echo "$DEFAULT_LIBDIRS" | sed 's,^,",;s,$,",' | tr '\n' ' '`
QMAKE_DEFAULT_INCDIRS = `echo "$DEFAULT_INCDIRS" | sed 's,^,",;s,$,",' | tr '\n' ' '`
} }
QMAKE_DEFAULT_LIBDIRS = `echo "$DEFAULT_LIBDIRS" | sed 's,^,",;s,$,",' | tr '\n' ' '`
QMAKE_DEFAULT_INCDIRS = `echo "$DEFAULT_INCDIRS" | sed 's,^,",;s,$,",' | tr '\n' ' '`
QT_EDITION = $Edition QT_EDITION = $Edition
QT_CONFIG += $QT_CONFIG QT_CONFIG += $QT_CONFIG

6
tools/configure/configureapp.cpp
View File

@ -3148,12 +3148,12 @@ void Configure::generateQConfigPri()
configStream << "} else {" << endl; configStream << "} else {" << endl;
configStream << " QT_ARCH = " << dictionary["QT_ARCH"] << endl; configStream << " QT_ARCH = " << dictionary["QT_ARCH"] << endl;
configStream << " QT_CPU_FEATURES = " << dictionary["QT_CPU_FEATURES"] << endl; configStream << " QT_CPU_FEATURES = " << dictionary["QT_CPU_FEATURES"] << endl;
configStream << "}" << endl;
if (dictionary.contains("XQMAKESPEC") && !dictionary["XQMAKESPEC"].startsWith("wince")) { if (dictionary.contains("XQMAKESPEC") && !dictionary["XQMAKESPEC"].startsWith("wince")) {
// FIXME: add detection // FIXME: add detection
configStream << "QMAKE_DEFAULT_LIBDIRS = /lib /usr/lib" << endl; configStream << " QMAKE_DEFAULT_LIBDIRS = /lib /usr/lib" << endl;
configStream << "QMAKE_DEFAULT_INCDIRS = /usr/include /usr/local/include" << endl; configStream << " QMAKE_DEFAULT_INCDIRS = /usr/include /usr/local/include" << endl;
} }
configStream << "}" << endl;
if (dictionary["QT_EDITION"].contains("OPENSOURCE")) if (dictionary["QT_EDITION"].contains("OPENSOURCE"))
configStream << "QT_EDITION = " << QLatin1String("OpenSource") << endl; configStream << "QT_EDITION = " << QLatin1String("OpenSource") << endl;
else else