fix: Resolve conflicts between develop and background-image

FashionFreedom · Apr 13, 2024 · 80e47f3 · 80e47f3
2 parents e0ebfe8 + 11fac63
commit 80e47f3
Show file tree

Hide file tree

Showing 196 changed files with 9,697 additions and 8,714 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -335,7 +335,7 @@ jobs:
       - uses: actions/download-artifact@v4
         with:
           name: Seamly2D-win32.zip
-      - uses: softprops/action-gh-release@v1
+      - uses: softprops/action-gh-release@v2
         with:
           tag_name: v${{ env.VERSION_NUMBER }}
           name: ${{ env.VERSION_NUMBER }}
@@ -357,7 +357,7 @@ jobs:
 
     steps:
       - name: Doxygen GitHub Pages Deploy Action
-        uses: DenverCoder1/doxygen-github-pages-action@v1.3.0
+        uses: DenverCoder1/doxygen-github-pages-action@60e8d33d954eafb4d54710db8130fb0ad8f7d157
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           branch: gh-pages

diff --git a/Seamly2D.pro b/Seamly2D.pro
@@ -15,7 +15,7 @@ SUBDIRS = \
 out.depends = src
 
 qtPrepareTool(LUPDATE, lupdate)
-lupdate.commands = $$LUPDATE -noobsolete $$shell_path($${PWD}/share/translations/translations.pro)
+lupdate.commands = $$LUPDATE -noobsolete -locations relative $$shell_path($${PWD}/share/translations/translations.pro)
 lupdate.commands += && $$LUPDATE -noobsolete $$shell_path($${PWD}/share/translations/measurements.pro)
 
-QMAKE_EXTRA_TARGETS += lupdate
+QMAKE_EXTRA_TARGETS += lupdate