diff options
Diffstat (limited to 'recipes-qt/qt5/qtbase/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/recipes-qt/qt5/qtbase/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch b/recipes-qt/qt5/qtbase/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch index 16317ac7..d24e193d 100644 --- a/recipes-qt/qt5/qtbase/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch +++ b/recipes-qt/qt5/qtbase/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 698f073fb8cc6dc1ced277b6ae2056cb9d02f2d5 Mon Sep 17 00:00:00 2001 | 1 | From 15b871b694cead18fcb750c0bb393440ea929e06 Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Sat, 27 Apr 2013 22:33:33 +0200 | 3 | Date: Sat, 27 Apr 2013 22:33:33 +0200 |
4 | Subject: [PATCH 04/14] configureapp: Prefix default LIBDIRS and INCDIRS with | 4 | Subject: [PATCH 04/17] configureapp: Prefix default LIBDIRS and INCDIRS with |
5 | SYSROOT | 5 | SYSROOT |
6 | 6 | ||
7 | Upstream-Status: Pending | 7 | Upstream-Status: Pending |
@@ -10,10 +10,10 @@ Upstream-Status: Pending | |||
10 | 1 file changed, 2 insertions(+), 2 deletions(-) | 10 | 1 file changed, 2 insertions(+), 2 deletions(-) |
11 | 11 | ||
12 | diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp | 12 | diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp |
13 | index 50a192b..46eabe4 100644 | 13 | index eb472db..808c8dd 100644 |
14 | --- a/tools/configure/configureapp.cpp | 14 | --- a/tools/configure/configureapp.cpp |
15 | +++ b/tools/configure/configureapp.cpp | 15 | +++ b/tools/configure/configureapp.cpp |
16 | @@ -3213,8 +3213,8 @@ void Configure::generateQConfigPri() | 16 | @@ -3344,8 +3344,8 @@ void Configure::generateQConfigPri() |
17 | configStream << " QT_ARCH = " << dictionary["QT_ARCH"] << endl; | 17 | configStream << " QT_ARCH = " << dictionary["QT_ARCH"] << endl; |
18 | if (dictionary.contains("XQMAKESPEC") && !dictionary["XQMAKESPEC"].startsWith("wince")) { | 18 | if (dictionary.contains("XQMAKESPEC") && !dictionary["XQMAKESPEC"].startsWith("wince")) { |
19 | // FIXME: add detection | 19 | // FIXME: add detection |
@@ -23,7 +23,7 @@ index 50a192b..46eabe4 100644 | |||
23 | + configStream << " QMAKE_DEFAULT_INCDIRS = $$[QT_SYSROOT]/usr/include $$[QT_SYSROOT]/usr/local/include" << endl; | 23 | + configStream << " QMAKE_DEFAULT_INCDIRS = $$[QT_SYSROOT]/usr/include $$[QT_SYSROOT]/usr/local/include" << endl; |
24 | } | 24 | } |
25 | configStream << "}" << endl; | 25 | configStream << "}" << endl; |
26 | if (dictionary["QT_EDITION"].contains("OPENSOURCE")) | 26 | configStream << "QT_CONFIG += " << qtConfig.join(' ') << endl; |
27 | -- | 27 | -- |
28 | 1.8.5.3 | 28 | 2.0.0 |
29 | 29 | ||