diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2013-04-01 15:26:23 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-10 14:16:36 +0200 |
| commit | 382d99173aaeef0a82de8feefb3ba0583bf2fea2 (patch) | |
| tree | ed23c463cb75efc48add8f28afe5ffff343f2721 /tools/configure | |
| parent | 83f473b2cdd674803615e7a8a8ab01ca0aa579ee (diff) | |
Only set QMAKE_DEFAULT_LIB/INCDIRS for target builds
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>
Diffstat (limited to 'tools/configure')
| -rw-r--r-- | tools/configure/configureapp.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 9a8aaa5d28..534f7bfb91 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -3148,12 +3148,12 @@ void Configure::generateQConfigPri() configStream << "} else {" << endl; configStream << " QT_ARCH = " << dictionary["QT_ARCH"] << endl; configStream << " QT_CPU_FEATURES = " << dictionary["QT_CPU_FEATURES"] << endl; - configStream << "}" << endl; if (dictionary.contains("XQMAKESPEC") && !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; + configStream << " QMAKE_DEFAULT_LIBDIRS = /lib /usr/lib" << endl; + configStream << " QMAKE_DEFAULT_INCDIRS = /usr/include /usr/local/include" << endl; } + configStream << "}" << endl; if (dictionary["QT_EDITION"].contains("OPENSOURCE")) configStream << "QT_EDITION = " << QLatin1String("OpenSource") << endl; else |