summaryrefslogtreecommitdiff
path: root/meta-qt5
diff options
context:
space:
mode:
authorDenys Dmytriyenko <denys@ti.com>2014-11-13 19:09:10 -0500
committerPatrick Ohly <patrick.ohly@intel.com>2015-01-09 08:46:23 -0800
commit516a1099ec40c27b428211a438a3d5ce259a9d6f (patch)
treeb0ad8548300f5227410c1cb632c9a57d0f667ce0 /meta-qt5
parent8e0b18a397b570df654b72da6d8741ff6c0fd9f3 (diff)
downloadtizen-distro-516a1099ec40c27b428211a438a3d5ce259a9d6f.tar.gz
tizen-distro-516a1099ec40c27b428211a438a3d5ce259a9d6f.tar.bz2
tizen-distro-516a1099ec40c27b428211a438a3d5ce259a9d6f.zip
nativesdk-qtbase_git: re-add OEQt5Toolchain to SRC_URI
The file is expected by do_install(), but _git version resets SRC_URI. (From meta-qt5 rev: c9a1041cb956d94c04cbf635b00ca19725ffc129) Signed-off-by: Denys Dmytriyenko <denys@ti.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Diffstat (limited to 'meta-qt5')
-rw-r--r--meta-qt5/recipes-qt/qt5/nativesdk-qtbase_git.bb7
1 files changed, 6 insertions, 1 deletions
diff --git a/meta-qt5/recipes-qt/qt5/nativesdk-qtbase_git.bb b/meta-qt5/recipes-qt/qt5/nativesdk-qtbase_git.bb
index ac865c0aa6..b9dfdfbdf6 100644
--- a/meta-qt5/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/meta-qt5/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -25,13 +25,18 @@ SRC_URI += "\
# common for qtbase-native and nativesdk-qtbase
SRC_URI += " \
file://0011-Always-build-uic.patch \
-"
+"
# specific for nativesdk-qtbase
SRC_URI += " \
file://0012-configure-preserve-built-qmake-and-swap-with-native-.patch \
"
+# CMake's toolchain configuration of nativesdk-qtbase
+SRC_URI += " \
+ file://OEQt5Toolchain.cmake \
+"
+
SRCREV = "cc23ebace8b7f343aca6e10f9ebd31b87c17c782"
LICENSE = "GFDL-1.3 & LGPL-2.1 | LGPL-3.0"