fix: qmake build FTBFS

chore: merge Qt translations into app translations as well
2025-04-26 17:23:56 +08:00 · 2025-04-26 17:02:24 +08:00
3 changed files with 10 additions and 4 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -118,10 +118,16 @@ add_executable (${EXE_NAME}
 )

 if (${QT_VERSION_MAJOR} EQUAL "6")
+    set(ADD_TRANSLATIONS_ADDITIONAL_ARGS)
+
+    if (Qt6_VERSION VERSION_GREATER_EQUAL "6.9.0")
+        set(ADD_TRANSLATIONS_ADDITIONAL_ARGS MERGE_QT_TRANSLATIONS)
+    endif()
+
    if (TRANSLATION_RESOURCE_EMBEDDING)
-        qt_add_translations(${EXE_NAME} TS_FILES ${PPIC_TS_FILES})
+        qt_add_translations(${EXE_NAME} ${ADD_TRANSLATIONS_ADDITIONAL_ARGS} TS_FILES ${PPIC_TS_FILES})
    else()
-        qt_add_translations(${EXE_NAME} TS_FILES ${PPIC_TS_FILES} QM_FILES_OUTPUT_VARIABLE PPIC_QM_FILES)
+        qt_add_translations(${EXE_NAME} ${ADD_TRANSLATIONS_ADDITIONAL_ARGS} TS_FILES ${PPIC_TS_FILES} QM_FILES_OUTPUT_VARIABLE PPIC_QM_FILES)
    endif()
 else()
    qt_create_translation(PPIC_QM_FILES ${PPIC_CPP_FILES_FOR_I18N} ${PPIC_TS_FILES})
--- a/app/translations/PineapplePictures_en.ts
+++ b/app/translations/PineapplePictures_en.ts
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1">
+<TS version="2.1" language="en_US">
 <context>
    <name>AboutDialog</name>
    <message>
--- a/pineapple-pictures.pro
+++ b/pineapple-pictures.pro
@ -68,7 +68,7 @@ HEADERS += \
    app/fileopeneventhandler.h

 TRANSLATIONS = \
-    app/translations/PineapplePictures.ts \
+    app/translations/PineapplePictures_en.ts \
    app/translations/PineapplePictures_zh_CN.ts \
    app/translations/PineapplePictures_de.ts \
    app/translations/PineapplePictures_es.ts \
Author	SHA1	Message	Date
Gary Wang	c6068ba23d	fix: qmake build FTBFS	2025-04-26 17:23:56 +08:00
Gary Wang	fbdd858fbd	chore: merge Qt translations into app translations as well	2025-04-26 17:02:24 +08:00