summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase/0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2015-02-27 11:12:46 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2015-02-27 18:28:08 +0100
commit4d4a34c5d29ef7b730eb9da87b39f91352ef66fa (patch)
tree8df0894830a43956bbf1c629dc3938f3f41ca10a /recipes-qt/qt5/qtbase/0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch
parentfa521467249da68e89c762a178550c8109bccae3 (diff)
downloadmeta-qt5-4d4a34c5d29ef7b730eb9da87b39f91352ef66fa.tar.gz
recipes: Refresh patches to match git recipes
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
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.patch21
1 files changed, 13 insertions, 8 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 4d4291cf..874bc697 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
@@ -1,7 +1,7 @@
1From ee542556da221be99fa3344630b78529555be2bc Mon Sep 17 00:00:00 2001 1From 7943ec2256163f6049d442ff00f579a5cbff5acc Mon Sep 17 00:00:00 2001
2From: Michael Krelin <hacker@klever.net> 2From: Michael Krelin <hacker@klever.net>
3Date: Mon, 29 Oct 2012 20:07:49 -0700 3Date: Mon, 29 Oct 2012 20:07:49 -0700
4Subject: [PATCH 11/11] qmake: don't build it in configure, but allow to build 4Subject: [PATCH 11/13] qmake: don't build it in configure, but allow to build
5 it separately 5 it separately
6 6
7* it is already built in qtbase-native, so we don't need it in configure 7* it is already built in qtbase-native, so we don't need it in configure
@@ -18,13 +18,18 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
18 qmake/qmake.pri | 3 ++- 18 qmake/qmake.pri | 3 ++-
19 qmake/qmake.pro | 2 ++ 19 qmake/qmake.pro | 2 ++
20 3 files changed, 5 insertions(+), 2 deletions(-) 20 3 files changed, 5 insertions(+), 2 deletions(-)
21---
22 configure | 2 +-
23 qmake/qmake.pri | 3 ++-
24 qmake/qmake.pro | 1 +
25 3 files changed, 4 insertions(+), 2 deletions(-)
21 26
22diff --git a/configure b/configure 27diff --git a/configure b/configure
23index 43be722..39516d2 100755 28index a40d471..8d15f59 100755
24--- a/configure 29--- a/configure
25+++ b/configure 30+++ b/configure
26@@ -3759,7 +3759,7 @@ setBootstrapVariable() 31@@ -3724,7 +3724,7 @@ setBootstrapEvalVariable()
27 } 32
28 33
29 # build qmake 34 # build qmake
30-if true; then ###[ '!' -f "$outpath/bin/qmake" ]; 35-if true; then ###[ '!' -f "$outpath/bin/qmake" ];
@@ -33,7 +38,7 @@ index 43be722..39516d2 100755
33 38
34 mkdir -p "$outpath/qmake" || exit 39 mkdir -p "$outpath/qmake" || exit
35diff --git a/qmake/qmake.pri b/qmake/qmake.pri 40diff --git a/qmake/qmake.pri b/qmake/qmake.pri
36index 57dcbb0..e2c5845 100644 41index 4de41d6..69982b7 100644
37--- a/qmake/qmake.pri 42--- a/qmake/qmake.pri
38+++ b/qmake/qmake.pri 43+++ b/qmake/qmake.pri
39@@ -82,7 +82,8 @@ bootstrap { #Qt code 44@@ -82,7 +82,8 @@ bootstrap { #Qt code
@@ -47,7 +52,7 @@ index 57dcbb0..e2c5845 100644
47 HEADERS+= \ 52 HEADERS+= \
48 qbitarray.h \ 53 qbitarray.h \
49diff --git a/qmake/qmake.pro b/qmake/qmake.pro 54diff --git a/qmake/qmake.pro b/qmake/qmake.pro
50index 89d6ea5..7c605b9 100644 55index 89d6ea5..0ff4a96 100644
51--- a/qmake/qmake.pro 56--- a/qmake/qmake.pro
52+++ b/qmake/qmake.pro 57+++ b/qmake/qmake.pro
53@@ -8,6 +8,7 @@ CONFIG -= qt 58@@ -8,6 +8,7 @@ CONFIG -= qt
@@ -59,5 +64,5 @@ index 89d6ea5..7c605b9 100644
59 VPATH += \ 64 VPATH += \
60 ../src/corelib/global \ 65 ../src/corelib/global \
61-- 66--
622.1.3 672.3.1
63 68