From 54c44443c34f077bfc2c5cc3a92d6db59d28343c Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 27 Nov 2014 13:48:38 +0100 Subject: qt5-git: Update to rc1+, latest revision in 5.4 branch * qtwebengine LIC_FILES_CHKSUM updated because of Copyright year update in chromium's LICENSE < // Copyright (c) 2013 The Chromium Authors. All rights reserved. and shortened the entry for qtwebengine LIC_FILES_CHKSUM, because it was including also few #include lines which were changed recently Signed-off-by: Martin Jansa --- ...0002-functions.prf-Try-to-add-_moc-suffix.patch | 34 ---------------------- 1 file changed, 34 deletions(-) delete mode 100644 recipes-qt/qt5/qtwebengine-git/0002-functions.prf-Try-to-add-_moc-suffix.patch (limited to 'recipes-qt/qt5/qtwebengine-git/0002-functions.prf-Try-to-add-_moc-suffix.patch') diff --git a/recipes-qt/qt5/qtwebengine-git/0002-functions.prf-Try-to-add-_moc-suffix.patch b/recipes-qt/qt5/qtwebengine-git/0002-functions.prf-Try-to-add-_moc-suffix.patch deleted file mode 100644 index 646d2a6e..00000000 --- a/recipes-qt/qt5/qtwebengine-git/0002-functions.prf-Try-to-add-_moc-suffix.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 4fd50d344ad5e7f89e538222605dd50d0f636d3a Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Tue, 1 Jul 2014 15:58:16 +0200 -Subject: [PATCH 2/2] functions.prf: Try to add _moc suffix - -* otherwise moc generated files have the same basename and do_configure fails with: - core_generated.gyp:QtWebEngineCore#target has several files with the same basename: - | javascript_dialog_controller: javascript_dialog_controller.cpp - | /OE/build/oe-core/tmp-eglibc/work/i586-oe-linux/qtwebengine/0.9.99+gitAUTOINC+21f6ce84ec-r0/git/src/core/.moc/moc_/OE/build/oe-core/tmp-eglibc/work/i586-oe-linux/qtwebengine/0.9.99+gitAUTOI.moc+21f6ce84ec-r0/git/src/core/javascript_dialog_controller.cpp - ... - -Signed-off-by: Martin Jansa ---- - tools/qmake/mkspecs/features/functions.prf | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf -index 3b9babe..6d691df 100644 ---- a/tools/qmake/mkspecs/features/functions.prf -+++ b/tools/qmake/mkspecs/features/functions.prf -@@ -61,8 +61,8 @@ defineReplace(findIncludedMocFiles) { - defineReplace(mocOutput) { - out = $$1 - # The order is important, since the output of the second replace would end up accidentaly transformed by the first one -- out = $$replace(out, ^(.*)($$join(QMAKE_EXT_CPP,|))$, $${QMAKE_CPP_MOD_MOC}\\1$${QMAKE_EXT_CPP_MOC}) -- out = $$replace(out, ^(.*)($$join(QMAKE_EXT_H,|))$, $${QMAKE_H_MOD_MOC}\\1$${first(QMAKE_EXT_CPP)}) -+ out = $$replace(out, ^(.*)($$join(QMAKE_EXT_CPP,|))$, $${QMAKE_CPP_MOD_MOC}\\1_moc$${QMAKE_EXT_CPP_MOC}) -+ out = $$replace(out, ^(.*)($$join(QMAKE_EXT_H,|))$, $${QMAKE_H_MOD_MOC}\\1_moc$${first(QMAKE_EXT_CPP)}) - return($$out) - } - --- -2.1.1 - -- cgit v1.2.3-54-g00ecf