Skip to contentSkip to conversation

qt5: move QT_MODULE to qt5-git.inc

PATCH New Pascal Bach 1 participant 2 messages Sep 4, 2015

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 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.

---
 recipes-qt/qt5/qt5-git.inc | 1 +
 recipes-qt/qt5/qt5.inc     | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)
recipes-qt/qt5/qt5-git.inc +1 -0
index b73ce4f..34b8ca4 100644
@@ -1,6 +1,7 @@
 # Copyright (C) 2012 O.S. Systems Software LTDA.
 # Copyright (C) 2013-2014 Martin Jansa <[email protected]>
 
+QT_MODULE ?= "${BPN}"
 QT_MODULE_BRANCH ?= "5.5"
 
 # each module needs to define valid SRCREV
recipes-qt/qt5/qt5.inc +0 -2
index 4c58ad6..a076c53 100644
@@ -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}"
Signature · 1 line
2.1.4
#1 lore raw

PATCH 2/2 qt5: remove redundant QT_MODULE assignments

QT_MODULE is already set to the correct value by qt5-git.inc

---
 recipes-qt/qt5/qtbase-native_git.bb    | 2 --
 recipes-qt/qt5/qtwayland-native_git.bb | 2 --
 2 files changed, 4 deletions(-)
recipes-qt/qt5/qtbase-native_git.bb +0 -2
index 3efcb55..d75f5e5 100644
@@ -10,8 +10,6 @@ LIC_FILES_CHKSUM = " \
     file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
 "
 
-QT_MODULE = "qtbase"
-
 require qt5-native.inc
 require qt5-git.inc
 
recipes-qt/qt5/qtwayland-native_git.bb +0 -2
index 1a93284..efb615a 100644
@@ -10,8 +10,6 @@ LIC_FILES_CHKSUM = " \
     file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
 "
 
-QT_MODULE = "${BPN}"
-
 DEPENDS = "qtbase-native wayland-native"
 
 SRC_URI += " \
Signature · 1 line
2.1.4