summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--recipes-qt/qt5/qt5-git.inc1
-rw-r--r--recipes-qt/qt5/qt5.inc2
2 files changed, 1 insertions, 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 @@
1# Copyright (C) 2012 O.S. Systems Software LTDA. 1# Copyright (C) 2012 O.S. Systems Software LTDA.
2# Copyright (C) 2013-2014 Martin Jansa <martin.jansa@gmail.com> 2# Copyright (C) 2013-2014 Martin Jansa <martin.jansa@gmail.com>
3 3
4QT_MODULE ?= "${BPN}"
4QT_MODULE_BRANCH ?= "5.5" 5QT_MODULE_BRANCH ?= "5.5"
5 6
6# each module needs to define valid SRCREV 7# 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
5 5
6PACKAGECONFIG_OPENSSL ?= "openssl" 6PACKAGECONFIG_OPENSSL ?= "openssl"
7 7
8QT_MODULE ?= "${BPN}"
9
10# we don't want conflicts with qt4 8# we don't want conflicts with qt4
11OE_QMAKE_PATH_HEADERS = "${OE_QMAKE_PATH_QT_HEADERS}" 9OE_QMAKE_PATH_HEADERS = "${OE_QMAKE_PATH_QT_HEADERS}"
12OE_QMAKE_PATH_ARCHDATA = "${OE_QMAKE_PATH_QT_ARCHDATA}" 10OE_QMAKE_PATH_ARCHDATA = "${OE_QMAKE_PATH_QT_ARCHDATA}"