Support Windows on arm64

theCheeseboard · Jul 27, 2023 · 6483df3 · 6483df3
1 parent 949df74
commit 6483df3
Show file tree

Hide file tree

Showing 8 changed files with 189 additions and 176 deletions.
diff --git a/.github/workflows/win.yml b/.github/workflows/win.yml
@@ -13,6 +13,12 @@ jobs:
     strategy:
       matrix:
         os: [windows-latest]
+        arch: [amd64, amd64_arm64]
+        include:
+          - arch: amd64
+            qtArch: win64_msvc2019_64
+          - arch: amd64_arm64
+            qtArch: win64_msvc2019_arm64
     runs-on: ${{ matrix.os }}
     steps:
       - uses: vicr123/libcontemporary/prepare-vars@actions
@@ -24,15 +30,17 @@ jobs:
         uses: jurplel/install-qt-action@v3
         with:
           version: ${{ steps.vars.outputs.qtVersion }}
-          arch: win64_msvc2019_64
+          arch: ${{ win64_msvc2019_64 }}
           modules: addons.qtmultimedia addons.qtwebsockets qt5compat
       - name: Set up MSVC
         uses: ilammy/msvc-dev-cmd@v1.12.0
         with:
           sdk: 10.0.22000.0
+          arch: ${{ matrix.arch }}
       - uses: vicr123/libcontemporary/install-libcontemporary@actions
         with:
           qcoroVersion: ${{ steps.vars.outputs.qcoroVersion }}
+          commitish: features/win-aarch64
       - uses: vicr123/libcontemporary/build-project@actions
         name: "Build contemporary-theme"
         with:

diff --git a/application/translations/desktop/com.vicr123.thebeat/en.json b/application/translations/desktop/com.vicr123.thebeat/en.json
@@ -1,12 +1,12 @@
 {
     "GenericName": {
-        "message": "Audio Player"
+        "message": "Audio Player\r"
     },
     "Keywords": {
-        "description": "A list of words that can be searched for. Please ensure that the list also ends with a semicolon!",
-        "message": "audio;music;cd;player;"
+        "description": "A list of words that can be searched for. Please ensure that the list also ends with a semicolon!\r",
+        "message": "audio;music;cd;player;\r"
     },
     "Name": {
-        "message": "theBeat"
+        "message": "theBeat\r"
     }
 }
diff --git a/application/translations/desktop/com.vicr123.thebeat_blueprint/en.json b/application/translations/desktop/com.vicr123.thebeat_blueprint/en.json
@@ -1,12 +1,12 @@
 {
     "GenericName": {
-        "message": "Audio Player"
+        "message": "Audio Player\r"
     },
     "Keywords": {
-        "description": "A list of words that can be searched for. Please ensure that the list also ends with a semicolon!",
-        "message": "audio;music;cd;player;"
+        "description": "A list of words that can be searched for. Please ensure that the list also ends with a semicolon!\r",
+        "message": "audio;music;cd;player;\r"
     },
     "Name": {
-        "message": "theBeat Blueprint"
+        "message": "theBeat Blueprint\r"
     }
 }
diff --git a/plugins/PodcastPlugin/models/podcastmodel.cpp b/plugins/PodcastPlugin/models/podcastmodel.cpp
@@ -7,9 +7,10 @@
 #include <limits.h>
 #include <tapplication.h>
 #include <thebeatcommon.h>
+#include <QPointer>
 
 struct PodcastModelPrivate {
-        QPointer<Podcast> podcast;
+    QPointer<Podcast> podcast;
 };
 
 PodcastModel::PodcastModel(QObject* parent) :

diff --git a/plugins/PodcastPlugin/translations/en_US.ts b/plugins/PodcastPlugin/translations/en_US.ts
@@ -71,17 +71,17 @@
 <context>
     <name>PodcastItemDelegate</name>
     <message>
-        <location filename="../models/podcastmodel.cpp" line="94"/>
+        <location filename="../models/podcastmodel.cpp" line="95"/>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../models/podcastmodel.cpp" line="90"/>
+        <location filename="../models/podcastmodel.cpp" line="91"/>
         <source>Listened</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../models/podcastmodel.cpp" line="96"/>
+        <location filename="../models/podcastmodel.cpp" line="97"/>
         <source>%1 remaining</source>
         <translation type="unfinished"></translation>
     </message>
@@ -137,21 +137,21 @@
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="../widgets/podcastlistingwidget.cpp" line="61"/>
+        <location filename="../widgets/podcastlistingwidget.cpp" line="62"/>
         <source>%n episodes</source>
         <translation type="unfinished">
             <numerusform></numerusform>
         </translation>
     </message>
     <message>
-        <location filename="../widgets/podcastlistingwidget.cpp" line="91"/>
-        <location filename="../widgets/podcastlistingwidget.cpp" line="108"/>
+        <location filename="../widgets/podcastlistingwidget.cpp" line="92"/>
+        <location filename="../widgets/podcastlistingwidget.cpp" line="109"/>
         <source>Up to date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widgets/podcastlistingwidget.cpp" line="92"/>
-        <location filename="../widgets/podcastlistingwidget.cpp" line="109"/>
+        <location filename="../widgets/podcastlistingwidget.cpp" line="93"/>
+        <location filename="../widgets/podcastlistingwidget.cpp" line="110"/>
         <source>You&apos;ve listened to every episode in this podcast.</source>
         <translation type="unfinished"></translation>
     </message>