meta-qt5/recipes-qt/qt5/qtwebengine/0002-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch

   1 From 7266e333c6568fec1e2ebbf0c2d68c4025397b2d Mon Sep 17 00:00:00 2001
   2 From: Martin Jansa <Martin.Jansa@gmail.com>
   3 Date: Mon, 30 Jun 2014 20:08:17 +0200
   4 Subject: [PATCH 2/6] functions.prf: Don't match QMAKE_EXT_CPP or QMAKE_EXT_H
   5  anywhere in patch, but at the end
   6
   7 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
   8 ---
   9  tools/qmake/mkspecs/features/functions.prf | 4 ++--
  10  1 file changed, 2 insertions(+), 2 deletions(-)
  11
  12 diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf
  13 index 8725fd2..15c2941 100644
  14 --- a/tools/qmake/mkspecs/features/functions.prf
  15 +++ b/tools/qmake/mkspecs/features/functions.prf
  16 @@ -40,8 +40,8 @@ defineReplace(findIncludedMocFiles) {
  17  defineReplace(mocOutput) {
  18    out = $$1
  19    # The order is important, since the output of the second replace would end up accidentaly transformed by the first one
  20 -  out = $$replace(out, ^(.*)($$join(QMAKE_EXT_CPP,|)), $${QMAKE_CPP_MOD_MOC}\\1$${QMAKE_EXT_CPP_MOC})
  21 -  out = $$replace(out, ^(.*)($$join(QMAKE_EXT_H,|)), $${QMAKE_H_MOD_MOC}\\1$${first(QMAKE_EXT_CPP)})
  22 +  out = $$replace(out, ^(.*)($$join(QMAKE_EXT_CPP,|))$, $${QMAKE_CPP_MOD_MOC}\\1$${QMAKE_EXT_CPP_MOC})
  23 +  out = $$replace(out, ^(.*)($$join(QMAKE_EXT_H,|))$, $${QMAKE_H_MOD_MOC}\\1$${first(QMAKE_EXT_CPP)})
  24    return($$out)
  25  }
  26
  27 --
  28 2.1.1
  29