# HG changeset patch
# User Rik <rik@octave.org>
# Date 1487100952 28800
# Node ID bf358512f67ea08f3e58333618c6261529142bd1
# Parent  8bf7d78a7746d1af40db679b27559c092aebea21
Correctly locate cross-compiler versions of Qt tools (bug #50258).

* default-octave.mk: Set environment variables for RCC_QTVER, UIC_QTVER,
MOC_QTVER, LRELEASE_QTVER so that Octave configure script locates
cross-compiler versions of these tools.

diff -r 8bf7d78a7746 -r bf358512f67e src/default-octave.mk
--- a/src/default-octave.mk	Sun Feb 05 07:12:24 2017 -0500
+++ b/src/default-octave.mk	Tue Feb 14 11:35:52 2017 -0800
@@ -55,10 +55,10 @@
 ## If we allow the system Qt libraries to be used, then these
 ## won't make sense.
 $(PKG)_QT_CONFIGURE_OPTIONS := \
-  MOC=$(MXE_MOC) \
-  UIC=$(MXE_UIC) \
-  RCC=$(MXE_RCC) \
-  LRELEASE=$(MXE_LRELEASE)
+  MOC_QTVER=$(MXE_MOC) \
+  UIC_QTVER=$(MXE_UIC) \
+  RCC_QTVER=$(MXE_RCC) \
+  LRELEASE_QTVER=$(MXE_LRELEASE)
 
 ifeq ($(ENABLE_QT5),yes)
   #$(PKG)_PKG_CONFIG_PATH := "$(HOST_LIBDIR)/pkgconfig"