30 lines
1.3 KiB
Diff
30 lines
1.3 KiB
Diff
From 698f073fb8cc6dc1ced277b6ae2056cb9d02f2d5 Mon Sep 17 00:00:00 2001
|
|
From: Martin Jansa <Martin.Jansa@gmail.com>
|
|
Date: Sat, 27 Apr 2013 22:33:33 +0200
|
|
Subject: [PATCH 04/14] configureapp: Prefix default LIBDIRS and INCDIRS with
|
|
SYSROOT
|
|
|
|
Upstream-Status: Pending
|
|
---
|
|
tools/configure/configureapp.cpp | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
|
|
index 50a192b..46eabe4 100644
|
|
--- a/tools/configure/configureapp.cpp
|
|
+++ b/tools/configure/configureapp.cpp
|
|
@@ -3213,8 +3213,8 @@ void Configure::generateQConfigPri()
|
|
configStream << " QT_ARCH = " << dictionary["QT_ARCH"] << 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 = $$[QT_SYSROOT]/lib $$[QT_SYSROOT]/usr/lib" << endl;
|
|
+ configStream << " QMAKE_DEFAULT_INCDIRS = $$[QT_SYSROOT]/usr/include $$[QT_SYSROOT]/usr/local/include" << endl;
|
|
}
|
|
configStream << "}" << endl;
|
|
if (dictionary["QT_EDITION"].contains("OPENSOURCE"))
|
|
--
|
|
1.8.5.3
|
|
|