From f90537a7decfa5599606d3290bc25de02bfa5796 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 18 Feb 2015 17:18:00 +0100 Subject: qtdeclarative, *qtbase*: upgrade to latest revision in 5.4 branch Signed-off-by: Martin Jansa --- ...-build-it-in-configure-but-allow-to-build.patch | 36 ++++++++++++++++------ 1 file changed, 27 insertions(+), 9 deletions(-) (limited to 'recipes-qt/qt5/qtbase-git/0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch') diff --git a/recipes-qt/qt5/qtbase-git/0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch b/recipes-qt/qt5/qtbase-git/0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch index 21e0987b..ef65da08 100644 --- a/recipes-qt/qt5/qtbase-git/0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch +++ b/recipes-qt/qt5/qtbase-git/0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch @@ -1,7 +1,7 @@ -From ee542556da221be99fa3344630b78529555be2bc Mon Sep 17 00:00:00 2001 +From e199e105df6ded6ea9404b4f7f6f7f8381a51e85 Mon Sep 17 00:00:00 2001 From: Michael Krelin Date: Mon, 29 Oct 2012 20:07:49 -0700 -Subject: [PATCH 11/11] qmake: don't build it in configure, but allow to build +Subject: [PATCH 11/12] qmake: don't build it in configure, but allow to build it separately * it is already built in qtbase-native, so we don't need it in configure @@ -14,13 +14,18 @@ Signed-off-by: Yu Ke Signed-off-by: Paul Eggleton Signed-off-by: Mikko Levonmaa Signed-off-by: Martin Jansa ---- configure | 2 +- + qmake/qmake.pri | 3 ++- qmake/qmake.pro | 2 ++ - 2 files changed, 3 insertions(+), 1 deletion(-) + 3 files changed, 5 insertions(+), 2 deletions(-) +--- + configure | 2 +- + qmake/qmake.pri | 3 ++- + qmake/qmake.pro | 1 + + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/configure b/configure -index bd43281..5d1b3aa 100755 +index 8b42b8e..aa21ff6 100755 --- a/configure +++ b/configure @@ -3724,7 +3724,7 @@ setBootstrapEvalVariable() @@ -32,19 +37,32 @@ index bd43281..5d1b3aa 100755 echo "Creating qmake..." mkdir -p "$outpath/qmake" || exit +diff --git a/qmake/qmake.pri b/qmake/qmake.pri +index 4de41d6..69982b7 100644 +--- a/qmake/qmake.pri ++++ b/qmake/qmake.pri +@@ -82,7 +82,8 @@ bootstrap { #Qt code + qjsonparser.cpp \ + qjsonarray.cpp \ + qjsonobject.cpp \ +- qjsonvalue.cpp ++ qjsonvalue.cpp \ ++ qdebug.cpp + + HEADERS+= \ + qbitarray.h \ diff --git a/qmake/qmake.pro b/qmake/qmake.pro -index 89d6ea5..7c605b9 100644 +index 89d6ea5..0ff4a96 100644 --- a/qmake/qmake.pro +++ b/qmake/qmake.pro -@@ -8,6 +8,8 @@ CONFIG -= qt +@@ -8,6 +8,7 @@ CONFIG -= qt DEFINES += \ QT_BUILD_QMAKE \ PROEVALUATOR_FULL -+DESTDIR = ../bin/ +TARGET = qmake VPATH += \ ../src/corelib/global \ -- -2.1.3 +2.3.0 -- cgit v1.2.3-54-g00ecf