diff options
| author | Denys Dmytriyenko <denys@ti.com> | 2014-11-13 19:09:10 -0500 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-12-09 11:11:25 +0100 |
| commit | c9a1041cb956d94c04cbf635b00ca19725ffc129 (patch) | |
| tree | 695dd5aba449568c23decc4f0e497014bb7f8946 | |
| parent | 54c44443c34f077bfc2c5cc3a92d6db59d28343c (diff) | |
| download | meta-qt5-c9a1041cb956d94c04cbf635b00ca19725ffc129.tar.gz | |
nativesdk-qtbase_git: re-add OEQt5Toolchain to SRC_URI
The file is expected by do_install(), but _git version resets SRC_URI.
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | recipes-qt/qt5/nativesdk-qtbase_git.bb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index ac865c0a..b9dfdfbd 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb | |||
| @@ -25,13 +25,18 @@ SRC_URI += "\ | |||
| 25 | # common for qtbase-native and nativesdk-qtbase | 25 | # common for qtbase-native and nativesdk-qtbase |
| 26 | SRC_URI += " \ | 26 | SRC_URI += " \ |
| 27 | file://0011-Always-build-uic.patch \ | 27 | file://0011-Always-build-uic.patch \ |
| 28 | " | 28 | " |
| 29 | 29 | ||
| 30 | # specific for nativesdk-qtbase | 30 | # specific for nativesdk-qtbase |
| 31 | SRC_URI += " \ | 31 | SRC_URI += " \ |
| 32 | file://0012-configure-preserve-built-qmake-and-swap-with-native-.patch \ | 32 | file://0012-configure-preserve-built-qmake-and-swap-with-native-.patch \ |
| 33 | " | 33 | " |
| 34 | 34 | ||
| 35 | # CMake's toolchain configuration of nativesdk-qtbase | ||
| 36 | SRC_URI += " \ | ||
| 37 | file://OEQt5Toolchain.cmake \ | ||
| 38 | " | ||
| 39 | |||
| 35 | SRCREV = "cc23ebace8b7f343aca6e10f9ebd31b87c17c782" | 40 | SRCREV = "cc23ebace8b7f343aca6e10f9ebd31b87c17c782" |
| 36 | 41 | ||
| 37 | LICENSE = "GFDL-1.3 & LGPL-2.1 | LGPL-3.0" | 42 | LICENSE = "GFDL-1.3 & LGPL-2.1 | LGPL-3.0" |
