diff options
Diffstat (limited to 'recipes-qt/qt5/qtbase/0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase/0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch | 27 |
1 files changed, 20 insertions, 7 deletions
diff --git a/recipes-qt/qt5/qtbase/0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch b/recipes-qt/qt5/qtbase/0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch index 21e0987b..4d4291cf 100644 --- a/recipes-qt/qt5/qtbase/0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch +++ b/recipes-qt/qt5/qtbase/0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch | |||
@@ -14,17 +14,17 @@ Signed-off-by: Yu Ke <ke.yu@intel.com> | |||
14 | Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> | 14 | Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> |
15 | Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com> | 15 | Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com> |
16 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | 16 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
17 | --- | ||
18 | configure | 2 +- | 17 | configure | 2 +- |
18 | qmake/qmake.pri | 3 ++- | ||
19 | qmake/qmake.pro | 2 ++ | 19 | qmake/qmake.pro | 2 ++ |
20 | 2 files changed, 3 insertions(+), 1 deletion(-) | 20 | 3 files changed, 5 insertions(+), 2 deletions(-) |
21 | 21 | ||
22 | diff --git a/configure b/configure | 22 | diff --git a/configure b/configure |
23 | index bd43281..5d1b3aa 100755 | 23 | index 43be722..39516d2 100755 |
24 | --- a/configure | 24 | --- a/configure |
25 | +++ b/configure | 25 | +++ b/configure |
26 | @@ -3724,7 +3724,7 @@ setBootstrapEvalVariable() | 26 | @@ -3759,7 +3759,7 @@ setBootstrapVariable() |
27 | 27 | } | |
28 | 28 | ||
29 | # build qmake | 29 | # build qmake |
30 | -if true; then ###[ '!' -f "$outpath/bin/qmake" ]; | 30 | -if true; then ###[ '!' -f "$outpath/bin/qmake" ]; |
@@ -32,15 +32,28 @@ index bd43281..5d1b3aa 100755 | |||
32 | echo "Creating qmake..." | 32 | echo "Creating qmake..." |
33 | 33 | ||
34 | mkdir -p "$outpath/qmake" || exit | 34 | mkdir -p "$outpath/qmake" || exit |
35 | diff --git a/qmake/qmake.pri b/qmake/qmake.pri | ||
36 | index 57dcbb0..e2c5845 100644 | ||
37 | --- a/qmake/qmake.pri | ||
38 | +++ b/qmake/qmake.pri | ||
39 | @@ -82,7 +82,8 @@ bootstrap { #Qt code | ||
40 | qjsonparser.cpp \ | ||
41 | qjsonarray.cpp \ | ||
42 | qjsonobject.cpp \ | ||
43 | - qjsonvalue.cpp | ||
44 | + qjsonvalue.cpp \ | ||
45 | + qdebug.cpp | ||
46 | |||
47 | HEADERS+= \ | ||
48 | qbitarray.h \ | ||
35 | diff --git a/qmake/qmake.pro b/qmake/qmake.pro | 49 | diff --git a/qmake/qmake.pro b/qmake/qmake.pro |
36 | index 89d6ea5..7c605b9 100644 | 50 | index 89d6ea5..7c605b9 100644 |
37 | --- a/qmake/qmake.pro | 51 | --- a/qmake/qmake.pro |
38 | +++ b/qmake/qmake.pro | 52 | +++ b/qmake/qmake.pro |
39 | @@ -8,6 +8,8 @@ CONFIG -= qt | 53 | @@ -8,6 +8,7 @@ CONFIG -= qt |
40 | DEFINES += \ | 54 | DEFINES += \ |
41 | QT_BUILD_QMAKE \ | 55 | QT_BUILD_QMAKE \ |
42 | PROEVALUATOR_FULL | 56 | PROEVALUATOR_FULL |
43 | +DESTDIR = ../bin/ | ||
44 | +TARGET = qmake | 57 | +TARGET = qmake |
45 | 58 | ||
46 | VPATH += \ | 59 | VPATH += \ |