Skip to content

Commit

Permalink
Work on CI builds
Browse files Browse the repository at this point in the history
  • Loading branch information
emericg committed Nov 9, 2024
1 parent 7046876 commit 9d6622e
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/builds_desktop_cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
# Build application
- name: Build application
run: |
cmake -B build/ -G Ninja -DCMAKE_BUILD_TYPE=Release
cmake -B build/ -DCMAKE_BUILD_TYPE=Release G Ninja
cmake --build build/ --config Release
# Deploy application
Expand Down Expand Up @@ -160,7 +160,7 @@ jobs:
# Build application
- name: Build application
run: |
cmake -B build/ .. -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=Release
cmake -B build/ -DCMAKE_BUILD_TYPE=Release -G "NMake Makefiles"
cd build/
nmake
Expand Down
4 changes: 2 additions & 2 deletions assets/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:8.6.0' // works with Qt 6.8+ // Java 17
classpath 'com.android.tools.build:gradle:8.6.1' // works with Qt 6.8+ // Java 17
}
}

Expand Down Expand Up @@ -98,7 +98,7 @@ android {
exclude 'lib/*/*_Controls_Fusion_*'
exclude 'lib/*/*_Controls_Imagine_*'
exclude 'lib/*/*_Controls_Universal_*'
// app specific
// image formats
exclude 'lib/*/*_imageformats_qgif_*'
exclude 'lib/*/*_imageformats_qico_*'
exclude 'lib/*/*_imageformats_qicns_*'
Expand Down
2 changes: 1 addition & 1 deletion assets/ios/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<true/>

<key>MinimumOSVersion</key>
<string>16.0</string>
<string>14.0</string>

<key>ITSAppUsesNonExemptEncryption</key>
<false/>
Expand Down
5 changes: 4 additions & 1 deletion assets/macos/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,11 @@
<key>LSApplicationCategoryType</key>
<string>public.app-category.utilities</string>

<key>NSPrincipalClass</key>
<string>NSApplication</string>

<key>NSHumanReadableCopyright</key>
<string>@MACOSX_BUNDLE_COPYRIGHT@</string>
<string>Copyright Emeric Grange 2024</string>

<key>NSHighResolutionCapable</key>
<true/>
Expand Down

0 comments on commit 9d6622e

Please sign in to comment.