diff options
| -rw-r--r-- | classes/qmake5_base.bbclass | 3 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtbase-native.inc | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtbase.inc | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtjsbackend-native.inc | 2 | ||||
| -rw-r--r-- | 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 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* |
| 13 | OE_QMAKE_DEBUG_OUTPUT = "-d" | 13 | OE_QMAKE_DEBUG_OUTPUT = "-d" |
| 14 | 14 | ||
| 15 | # Paths in .prl files contain SYSROOT value | ||
| 16 | SSTATE_SCAN_FILES += "*.pri *.prl" | ||
| 17 | |||
| 15 | EXTRA_OEMAKE = " MAKEFLAGS='${PARALLEL_MAKE}'" | 18 | EXTRA_OEMAKE = " MAKEFLAGS='${PARALLEL_MAKE}'" |
| 16 | 19 | ||
| 17 | EXTRA_ENV = 'QMAKE="${OE_QMAKE_QMAKE} ${OE_QMAKE_DEBUG_OUTPUT} -after \ | 20 | 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 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 | ||
| 10 | QT_MODULE = "qtbase" | 10 | QT_MODULE = "qtbase" |
| 11 | 11 | ||
| 12 | SSTATE_SCAN_FILES += "*.pri *.prl" | ||
| 13 | |||
| 14 | SRC_URI += " \ | 12 | SRC_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 | ||
| 28 | INC_PR = "r0" | 28 | INC_PR = "r0" |
| 29 | 29 | ||
| 30 | SSTATE_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 |
| 33 | ARM_INSTRUCTION_SET = "arm" | 31 | ARM_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 | ||
| 6 | QT_MODULE = "qtjsbackend" | 6 | QT_MODULE = "qtjsbackend" |
| 7 | 7 | ||
| 8 | SSTATE_SCAN_FILES += "*.pri *.prl" | ||
| 9 | |||
| 10 | INC_PR = "r0" | 8 | INC_PR = "r0" |
| 11 | 9 | ||
| 12 | inherit native qmake5_base | 10 | inherit 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 | ||
| 9 | INC_PR = "r0" | 9 | INC_PR = "r0" |
| 10 | 10 | ||
| 11 | SSTATE_SCAN_FILES += "*.pri *.prl" | ||
| 12 | |||
| 13 | inherit qmake5 | 11 | inherit qmake5 |
| 14 | 12 | ||
| 15 | SRC_URI += " \ | 13 | SRC_URI += " \ |
