diff options
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 @@ | |||
1 | From 81cd2947e9b1290498bdc2505a76fb053ff33be8 Mon Sep 17 00:00:00 2001 | 1 | From df887cc51d1cf5328e536708b461f475e9fb4577 Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Mon, 15 Apr 2013 04:29:32 +0200 | 3 | Date: Mon, 15 Apr 2013 04:29:32 +0200 |
4 | Subject: [PATCH 01/11] Add linux-oe-g++ platform | 4 | Subject: [PATCH 01/13] Add linux-oe-g++ platform |
5 | 5 | ||
6 | * This qmake.conf unlike other platforms reads most variables from | 6 | * This qmake.conf unlike other platforms reads most variables from |
7 | shell environment, because it's easier for qt recipes to export | 7 | shell environment, because it's easier for qt recipes to export |
@@ -40,6 +40,7 @@ Subject: [PATCH 01/11] Add linux-oe-g++ platform | |||
40 | Upstream-Status: Inappropriate [embedded specific] | 40 | Upstream-Status: Inappropriate [embedded specific] |
41 | too OE specific, probably cannot be upstreamed | 41 | too OE specific, probably cannot be upstreamed |
42 | 42 | ||
43 | Change-Id: I0591ed5da0d61d7cf1509d420e6b293582f1863c | ||
43 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | 44 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
44 | --- | 45 | --- |
45 | configure | 66 ++++++++++++++++------- | 46 | configure | 66 ++++++++++++++++------- |
@@ -51,7 +52,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
51 | create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h | 52 | create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h |
52 | 53 | ||
53 | diff --git a/configure b/configure | 54 | diff --git a/configure b/configure |
54 | index 229fb4e..b7a6fe3 100755 | 55 | index 5ad29bb..0bcc175 100755 |
55 | --- a/configure | 56 | --- a/configure |
56 | +++ b/configure | 57 | +++ b/configure |
57 | @@ -316,6 +316,16 @@ getQMakeConf() | 58 | @@ -316,6 +316,16 @@ getQMakeConf() |
@@ -195,7 +196,7 @@ index 6b37a04..dcf6025 100644 | |||
195 | write_file($$QMAKE_CONFIG_LOG, msg, append) | 196 | write_file($$QMAKE_CONFIG_LOG, msg, append) |
196 | diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf | 197 | diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf |
197 | new file mode 100644 | 198 | new file mode 100644 |
198 | index 0000000..ca26b10 | 199 | index 0000000..2ad2810 |
199 | --- /dev/null | 200 | --- /dev/null |
200 | +++ b/mkspecs/linux-oe-g++/qmake.conf | 201 | +++ b/mkspecs/linux-oe-g++/qmake.conf |
201 | @@ -0,0 +1,40 @@ | 202 | @@ -0,0 +1,40 @@ |
@@ -346,5 +347,5 @@ index 0000000..dd12003 | |||
346 | + | 347 | + |
347 | +#endif // QPLATFORMDEFS_H | 348 | +#endif // QPLATFORMDEFS_H |
348 | -- | 349 | -- |
349 | 2.1.3 | 350 | 2.3.1 |
350 | 351 | ||