[oe] [meta-qt5][PATCH 1/2] qt5: move QT_MODULE to qt5-git.inc

Pascal Bach pascal.bach at siemens.com
Fri Sep 4 11:51:41 UTC 2015


QT_MODULE is only used in conjunction with qt5-git.inc.
It feels more consistent to have the variable in the context of the file
where it is used instead of having it in a separate file.

Signed-off-by: Pascal Bach <pascal.bach at siemens.com>
---
 recipes-qt/qt5/qt5-git.inc | 1 +
 recipes-qt/qt5/qt5.inc     | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc
index b73ce4f..34b8ca4 100644
--- a/recipes-qt/qt5/qt5-git.inc
+++ b/recipes-qt/qt5/qt5-git.inc
@@ -1,6 +1,7 @@
 # Copyright (C) 2012 O.S. Systems Software LTDA.
 # Copyright (C) 2013-2014 Martin Jansa <martin.jansa at gmail.com>
 
+QT_MODULE ?= "${BPN}"
 QT_MODULE_BRANCH ?= "5.5"
 
 # each module needs to define valid SRCREV
diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc
index 4c58ad6..a076c53 100644
--- a/recipes-qt/qt5/qt5.inc
+++ b/recipes-qt/qt5/qt5.inc
@@ -5,8 +5,6 @@ inherit qmake5
 
 PACKAGECONFIG_OPENSSL ?= "openssl"
 
-QT_MODULE ?= "${BPN}"
-
 # we don't want conflicts with qt4
 OE_QMAKE_PATH_HEADERS = "${OE_QMAKE_PATH_QT_HEADERS}"
 OE_QMAKE_PATH_ARCHDATA = "${OE_QMAKE_PATH_QT_ARCHDATA}"
-- 
2.1.4




More information about the Openembedded-devel mailing list