Patchwork [meta-opie,13/17] qmake: do not try to regenerate moc

login
register
mail settings
Submitter lumag
Date Sept. 18, 2011, 11:23 a.m.
Message ID <1316344999-26642-14-git-send-email-dbaryshkov@gmail.com>
Download mbox | patch
Permalink /patch/11647/
State Accepted, archived
Headers show

Comments

lumag - Sept. 18, 2011, 11:23 a.m.
There is no point in regenerating moc constantly. Add no_mocdep to the
oe qmake config. Also bump PR for this change.

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---
 recipes-qt/qmake/files/linux-oe-qmake.conf |    2 +-
 recipes-qt/qmake/qmake-native_1.07a.bb     |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Patch

diff --git a/recipes-qt/qmake/files/linux-oe-qmake.conf b/recipes-qt/qmake/files/linux-oe-qmake.conf
index 205b693..4b7db70 100644
--- a/recipes-qt/qmake/files/linux-oe-qmake.conf
+++ b/recipes-qt/qmake/files/linux-oe-qmake.conf
@@ -4,7 +4,7 @@ 
 
 MAKEFILE_GENERATOR	= UNIX
 TEMPLATE		= app
-CONFIG			+= qt warn_on release
+CONFIG			+= qt warn_on release no_mocdepend
 
 QMAKE_CC		= $(OE_QMAKE_CC)
 QMAKE_LEX		= flex
diff --git a/recipes-qt/qmake/qmake-native_1.07a.bb b/recipes-qt/qmake/qmake-native_1.07a.bb
index 00faa9b..43d3a4d 100644
--- a/recipes-qt/qmake/qmake-native_1.07a.bb
+++ b/recipes-qt/qmake/qmake-native_1.07a.bb
@@ -2,7 +2,7 @@  DESCRIPTION = "TrollTech Makefile Generator"
 HOMEPAGE = "http://www.trolltech.com"
 SECTION = "devel"
 LICENSE = "GPL QPL"
-PR = "r6"
+PR = "r7"
 
 QTEVER = "qt-embedded-free-3.3.5"