diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2017-08-16 22:57:15 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-08-17 20:42:43 +0200 |
commit | d82317c23d6473a4e53d7a5ff11ecf6b9c8769e8 (patch) | |
tree | 59316aab5eb11a92368160769ef78545ddab5dfd /recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch | |
parent | 1619723dfc0cdc831b71bf7ab09c4227ea544255 (diff) |
qtbase: refresh the patches
* upload the patches to b5.8* branches on:
https://github.com/meta-qt5/qtbase
* refresh the patches
* notice that some patches were in section which is meant to be
common for target, native and nativesdk qtbase but were added
only in target recipe, I've updated them to be included in all
3, hopefully they can be used in all 3 (I don't use nativesdk at all)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch index df2016e1..3f373c76 100644 --- a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch +++ b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch @@ -1,4 +1,4 @@ -From 2784921c40d0b523c75e613e48b7fd1e90ba3ef1 Mon Sep 17 00:00:00 2001 +From 805b338154ed0262a7b8bf5c582ff5b193a55492 Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Mon, 15 Apr 2013 04:29:32 +0200 Subject: [PATCH] Add linux-oe-g++ platform @@ -30,10 +30,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h diff --git a/configure b/configure -index 789ba4c..59cce01 100755 +index bc18e614d2..579a96d787 100755 --- a/configure +++ b/configure -@@ -1624,7 +1624,7 @@ fi +@@ -1614,7 +1614,7 @@ fi # is where the resulting variable is written to setBootstrapVariable() { @@ -43,10 +43,10 @@ index 789ba4c..59cce01 100755 # build qmake diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf -index f275e3a..5aa15f5 100644 +index 4ca7c6ba07..5b5ac13f1d 100644 --- a/mkspecs/features/configure.prf +++ b/mkspecs/features/configure.prf -@@ -37,14 +37,14 @@ defineTest(qtCompileTest) { +@@ -44,14 +44,14 @@ defineTest(qtCompileTest) { } # Clean up after previous run @@ -64,7 +64,7 @@ index f275e3a..5aa15f5 100644 msg = "test $$1 succeeded" write_file($$QMAKE_CONFIG_LOG, msg, append) diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf -index 708815d..097ac49 100644 +index 999cd18154..2ac91ba519 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -67,7 +67,7 @@ defineTest(qtHaveModule) { @@ -78,7 +78,7 @@ index 708815d..097ac49 100644 cmd = perl -w $$system_path($${cmd}.pl) diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf new file mode 100644 -index 0000000..c1837e6 +index 0000000000..c1837e6d55 --- /dev/null +++ b/mkspecs/linux-oe-g++/qmake.conf @@ -0,0 +1,43 @@ @@ -127,7 +127,7 @@ index 0000000..c1837e6 +load(qt_config) diff --git a/mkspecs/linux-oe-g++/qplatformdefs.h b/mkspecs/linux-oe-g++/qplatformdefs.h new file mode 100644 -index 0000000..5d22fb4 +index 0000000000..5d22fb4101 --- /dev/null +++ b/mkspecs/linux-oe-g++/qplatformdefs.h @@ -0,0 +1 @@ |