From eed206da36737ab299599f87d8f3d08cb3838635 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Sun, 28 Apr 2013 13:03:59 +0200
Subject: [PATCH] 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
---
 classes/qmake5_base.bbclass           | 3 +++
 recipes-qt/qt5/qtbase-native.inc      | 2 --
 recipes-qt/qt5/qtbase.inc             | 2 --
 recipes-qt/qt5/qtjsbackend-native.inc | 2 --
 recipes-qt/qt5/qtjsbackend.inc        | 2 --
 5 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass
index fa6f316652..5f83d12d7d 100644
--- a/classes/qmake5_base.bbclass
+++ b/classes/qmake5_base.bbclass
@@ -12,6 +12,9 @@ OE_QMAKE_PLATFORM = "linux-oe-g++"
 # Add -d to show debug output from every qmake call, but it prints *a lot*
 OE_QMAKE_DEBUG_OUTPUT = "-d"
 
+# Paths in .prl files contain SYSROOT value
+SSTATE_SCAN_FILES += "*.pri *.prl"
+
 EXTRA_OEMAKE = " MAKEFLAGS='${PARALLEL_MAKE}'"
 
 EXTRA_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 5f88130d2b..764e010e0d 100644
--- a/recipes-qt/qt5/qtbase-native.inc
+++ b/recipes-qt/qt5/qtbase-native.inc
@@ -9,8 +9,6 @@ inherit native qmake5_base
 
 QT_MODULE = "qtbase"
 
-SSTATE_SCAN_FILES += "*.pri *.prl"
-
 SRC_URI += " \
     file://0001-Add-linux-oe-g-platform.patch \
     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 a5ac60cbc7..f348c19ddd 100644
--- a/recipes-qt/qt5/qtbase.inc
+++ b/recipes-qt/qt5/qtbase.inc
@@ -27,8 +27,6 @@ QT_MODULE_FLAGS = "-no-xcb"
 
 INC_PR = "r0"
 
-SSTATE_SCAN_FILES += "*.pri *.prl"
-
 # Qt uses atomic instructions not supported in thumb mode
 ARM_INSTRUCTION_SET = "arm"
 
diff --git a/recipes-qt/qt5/qtjsbackend-native.inc b/recipes-qt/qt5/qtjsbackend-native.inc
index b73311eeaa..25de8e60ea 100644
--- a/recipes-qt/qt5/qtjsbackend-native.inc
+++ b/recipes-qt/qt5/qtjsbackend-native.inc
@@ -5,8 +5,6 @@ DEPENDS = "qtbase-native"
 
 QT_MODULE = "qtjsbackend"
 
-SSTATE_SCAN_FILES += "*.pri *.prl"
-
 INC_PR = "r0"
 
 inherit native qmake5_base
diff --git a/recipes-qt/qt5/qtjsbackend.inc b/recipes-qt/qt5/qtjsbackend.inc
index a7e956d883..9cbe9378f4 100644
--- a/recipes-qt/qt5/qtjsbackend.inc
+++ b/recipes-qt/qt5/qtjsbackend.inc
@@ -8,8 +8,6 @@ DEPENDS = "qtbase qtjsbackend-native"
 
 INC_PR = "r0"
 
-SSTATE_SCAN_FILES += "*.pri *.prl"
-
 inherit qmake5
 
 SRC_URI += " \