meta-qt5/recipes-qt/qt5/qtbase/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch

   1 From 4a86d338f04c2bfa4d3f63a2fa9d1252503757fd Mon Sep 17 00:00:00 2001
   2 From: Martin Jansa <Martin.Jansa@gmail.com>
   3 Date: Sat, 27 Apr 2013 22:33:33 +0200
   4 Subject: [PATCH 04/12] configureapp: Prefix default LIBDIRS and INCDIRS with
   5  SYSROOT
   6
   7 Upstream-Status: Pending
   8   again a bit OE specific
   9 ---
  10  tools/configure/configureapp.cpp | 4 ++--
  11  1 file changed, 2 insertions(+), 2 deletions(-)
  12
  13 diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
  14 index 7e61845..29c6358 100644
  15 --- a/tools/configure/configureapp.cpp
  16 +++ b/tools/configure/configureapp.cpp
  17 @@ -3370,8 +3370,8 @@ void Configure::generateQConfigPri()
  18          configStream << "    QT_ARCH = " << dictionary["QT_ARCH"] << endl;
  19          if (dictionary.contains("XQMAKESPEC") && !dictionary["XQMAKESPEC"].startsWith("wince")) {
  20              // FIXME: add detection
  21 -            configStream << "    QMAKE_DEFAULT_LIBDIRS = /lib /usr/lib" << endl;
  22 -            configStream << "    QMAKE_DEFAULT_INCDIRS = /usr/include /usr/local/include" << endl;
  23 +            configStream << "    QMAKE_DEFAULT_LIBDIRS = $$[QT_SYSROOT]/lib $$[QT_SYSROOT]/usr/lib" << endl;
  24 +            configStream << "    QMAKE_DEFAULT_INCDIRS = $$[QT_SYSROOT]/usr/include $$[QT_SYSROOT]/usr/local/include" << endl;
  25          }
  26          configStream << "}" << endl;
  27          configStream << "QT_CONFIG += " << qtConfig.join(' ') << endl;
  28 --
  29 2.0.0
  30