summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--recipes-qt/qt5/qtwebengine_5.3.2+git.bb9
-rw-r--r--recipes-qt/qt5/qtwebengine_git.bb9
2 files changed, 6 insertions, 12 deletions
diff --git a/recipes-qt/qt5/qtwebengine_5.3.2+git.bb b/recipes-qt/qt5/qtwebengine_5.3.2+git.bb
index c9a6ea41..9c65d7ad 100644
--- a/recipes-qt/qt5/qtwebengine_5.3.2+git.bb
+++ b/recipes-qt/qt5/qtwebengine_5.3.2+git.bb
@@ -9,12 +9,8 @@ DEFAULT_PREFERENCE = "1"
9QT_MODULE_BRANCH = "1.0" 9QT_MODULE_BRANCH = "1.0"
10QT_MODULE_BRANCH_CHROMIUM = "33.0.1750.170-based" 10QT_MODULE_BRANCH_CHROMIUM = "33.0.1750.170-based"
11 11
12# For now we have to define SRC_URI here again as qt5-git.inc points to 12SRC_URI += " \
13# qt.gitorious.org/qt/ but qtwebengine is still on qt.gitorious.org/qt-labs/ which will 13 git://gitorious.org/qt/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};destsuffix=git/src/3rdparty \
14# switch soon.
15SRC_URI = " \
16 git://gitorious.org/qt/qtwebengine.git;name=qtwebengine;protocol=git;branch=${QT_MODULE_BRANCH} \
17 git://gitorious.org/qt/qtwebengine-chromium.git;name=chromium;protocol=git;branch=${QT_MODULE_BRANCH_CHROMIUM};destsuffix=git/src/3rdparty \
18 file://0001-Use-ninja-supplied-by-environment-variable-NINJA_PAT.patch \ 14 file://0001-Use-ninja-supplied-by-environment-variable-NINJA_PAT.patch \
19 file://0002-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch \ 15 file://0002-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch \
20 file://0003-functions.prf-Try-to-add-_moc-suffix.patch \ 16 file://0003-functions.prf-Try-to-add-_moc-suffix.patch \
@@ -24,5 +20,6 @@ SRC_URI = " \
24" 20"
25SRCREV_qtwebengine = "21f6ce84ecca9a4ff2aa980b21d2e5174c78d14b" 21SRCREV_qtwebengine = "21f6ce84ecca9a4ff2aa980b21d2e5174c78d14b"
26SRCREV_chromium = "1f3cc8c2618979b557d60ef1ad984a49dca83bff" 22SRCREV_chromium = "1f3cc8c2618979b557d60ef1ad984a49dca83bff"
23SRCREV = "${SRCREV_qtwebengine}"
27 24
28SRCREV_FORMAT = "qtwebengine" 25SRCREV_FORMAT = "qtwebengine"
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index 7fe21900..a2f685ae 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -4,12 +4,8 @@ require ${PN}.inc
4QT_MODULE_BRANCH = "1.0" 4QT_MODULE_BRANCH = "1.0"
5QT_MODULE_BRANCH_CHROMIUM = "33.0.1750.170-based" 5QT_MODULE_BRANCH_CHROMIUM = "33.0.1750.170-based"
6 6
7# For now we have to define SRC_URI here again as qt5-git.inc points to 7SRC_URI += " \
8# qt.gitorious.org/qt/ but qtwebengine is still on qt.gitorious.org/qt-labs/ which will 8 git://gitorious.org/qt/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};destsuffix=git/src/3rdparty \
9# switch soon.
10SRC_URI = " \
11 git://gitorious.org/qt/qtwebengine.git;name=qtwebengine;protocol=git;branch=${QT_MODULE_BRANCH} \
12 git://gitorious.org/qt/qtwebengine-chromium.git;name=chromium;protocol=git;branch=${QT_MODULE_BRANCH_CHROMIUM};destsuffix=git/src/3rdparty \
13 file://0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch \ 9 file://0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch \
14 file://0002-functions.prf-Try-to-add-_moc-suffix.patch \ 10 file://0002-functions.prf-Try-to-add-_moc-suffix.patch \
15 file://0001-chromium-Drop-build-time-only-dependency-on-x11-libr.patch \ 11 file://0001-chromium-Drop-build-time-only-dependency-on-x11-libr.patch \
@@ -18,5 +14,6 @@ SRC_URI = " \
18" 14"
19SRCREV_qtwebengine = "14fcf0d3193e2ee2bf904a305c9f34ff8d0e5ce7" 15SRCREV_qtwebengine = "14fcf0d3193e2ee2bf904a305c9f34ff8d0e5ce7"
20SRCREV_chromium = "1f3cc8c2618979b557d60ef1ad984a49dca83bff" 16SRCREV_chromium = "1f3cc8c2618979b557d60ef1ad984a49dca83bff"
17SRCREV = "${SRCREV_qtwebengine}"
21 18
22SRCREV_FORMAT = "qtwebengine" 19SRCREV_FORMAT = "qtwebengine"