From f42c4491f9d3b589c4c35cb3357a16e51940ab34 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Fri, 4 Sep 2015 13:51:41 +0200 Subject: qt5: move QT_MODULE to qt5-git.inc 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 Signed-off-by: Martin Jansa --- 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 b73ce4fe..34b8ca43 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 +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 4c58ad69..a076c532 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}" -- cgit v1.2.3