Work on CI builds

emericg · Nov 28, 2024 · da2ebf1 · da2ebf1
1 parent e700d8f
commit da2ebf1
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 9 deletions.
diff --git a/.github/workflows/builds_desktop_cmake.yml b/.github/workflows/builds_desktop_cmake.yml
@@ -103,7 +103,7 @@ jobs:
       - name: Build application
         run: |
              export CMAKE_BUILD_PARALLEL_LEVEL=`sysctl -n hw.logicalcpu`
-             cmake -B build/ -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"
+             cmake -B build/ -DCMAKE_BUILD_TYPE=Release
              cmake --build build/ --config Release
 
       # Deploy application

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -81,6 +81,8 @@ qt_add_qml_module(${CMAKE_PROJECT_NAME}
         qml/popups/PopupChoice.qml
         qml/popups/PopupDate.qml
         qml/popups/PopupTime.qml
+
+        qml/QmlImports.qml
 )
 
 ################################################################################

diff --git a/assets/linux/qmlapptemplate.appdata.xml → assets/linux/QmlAppTemplate.appdata.xml b/assets/linux/qmlapptemplate.appdata.xml → assets/linux/QmlAppTemplate.appdata.xml
@@ -4,9 +4,9 @@
 <component type="desktop-application">
   <id>io.emeric.qmlapptemplate</id>
   <name>QmlAppTemplate</name>
-  <launchable type="desktop-id">qmlapptemplate.desktop</launchable>
+  <launchable type="desktop-id">QmlAppTemplate.desktop</launchable>
 
-  <summary>Qt6 / QML Application Template</summary>
+  <summary>QML Application Template</summary>
   <description>
     <p>QmlAppTemplate is a Qt6 / QML Application Template</p>
   </description>

diff --git a/assets/linux/qmlapptemplate.desktop → assets/linux/QmlAppTemplate.desktop b/assets/linux/qmlapptemplate.desktop → assets/linux/QmlAppTemplate.desktop
@@ -2,6 +2,6 @@
 Type=Application
 Name=QmlAppTemplate
 Comment=QmlAppTemplate is a Qt6 / QML Application Template
-Exec=qmlapptemplate
-Icon=qmlapptemplate
+Exec=QmlAppTemplate
+Icon=QmlAppTemplate
 Categories=Utility;Qt;
diff --git a/assets/linux/qmlapptemplate.flatpak.yml → assets/linux/QmlAppTemplate.flatpak.yml b/assets/linux/qmlapptemplate.flatpak.yml → assets/linux/QmlAppTemplate.flatpak.yml
@@ -2,11 +2,11 @@ app-id: io.emeric.qmlapptemplate
 runtime: org.freedesktop.Platform
 runtime-version: '24.08'
 sdk: org.freedesktop.Sdk
-command: qmlapptemplate
+command: QmlAppTemplate
 
-rename-desktop-file: qmlapptemplate.desktop
-rename-appdata-file: qmlapptemplate.appdata.xml
-rename-icon: qmlapptemplate
+rename-desktop-file: QmlAppTemplate.desktop
+rename-appdata-file: QmlAppTemplate.appdata.xml
+rename-icon: QmlAppTemplate
 
 finish-args:
   # Our UI is GPU accelerated

diff --git a/assets/linux/qmlapptemplate.svg → assets/linux/QmlAppTemplate.svg b/assets/linux/qmlapptemplate.svg → assets/linux/QmlAppTemplate.svg
diff --git a/qml/QmlImports.qml b/qml/QmlImports.qml
@@ -0,0 +1,5 @@
+import QtCore
+
+import Qt.labs.qmlmodels
+
+QtObject {}