meta-qt5/recipes-qt/qt5/qtwebengine-git/0002-functions.prf-Try-to-add-_moc-suffix.patch

   1 From 4fd50d344ad5e7f89e538222605dd50d0f636d3a Mon Sep 17 00:00:00 2001
   2 From: Martin Jansa <Martin.Jansa@gmail.com>
   3 Date: Tue, 1 Jul 2014 15:58:16 +0200
   4 Subject: [PATCH 2/2] functions.prf: Try to add _moc suffix
   5
   6 * otherwise moc generated files have the same basename and do_configure fails with:
   7   core_generated.gyp:QtWebEngineCore#target has several files with the same basename:
   8   |   javascript_dialog_controller: javascript_dialog_controller.cpp
   9   | /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
  10   ...
  11
  12 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
  13 ---
  14  tools/qmake/mkspecs/features/functions.prf | 4 ++--
  15  1 file changed, 2 insertions(+), 2 deletions(-)
  16
  17 diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf
  18 index 3b9babe..6d691df 100644
  19 --- a/tools/qmake/mkspecs/features/functions.prf
  20 +++ b/tools/qmake/mkspecs/features/functions.prf
  21 @@ -61,8 +61,8 @@ defineReplace(findIncludedMocFiles) {
  22  defineReplace(mocOutput) {
  23    out = $$1
  24    # The order is important, since the output of the second replace would end up accidentaly transformed by the first one
  25 -  out = $$replace(out, ^(.*)($$join(QMAKE_EXT_CPP,|))$, $${QMAKE_CPP_MOD_MOC}\\1$${QMAKE_EXT_CPP_MOC})
  26 -  out = $$replace(out, ^(.*)($$join(QMAKE_EXT_H,|))$, $${QMAKE_H_MOD_MOC}\\1$${first(QMAKE_EXT_CPP)})
  27 +  out = $$replace(out, ^(.*)($$join(QMAKE_EXT_CPP,|))$, $${QMAKE_CPP_MOD_MOC}\\1_moc$${QMAKE_EXT_CPP_MOC})
  28 +  out = $$replace(out, ^(.*)($$join(QMAKE_EXT_H,|))$, $${QMAKE_H_MOD_MOC}\\1_moc$${first(QMAKE_EXT_CPP)})
  29    return($$out)
  30  }
  31
  32 --
  33 2.1.1
  34