Merge branch 'develop'

Lymphatus · Apr 29, 2023 · 00352e7 · 00352e7
2 parents ecc96d6 + cfc9872
commit 00352e7
Show file tree

Hide file tree

Showing 32 changed files with 2,005 additions and 1,681 deletions.
diff --git a/.github/workflows/build-qt.yml b/.github/workflows/build-qt.yml
@@ -24,7 +24,7 @@ jobs:
         uses: jurplel/install-qt-action@v3
         with:
           aqtversion: '==3.0.*'
-          version: '6.4.2'
+          version: '6.4.3'
           host: 'windows'
           target: 'desktop'
           arch: 'win64_mingw'

diff --git a/.idea/qmlSettings.xml b/.idea/qmlSettings.xml
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -63,10 +63,7 @@ endif ()
 
 set(LIBCAESIUM_SOURCE_DIR ${CMAKE_BINARY_DIR}/libcaesium-prefix/src/libcaesium)
 string(TOLOWER ${CMAKE_BUILD_TYPE} LIBCAESIUM_BUILD_TYPE)
-if (WIN32)
-    #link_directories(${LIBCAESIUM_SOURCE_DIR}\\target\\x86_64-pc-windows-msvc\\${LIBCAESIUM_BUILD_TYPE})
-else ()
-
+if (NOT WIN32)
     link_directories(${LIBCAESIUM_SOURCE_DIR}/target/${LIBCAESIUM_BUILD_TYPE})
 endif ()
 find_package(QT NAMES Qt6 Qt5 COMPONENTS Widgets Core Gui Concurrent Svg Network Sql LinguistTools REQUIRED)
@@ -127,6 +124,7 @@ SET(TS_FILES
         resources/i18n/caesium_id_ID.ts
         resources/i18n/caesium_zh_TW.ts
         resources/i18n/caesium_sk_SK.ts
+        resources/i18n/caesium_pl_PL.ts
         )
 
 set_source_files_properties(${TS_FILES} PROPERTIES OUTPUT_LOCATION ${CMAKE_BINARY_DIR}/i18n)

diff --git a/libcaesium.conf b/libcaesium.conf
@@ -1 +1 @@
-0.10.1
+0.10.2