diff options
Diffstat (limited to 'recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch index 1b4ed742..1f328977 100644 --- a/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch +++ b/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 0cdd1297e98edd3368a6b923923ff6cf0684d800 Mon Sep 17 00:00:00 2001 | 1 | From 853b6920e9f10a29c5619b4239e960ad33080e8e 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/12] 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 |
@@ -31,12 +31,13 @@ Subject: [PATCH 01/11] Add linux-oe-g++ platform | |||
31 | 31 | ||
32 | Upstream-Status: Pending | 32 | Upstream-Status: Pending |
33 | 33 | ||
34 | Change-Id: Ie1eb097efe289179b86d5d11740274114e50639d | ||
34 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | 35 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
35 | --- | 36 | --- |
36 | configure | 54 ++++++++++++++++--- | 37 | configure | 54 ++++++++++++++++--- |
37 | mkspecs/linux-oe-g++/qmake.conf | 39 ++++++++++++++ | 38 | mkspecs/linux-oe-g++/qmake.conf | 40 ++++++++++++++ |
38 | mkspecs/linux-oe-g++/qplatformdefs.h | 100 +++++++++++++++++++++++++++++++++++ | 39 | mkspecs/linux-oe-g++/qplatformdefs.h | 100 +++++++++++++++++++++++++++++++++++ |
39 | 3 files changed, 186 insertions(+), 7 deletions(-) | 40 | 3 files changed, 187 insertions(+), 7 deletions(-) |
40 | create mode 100644 mkspecs/linux-oe-g++/qmake.conf | 41 | create mode 100644 mkspecs/linux-oe-g++/qmake.conf |
41 | create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h | 42 | create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h |
42 | 43 | ||
@@ -149,10 +150,10 @@ index 9c86fa1..7dea731 100755 | |||
149 | setBootstrapVariable QMAKE_CFLAGS_RELEASE | 150 | setBootstrapVariable QMAKE_CFLAGS_RELEASE |
150 | diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf | 151 | diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf |
151 | new file mode 100644 | 152 | new file mode 100644 |
152 | index 0000000..42966fe | 153 | index 0000000..ca26b10 |
153 | --- /dev/null | 154 | --- /dev/null |
154 | +++ b/mkspecs/linux-oe-g++/qmake.conf | 155 | +++ b/mkspecs/linux-oe-g++/qmake.conf |
155 | @@ -0,0 +1,39 @@ | 156 | @@ -0,0 +1,40 @@ |
156 | +# | 157 | +# |
157 | +# qmake configuration for linux-g++ with modifications for building with OpenEmbedded | 158 | +# qmake configuration for linux-g++ with modifications for building with OpenEmbedded |
158 | +# | 159 | +# |
@@ -166,6 +167,7 @@ index 0000000..42966fe | |||
166 | +# QMAKE_<TOOL> (moc, uic, rcc) are gone, overwrite only ar and strip | 167 | +# QMAKE_<TOOL> (moc, uic, rcc) are gone, overwrite only ar and strip |
167 | +QMAKE_AR = $(OE_QMAKE_AR) cqs | 168 | +QMAKE_AR = $(OE_QMAKE_AR) cqs |
168 | +QMAKE_STRIP = $(OE_QMAKE_STRIP) | 169 | +QMAKE_STRIP = $(OE_QMAKE_STRIP) |
170 | +QMAKE_WAYLAND_SCANNER = $(OE_QMAKE_WAYLAND_SCANNER) | ||
169 | + | 171 | + |
170 | +include(../common/gcc-base-unix.conf) | 172 | +include(../common/gcc-base-unix.conf) |
171 | + | 173 | + |