aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2014-11-07 02:50:35 +0000
committerDavid Robillard <d@drobilla.net>2014-11-07 02:50:35 +0000
commit0a6e28355df74e99337e605e9d7f3ad45a0468d2 (patch)
tree720ea06d7cc4fa4c72f2df8b72aec45b34ea79c9
parent28c2f71a094049f0ca8943e884926a839e890eaa (diff)
downloadjalv-0a6e28355df74e99337e605e9d7f3ad45a0468d2.tar.gz
jalv-0a6e28355df74e99337e605e9d7f3ad45a0468d2.tar.bz2
jalv-0a6e28355df74e99337e605e9d7f3ad45a0468d2.zip
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
-rw-r--r--NEWS3
-rw-r--r--wscript3
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 <d@drobilla.net> Sun, 28 Sep 2014 13:30:20 -0400
+ -- David Robillard <d@drobilla.net> 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',