summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2017-06-06 13:08:30 +0300
committerMikko Gronoff <mikko.gronoff@qt.io>2017-08-11 06:32:55 +0000
commitb72dbdfcb6e1e3c520de216cda4d0893d6372bd2 (patch)
tree113f00de9d6539a132b5b63683e0c6771329d7ee /recipes-qt/qt5/qtbase
parentdc32862fb82686c30722970619ad1187695e6e60 (diff)
downloadmeta-qt5-b72dbdfcb6e1e3c520de216cda4d0893d6372bd2.tar.gz
qt5: update submodules
Update submodules to Qt 5.6.3 (snapshot 1) Change-Id: I67d3799d7822173a6cbe9b3e60223dca79ae7f6e Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qtbase')
-rw-r--r--recipes-qt/qt5/qtbase/0002-configure-Separate-host-and-build-platform.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/recipes-qt/qt5/qtbase/0002-configure-Separate-host-and-build-platform.patch b/recipes-qt/qt5/qtbase/0002-configure-Separate-host-and-build-platform.patch
index 70a71ff9..621e3412 100644
--- a/recipes-qt/qt5/qtbase/0002-configure-Separate-host-and-build-platform.patch
+++ b/recipes-qt/qt5/qtbase/0002-configure-Separate-host-and-build-platform.patch
@@ -1,4 +1,4 @@
1From d98f945aade15bf49eb7c016d2eefd513351b360 Mon Sep 17 00:00:00 2001 1From cb1e143a42e41524f16043c92b728dfae54586f9 Mon Sep 17 00:00:00 2001
2From: David Schulz <david.schulz@theqtcompany.com> 2From: David Schulz <david.schulz@theqtcompany.com>
3Date: Mon, 12 Oct 2015 09:55:30 +0200 3Date: Mon, 12 Oct 2015 09:55:30 +0200
4Subject: [PATCH] configure: Separate host and build platform. 4Subject: [PATCH] configure: Separate host and build platform.
@@ -76,7 +76,7 @@ index bc5258c..f5db184 100755
76 -spec "$QMKSPEC" \ 76 -spec "$QMKSPEC" \
77 "CONFIG+=$QMAKE_CONFIG" \ 77 "CONFIG+=$QMAKE_CONFIG" \
78diff --git a/configure b/configure 78diff --git a/configure b/configure
79index 55b1886..ef9c29b 100755 79index 2073880..79eabe0 100755
80--- a/configure 80--- a/configure
81+++ b/configure 81+++ b/configure
82@@ -105,9 +105,11 @@ QT_CONFIG= 82@@ -105,9 +105,11 @@ QT_CONFIG=
@@ -594,15 +594,15 @@ index 3123f7c..0000000
594-TEMPLATE = aux 594-TEMPLATE = aux
595-QMAKE_DOCS = $$PWD/doc/qmake.qdocconf 595-QMAKE_DOCS = $$PWD/doc/qmake.qdocconf
596diff --git a/qtbase.pro b/qtbase.pro 596diff --git a/qtbase.pro b/qtbase.pro
597index 98ca86a..11cff9e 100644 597index 78f9b3a..88ff2de 100644
598--- a/qtbase.pro 598--- a/qtbase.pro
599+++ b/qtbase.pro 599+++ b/qtbase.pro
600@@ -4,7 +4,7 @@ 600@@ -4,7 +4,7 @@
601 601
602 load(qt_parts) 602 load(qt_parts)
603 603
604-SUBDIRS += qmake/qmake-docs.pro 604-SUBDIRS += qmake/qmake-docs.pro doc
605+SUBDIRS += qmake/qmake-aux.pro 605+SUBDIRS += qmake/qmake-aux.pro doc
606 606
607 cross_compile: CONFIG += nostrip 607 cross_compile: CONFIG += nostrip
608 608