summaryrefslogtreecommitdiffstats
path: root/recipes-qt
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-qt')
-rw-r--r--recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch10
1 files changed, 6 insertions, 4 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 e67df401..91bb9f33 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
@@ -45,9 +45,9 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
45--- 45---
46 configure | 70 +++++++++++++++--------- 46 configure | 70 +++++++++++++++---------
47 mkspecs/features/configure.prf | 4 +- 47 mkspecs/features/configure.prf | 4 +-
48 mkspecs/linux-oe-g++/qmake.conf | 40 ++++++++++++++ 48 mkspecs/linux-oe-g++/qmake.conf | 42 +++++++++++++++
49 mkspecs/linux-oe-g++/qplatformdefs.h | 100 +++++++++++++++++++++++++++++++++++ 49 mkspecs/linux-oe-g++/qplatformdefs.h | 100 +++++++++++++++++++++++++++++++++++
50 4 files changed, 186 insertions(+), 28 deletions(-) 50 4 files changed, 188 insertions(+), 28 deletions(-)
51 create mode 100644 mkspecs/linux-oe-g++/qmake.conf 51 create mode 100644 mkspecs/linux-oe-g++/qmake.conf
52 create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h 52 create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h
53 53
@@ -197,10 +197,10 @@ index 6b37a04..dcf6025 100644
197 write_file($$QMAKE_CONFIG_LOG, msg, append) 197 write_file($$QMAKE_CONFIG_LOG, msg, append)
198diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf 198diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf
199new file mode 100644 199new file mode 100644
200index 0000000..2ad2810 200index 0000000..d0a4166
201--- /dev/null 201--- /dev/null
202+++ b/mkspecs/linux-oe-g++/qmake.conf 202+++ b/mkspecs/linux-oe-g++/qmake.conf
203@@ -0,0 +1,40 @@ 203@@ -0,0 +1,42 @@
204+# 204+#
205+# qmake configuration for linux-g++ with modifications for building with OpenEmbedded 205+# qmake configuration for linux-g++ with modifications for building with OpenEmbedded
206+# 206+#
@@ -240,6 +240,8 @@ index 0000000..2ad2810
240+# for the SDK 240+# for the SDK
241+isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $(OE_QMAKE_QT_CONFIG) 241+isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $(OE_QMAKE_QT_CONFIG)
242+ 242+
243+exists(../oe-device-extra.pri):include(../oe-device-extra.pri)
244+
243+load(qt_config) 245+load(qt_config)
244diff --git a/mkspecs/linux-oe-g++/qplatformdefs.h b/mkspecs/linux-oe-g++/qplatformdefs.h 246diff --git a/mkspecs/linux-oe-g++/qplatformdefs.h b/mkspecs/linux-oe-g++/qplatformdefs.h
245new file mode 100644 247new file mode 100644