summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2013-04-28 13:03:59 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2013-04-28 15:55:09 +0200
commiteed206da36737ab299599f87d8f3d08cb3838635 (patch)
tree87a649dd87f831438c22871a237e4de000a2041e
parent40cf08634741494df0c66fdfb151613b7ae29803 (diff)
downloadmeta-qt5-eed206da36737ab299599f87d8f3d08cb3838635.tar.gz
qt5: move SSTATE_SCAN_FILES to qmake5_base.bbclass
* penalty for more replacements is better then to forget to add this in some component which will also install .prl files
-rw-r--r--classes/qmake5_base.bbclass3
-rw-r--r--recipes-qt/qt5/qtbase-native.inc2
-rw-r--r--recipes-qt/qt5/qtbase.inc2
-rw-r--r--recipes-qt/qt5/qtjsbackend-native.inc2
-rw-r--r--recipes-qt/qt5/qtjsbackend.inc2
5 files changed, 3 insertions, 8 deletions
diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass
index fa6f3166..5f83d12d 100644
--- a/classes/qmake5_base.bbclass
+++ b/classes/qmake5_base.bbclass
@@ -12,6 +12,9 @@ OE_QMAKE_PLATFORM = "linux-oe-g++"
12# Add -d to show debug output from every qmake call, but it prints *a lot* 12# Add -d to show debug output from every qmake call, but it prints *a lot*
13OE_QMAKE_DEBUG_OUTPUT = "-d" 13OE_QMAKE_DEBUG_OUTPUT = "-d"
14 14
15# Paths in .prl files contain SYSROOT value
16SSTATE_SCAN_FILES += "*.pri *.prl"
17
15EXTRA_OEMAKE = " MAKEFLAGS='${PARALLEL_MAKE}'" 18EXTRA_OEMAKE = " MAKEFLAGS='${PARALLEL_MAKE}'"
16 19
17EXTRA_ENV = 'QMAKE="${OE_QMAKE_QMAKE} ${OE_QMAKE_DEBUG_OUTPUT} -after \ 20EXTRA_ENV = 'QMAKE="${OE_QMAKE_QMAKE} ${OE_QMAKE_DEBUG_OUTPUT} -after \
diff --git a/recipes-qt/qt5/qtbase-native.inc b/recipes-qt/qt5/qtbase-native.inc
index 5f88130d..764e010e 100644
--- a/recipes-qt/qt5/qtbase-native.inc
+++ b/recipes-qt/qt5/qtbase-native.inc
@@ -9,8 +9,6 @@ inherit native qmake5_base
9 9
10QT_MODULE = "qtbase" 10QT_MODULE = "qtbase"
11 11
12SSTATE_SCAN_FILES += "*.pri *.prl"
13
14SRC_URI += " \ 12SRC_URI += " \
15 file://0001-Add-linux-oe-g-platform.patch \ 13 file://0001-Add-linux-oe-g-platform.patch \
16 file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \ 14 file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc
index a5ac60cb..f348c19d 100644
--- a/recipes-qt/qt5/qtbase.inc
+++ b/recipes-qt/qt5/qtbase.inc
@@ -27,8 +27,6 @@ QT_MODULE_FLAGS = "-no-xcb"
27 27
28INC_PR = "r0" 28INC_PR = "r0"
29 29
30SSTATE_SCAN_FILES += "*.pri *.prl"
31
32# Qt uses atomic instructions not supported in thumb mode 30# Qt uses atomic instructions not supported in thumb mode
33ARM_INSTRUCTION_SET = "arm" 31ARM_INSTRUCTION_SET = "arm"
34 32
diff --git a/recipes-qt/qt5/qtjsbackend-native.inc b/recipes-qt/qt5/qtjsbackend-native.inc
index b73311ee..25de8e60 100644
--- a/recipes-qt/qt5/qtjsbackend-native.inc
+++ b/recipes-qt/qt5/qtjsbackend-native.inc
@@ -5,8 +5,6 @@ DEPENDS = "qtbase-native"
5 5
6QT_MODULE = "qtjsbackend" 6QT_MODULE = "qtjsbackend"
7 7
8SSTATE_SCAN_FILES += "*.pri *.prl"
9
10INC_PR = "r0" 8INC_PR = "r0"
11 9
12inherit native qmake5_base 10inherit native qmake5_base
diff --git a/recipes-qt/qt5/qtjsbackend.inc b/recipes-qt/qt5/qtjsbackend.inc
index a7e956d8..9cbe9378 100644
--- a/recipes-qt/qt5/qtjsbackend.inc
+++ b/recipes-qt/qt5/qtjsbackend.inc
@@ -8,8 +8,6 @@ DEPENDS = "qtbase qtjsbackend-native"
8 8
9INC_PR = "r0" 9INC_PR = "r0"
10 10
11SSTATE_SCAN_FILES += "*.pri *.prl"
12
13inherit qmake5 11inherit qmake5
14 12
15SRC_URI += " \ 13SRC_URI += " \