From 30712745bc4b9fa4841eb51407c8458eb509e695 Mon Sep 17 00:00:00 2001 From: zz of NSFOCUS Security Team Date: Wed, 22 Nov 2023 22:54:55 +0800 Subject: [PATCH] fix rcc path in QT5 (#2454) see: https://github.com/mesonbuild/meson/pull/9792 Co-authored-by: henices --- src/src.pro | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/src.pro b/src/src.pro index 75ecc00209..313c3d644f 100644 --- a/src/src.pro +++ b/src/src.pro @@ -79,8 +79,13 @@ win32 { rcc_binary.commands = $$shell_path($$[QT_HOST_BINS]/rcc.exe) -name ${QMAKE_FILE_IN_BASE} -binary ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} rcc_binary.depend_command = $$shell_path($$[QT_HOST_BINS]/rcc.exe) -list $$QMAKE_RESOURCE_FLAGS ${QMAKE_FILE_IN} } else { - rcc_binary.commands = $$[QT_HOST_LIBEXECS]/rcc -name ${QMAKE_FILE_IN_BASE} -binary ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} - rcc_binary.depend_command = $$[QT_HOST_LIBEXECS]/rcc -list $$QMAKE_RESOURCE_FLAGS ${QMAKE_FILE_IN} + greaterThan(QT_MAJOR_VERSION, 5) { + rcc_binary.commands = $$[QT_HOST_LIBEXECS]/rcc -name ${QMAKE_FILE_IN_BASE} -binary ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} + rcc_binary.depend_command = $$[QT_HOST_LIBEXECS]/rcc -list $$QMAKE_RESOURCE_FLAGS ${QMAKE_FILE_IN} + } else { + rcc_binary.commands = $$[QT_HOST_BINS]/rcc -name ${QMAKE_FILE_IN_BASE} -binary ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} + rcc_binary.depend_command = $$[QT_HOST_BINS]/rcc -list $$QMAKE_RESOURCE_FLAGS ${QMAKE_FILE_IN} + } } rcc_binary.input = RCC_BINARY_SOURCES rcc_binary.output = $$SRC_DESTDIR/vnote_${QMAKE_FILE_IN_BASE}.rcc