Merge pull request #4 from ganyuanzhen/main

Fix CMake, QML and control file
LingmoOS · Feb 21, 2024 · d65fe84 · d65fe84
2 parents 0028a69 + 27eb8af
commit d65fe84
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -108,11 +108,16 @@ target_link_libraries(${PROJECT_NAME}
         # QApt
 )
 
-file(GLOB TS_FILES translations/*.ts)
 file(GLOB HEADERS "include/*")
-qt5_create_translation(QM_FILES ${TS_FILES})
-add_custom_target(translations DEPENDS ${QM_FILES} SOURCES ${TS_FILES})
-add_dependencies(${PROJECT_NAME} translations)
+
+file(GLOB TS_FILES translations/*.ts)
+foreach(filepath ${TS_FILES})
+    string(REPLACE "${CMAKE_CURRENT_SOURCE_DIR}/" "" filename ${filepath})
+    list(APPEND ts_files_replaced ${filename})
+endforeach()
+qt5_create_translation(QM_FILES ${CMAKE_CURRENT_SOURCE_DIR} ${ts_files_replaced})
+
+add_custom_target(translations ALL DEPENDS ${QM_FILES} SOURCES ${TS_FILES})
 
 foreach(_ts_file ${TS_FILES})
     execute_process(

diff --git a/debian/control b/debian/control
@@ -39,7 +39,7 @@ Depends: qml-module-qtquick-controls2,
          qml-module-qtquick-shapes,
          qml-module-qtquick-dialogs,
          qml-module-qtquick-particles2,
-         lingmo,
+         liblingmo,
          kscreen,
          ${misc:Depends},
          ${shlibs:Depends}

diff --git a/src/qml/Update/UpdatesPage.qml b/src/qml/Update/UpdatesPage.qml
@@ -1,3 +1,5 @@
+import QtQuick 2.12
+
 Item {
     id: control
 
@@ -179,3 +181,4 @@ Item {
         }
     }
 }
+}