diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2015-02-27 11:12:46 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-02-27 18:28:08 +0100 |
| commit | 4d4a34c5d29ef7b730eb9da87b39f91352ef66fa (patch) | |
| tree | 8df0894830a43956bbf1c629dc3938f3f41ca10a /recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch | |
| parent | fa521467249da68e89c762a178550c8109bccae3 (diff) | |
recipes: Refresh patches to match git recipes
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 | 11 |
1 files changed, 6 insertions, 5 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 7a94dffe..5f7ab145 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,7 +1,7 @@ -From 81cd2947e9b1290498bdc2505a76fb053ff33be8 Mon Sep 17 00:00:00 2001 +From df887cc51d1cf5328e536708b461f475e9fb4577 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 01/11] Add linux-oe-g++ platform +Subject: [PATCH 01/13] Add linux-oe-g++ platform * This qmake.conf unlike other platforms reads most variables from shell environment, because it's easier for qt recipes to export @@ -40,6 +40,7 @@ Subject: [PATCH 01/11] Add linux-oe-g++ platform Upstream-Status: Inappropriate [embedded specific] too OE specific, probably cannot be upstreamed +Change-Id: I0591ed5da0d61d7cf1509d420e6b293582f1863c Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- configure | 66 ++++++++++++++++------- @@ -51,7 +52,7 @@ 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 229fb4e..b7a6fe3 100755 +index 5ad29bb..0bcc175 100755 --- a/configure +++ b/configure @@ -316,6 +316,16 @@ getQMakeConf() @@ -195,7 +196,7 @@ index 6b37a04..dcf6025 100644 write_file($$QMAKE_CONFIG_LOG, msg, append) diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf new file mode 100644 -index 0000000..ca26b10 +index 0000000..2ad2810 --- /dev/null +++ b/mkspecs/linux-oe-g++/qmake.conf @@ -0,0 +1,40 @@ @@ -346,5 +347,5 @@ index 0000000..dd12003 + +#endif // QPLATFORMDEFS_H -- -2.1.3 +2.3.1 |