summaryrefslogtreecommitdiffstats
path: root/installerfw.pri
diff options
context:
space:
mode:
authorKatja Marttila <katja.marttila@qt.io>2024-02-29 11:57:45 +0200
committerKatja Marttila <katja.marttila@qt.io>2024-03-06 08:54:35 +0200
commitae069274425174be39aa26ad2ce7072334e2b2eb (patch)
treedb72a9684638fe285d472192e1af6e67108d7250 /installerfw.pri
parent270603e9db275ad352f84247dbd77389285109cd (diff)
Fix translations missing in Linux and macOS
In Qt6.6.0 resource compiler(rcc) is moved to libexec folder, and IFW variable $$RCC no longer points to correct location. Fixed so that if resource compiler is not found from $$RCC, rcc is searched from libexec folder Task-number: QTIFW-3310 Change-Id: I1bb9555002d78ff7177bbdad7c7fbf72251a64f5 Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
Diffstat (limited to 'installerfw.pri')
-rw-r--r--installerfw.pri9
1 files changed, 9 insertions, 0 deletions
diff --git a/installerfw.pri b/installerfw.pri
index 50166becd..26bce3fee 100644
--- a/installerfw.pri
+++ b/installerfw.pri
@@ -98,6 +98,15 @@ win32 {
LCONVERT = $${LCONVERT}.exe
QMAKE_BINARY = $${QMAKE_BINARY}.exe
}
+
+#6.6.0 rcc has been moved to libexec in linux/mac and the RCC variable no longer
+#points to correct location
+!exists($$RCC) {
+ RCC = $$toNativeSeparators($$cleanPath($$[QT_INSTALL_LIBEXECS]/rcc))
+}
+!exists($$RCC) {
+ warning("Resource compiler '$$RCC' not found.")
+}
win32-g++*:QMAKE_CXXFLAGS += -Wno-attributes
macx:QMAKE_CXXFLAGS += -fvisibility=hidden -fvisibility-inlines-hidden