From 6566f728ab3d14a4908516fb13ad555dbfe04471 Mon Sep 17 00:00:00 2001 From: Jonathan Liu Date: Thu, 11 Dec 2014 15:52:18 +1100 Subject: recipes: upgrade from 5.3.2 to 5.4.0 MJ: nativesdk-qtbase, nativesdk-qttools, qtbase-native: Drop unnecessary LICENSE/LIC_FILES_CHKSUM MJ: qtwebkit: move leveldb dependency to .inc Signed-off-by: Martin Jansa Signed-off-by: Jonathan Liu --- recipes-qt/qt5/qtwebengine.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'recipes-qt/qt5/qtwebengine.inc') diff --git a/recipes-qt/qt5/qtwebengine.inc b/recipes-qt/qt5/qtwebengine.inc index 940fdfb1..525e6570 100644 --- a/recipes-qt/qt5/qtwebengine.inc +++ b/recipes-qt/qt5/qtwebengine.inc @@ -1,8 +1,8 @@ SUMMARY = "QtWebEngine combines the power of Chromium and Qt" LICENSE = "LGPL-2.1 & BSD" LIC_FILES_CHKSUM = " \ - file://src/core/browser_context_qt.cpp;md5=c23e24b6a534c8b6cc879a397b35db29;beginline=1;endline=40 \ - file://src/3rdparty/chromium/LICENSE;md5=d2d164565cc10f298390174d9cb6d18d \ + file://src/core/browser_context_qt.cpp;md5=91895ac1852e1b07202d9716194e8dd8;beginline=1;endline=35 \ + file://src/3rdparty/chromium/LICENSE;md5=537e0b52077bf0a616d0a0c8a79bc9d5 \ " DEPENDS += " \ ninja-native \ @@ -23,8 +23,6 @@ inherit perlnative require recipes-qt/qt5/qt5.inc -S = "${WORKDIR}/git" - # To avoid trouble start with not separated build directory SEPB = "${S}" B = "${SEPB}" @@ -32,6 +30,8 @@ B = "${SEPB}" # Project ERROR: Missing CMake tests. Either create tests in tests/auto/cmake, or disable cmake config file creation with CONFIG-=create_cmake. EXTRA_QMAKEVARS_POST += "CONFIG-=create_cmake" +export NINJA_PATH="${STAGING_BINDIR_NATIVE}/ninja" + do_configure() { # replace LD with CXX, to workaround a possible gyp inheritssue? LD="${CXX}" export LD @@ -42,7 +42,7 @@ do_configure() { # qmake can't find the OE_QMAKE_* variables on it's own so directly passing them as # arguments here - ${OE_QMAKE_QMAKE} -r ${EXTRA_QMAKEVARS_PRE} QTWEBENGINE_ROOT="${S}" NINJA_PATH="${STAGING_BINDIR_NATIVE}/ninja" \ + ${OE_QMAKE_QMAKE} -r ${EXTRA_QMAKEVARS_PRE} QTWEBENGINE_ROOT="${S}" \ QMAKE_CXX="${OE_QMAKE_CXX}" QMAKE_CC="${OE_QMAKE_CC}" \ QMAKE_LINK="${OE_QMAKE_LINK}" \ QMAKE_CFLAGS="${OE_QMAKE_CFLAGS}" \ -- cgit v1.2.3-54-g00ecf