From 0a6e28355df74e99337e605e9d7f3ad45a0468d2 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Fri, 7 Nov 2014 02:50:35 +0000 Subject: Use moc-qt4 if present for systems with multiple Qt versions. git-svn-id: http://svn.drobilla.net/lad/trunk/jalv@5479 a436a847-0d15-0410-975c-d299462d15a1 --- NEWS | 3 ++- wscript | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 06bd733..48ba720 100644 --- a/NEWS +++ b/NEWS @@ -2,8 +2,9 @@ jalv (1.4.7) unstable; * Exit on jack shutdown (Patch from Robin Gareus) * Fix semaphore correctness issues + * Use moc-qt4 if present for systems with multiple Qt versions - -- David Robillard Sun, 28 Sep 2014 13:30:20 -0400 + -- David Robillard Thu, 06 Nov 2014 21:49:59 -0500 jalv (1.4.6) stable; diff --git a/wscript b/wscript index 61a3664..0b18141 100644 --- a/wscript +++ b/wscript @@ -56,7 +56,8 @@ def configure(conf): autowaf.check_pkg(conf, 'QtGui', uselib_store='QT4', atleast_version='4.0.0', mandatory=False) if conf.is_defined('HAVE_QT4'): - conf.find_program('moc') + if not conf.find_program('moc-qt4', var='MOC', mandatory=False): + conf.find_program('moc') conf.check(function_name='jack_port_type_get_buffer_size', header_name='jack/jack.h', -- cgit v1.2.1