Mercurial > mxe-octave
changeset 4352:bf358512f67e
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.
| author | Rik <rik@octave.org> |
|---|---|
| date | Tue, 14 Feb 2017 11:35:52 -0800 |
| parents | 8bf7d78a7746 |
| children | ae1280afbc8c |
| files | src/default-octave.mk |
| diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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"