summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine.inc
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-qt/qt5/qtwebengine.inc')
-rw-r--r--recipes-qt/qt5/qtwebengine.inc10
1 files changed, 5 insertions, 5 deletions
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 @@
1SUMMARY = "QtWebEngine combines the power of Chromium and Qt" 1SUMMARY = "QtWebEngine combines the power of Chromium and Qt"
2LICENSE = "LGPL-2.1 & BSD" 2LICENSE = "LGPL-2.1 & BSD"
3LIC_FILES_CHKSUM = " \ 3LIC_FILES_CHKSUM = " \
4 file://src/core/browser_context_qt.cpp;md5=c23e24b6a534c8b6cc879a397b35db29;beginline=1;endline=40 \ 4 file://src/core/browser_context_qt.cpp;md5=91895ac1852e1b07202d9716194e8dd8;beginline=1;endline=35 \
5 file://src/3rdparty/chromium/LICENSE;md5=d2d164565cc10f298390174d9cb6d18d \ 5 file://src/3rdparty/chromium/LICENSE;md5=537e0b52077bf0a616d0a0c8a79bc9d5 \
6" 6"
7DEPENDS += " \ 7DEPENDS += " \
8 ninja-native \ 8 ninja-native \
@@ -23,8 +23,6 @@ inherit perlnative
23 23
24require recipes-qt/qt5/qt5.inc 24require recipes-qt/qt5/qt5.inc
25 25
26S = "${WORKDIR}/git"
27
28# To avoid trouble start with not separated build directory 26# To avoid trouble start with not separated build directory
29SEPB = "${S}" 27SEPB = "${S}"
30B = "${SEPB}" 28B = "${SEPB}"
@@ -32,6 +30,8 @@ B = "${SEPB}"
32# Project ERROR: Missing CMake tests. Either create tests in tests/auto/cmake, or disable cmake config file creation with CONFIG-=create_cmake. 30# Project ERROR: Missing CMake tests. Either create tests in tests/auto/cmake, or disable cmake config file creation with CONFIG-=create_cmake.
33EXTRA_QMAKEVARS_POST += "CONFIG-=create_cmake" 31EXTRA_QMAKEVARS_POST += "CONFIG-=create_cmake"
34 32
33export NINJA_PATH="${STAGING_BINDIR_NATIVE}/ninja"
34
35do_configure() { 35do_configure() {
36 # replace LD with CXX, to workaround a possible gyp inheritssue? 36 # replace LD with CXX, to workaround a possible gyp inheritssue?
37 LD="${CXX}" export LD 37 LD="${CXX}" export LD
@@ -42,7 +42,7 @@ do_configure() {
42 42
43 # qmake can't find the OE_QMAKE_* variables on it's own so directly passing them as 43 # qmake can't find the OE_QMAKE_* variables on it's own so directly passing them as
44 # arguments here 44 # arguments here
45 ${OE_QMAKE_QMAKE} -r ${EXTRA_QMAKEVARS_PRE} QTWEBENGINE_ROOT="${S}" NINJA_PATH="${STAGING_BINDIR_NATIVE}/ninja" \ 45 ${OE_QMAKE_QMAKE} -r ${EXTRA_QMAKEVARS_PRE} QTWEBENGINE_ROOT="${S}" \
46 QMAKE_CXX="${OE_QMAKE_CXX}" QMAKE_CC="${OE_QMAKE_CC}" \ 46 QMAKE_CXX="${OE_QMAKE_CXX}" QMAKE_CC="${OE_QMAKE_CC}" \
47 QMAKE_LINK="${OE_QMAKE_LINK}" \ 47 QMAKE_LINK="${OE_QMAKE_LINK}" \
48 QMAKE_CFLAGS="${OE_QMAKE_CFLAGS}" \ 48 QMAKE_CFLAGS="${OE_QMAKE_CFLAGS}" \