[oe] [meta-qt5][PATCH] qt5: use extra .pri file from linux-oe-g++ mkspec
Samuli Piippo
samuli.piippo at theqtcompany.com
Thu Oct 15 10:00:31 UTC 2015
Load additional oe-device-extra.pri in the default linux-oe-g++ mkspec to
allow simple changing of target dependent values. This is useful for any
target that needs to specify e.g., QMAKE_LIBS_EGL or other additional configs.
Signed-off-by: Samuli Piippo <samuli.piippo at theqtcompany.com>
---
recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch | 10 ++++++----
1 file 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 e67df40..91bb9f3 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 at gmail.com>
---
configure | 70 +++++++++++++++---------
mkspecs/features/configure.prf | 4 +-
- mkspecs/linux-oe-g++/qmake.conf | 40 ++++++++++++++
+ mkspecs/linux-oe-g++/qmake.conf | 42 +++++++++++++++
mkspecs/linux-oe-g++/qplatformdefs.h | 100 +++++++++++++++++++++++++++++++++++
- 4 files changed, 186 insertions(+), 28 deletions(-)
+ 4 files changed, 188 insertions(+), 28 deletions(-)
create mode 100644 mkspecs/linux-oe-g++/qmake.conf
create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h
@@ -197,10 +197,10 @@ 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..2ad2810
+index 0000000..d0a4166
--- /dev/null
+++ b/mkspecs/linux-oe-g++/qmake.conf
-@@ -0,0 +1,40 @@
+@@ -0,0 +1,42 @@
+#
+# qmake configuration for linux-g++ with modifications for building with OpenEmbedded
+#
@@ -240,6 +240,8 @@ index 0000000..2ad2810
+# for the SDK
+isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $(OE_QMAKE_QT_CONFIG)
+
++exists(../oe-device-extra.pri):include(../oe-device-extra.pri)
++
+load(qt_config)
diff --git a/mkspecs/linux-oe-g++/qplatformdefs.h b/mkspecs/linux-oe-g++/qplatformdefs.h
new file mode 100644
--
1.9.1
More information about the Openembedded-devel
mailing list