From 628d116cf5dc9b1d2bb0ed3c6cc95526b51ba407 Mon Sep 17 00:00:00 2001 From: Peter Hartmann Date: Wed, 26 Jul 2017 12:47:51 +0200 Subject: [PATCH] rcc: Use the right binary when invoking manually Otherwise we could run into the following error: rcc: could not exec '/usr/lib/x86_64-linux-gnu/qt4/bin/rcc': No such file or directory Makefile:626: recipe for target 'rcc/qrc_images.cpp' failed make: *** [rcc/qrc_images.cpp] Error 1 --- examples/automotive/automotive.pro | 4 ++-- examples/qvgviewer/qvgviewer.pro | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/automotive/automotive.pro b/examples/automotive/automotive.pro index 8cdc0140..491aa193 100644 --- a/examples/automotive/automotive.pro +++ b/examples/automotive/automotive.pro @@ -82,11 +82,11 @@ rccgen.commands += $${QMAKE_MKDIR} $${RCC_DIR} QRC_SHADOW_CLONE = $${OUT_PWD}/${QMAKE_FILE_BASE}_shadow.qrc rccgen.commands += && $${QMAKE_COPY} ${QMAKE_FILE_IN} $${QRC_SHADOW_CLONE} - rccgen.commands += && rcc $${QRC_SHADOW_CLONE} -o ${QMAKE_FILE_OUT} + rccgen.commands += && $$dirname(QMAKE_QMAKE)/rcc $${QRC_SHADOW_CLONE} -o ${QMAKE_FILE_OUT} rccgen.commands += && $${QMAKE_DEL_FILE} $${QRC_SHADOW_CLONE} } else { - rccgen.commands += && rcc ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} + rccgen.commands += && $$dirname(QMAKE_QMAKE)/rcc ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} } # We would like to define a dependency for "svg2qvg.variable_out" - diff --git a/examples/qvgviewer/qvgviewer.pro b/examples/qvgviewer/qvgviewer.pro index ac21de4c..d80e6de2 100644 --- a/examples/qvgviewer/qvgviewer.pro +++ b/examples/qvgviewer/qvgviewer.pro @@ -43,11 +43,11 @@ rccgen.commands += $${QMAKE_MKDIR} $${RCC_DIR} QRC_SHADOW_CLONE = $${OUT_PWD}/${QMAKE_FILE_BASE}_shadow.qrc rccgen.commands += && $${QMAKE_COPY} ${QMAKE_FILE_IN} $${QRC_SHADOW_CLONE} - rccgen.commands += && rcc $${QRC_SHADOW_CLONE} -o ${QMAKE_FILE_OUT} + rccgen.commands += && $$dirname(QMAKE_QMAKE)/rcc $${QRC_SHADOW_CLONE} -o ${QMAKE_FILE_OUT} rccgen.commands += && $${QMAKE_DEL_FILE} $${QRC_SHADOW_CLONE} } else { - rccgen.commands += && rcc ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} + rccgen.commands += && $$dirname(QMAKE_QMAKE)/rcc ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} } # We would like to define a dependency for "svg2qvg.variable_out" -