Skip to content

Commit 2d4a016

Browse files
cagnuleincagnulein
authored
Merge branch 'master' into fix/issue-4794-nordictrack-s700
2 parents 8fb898d + d06b630 commit 2d4a016

168 files changed

Lines changed: 14826 additions & 409 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/main.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2322,6 +2322,11 @@ jobs:
23222322
sed -i 's/property string ${{ matrix.variant.setting_key }}: ""/property string ${{ matrix.variant.setting_key }}: "${{ matrix.variant.setting_value }}"/' settings.qml
23232323
cd ..
23242324
2325+
# Keep FitPro APKs usable on older 32-bit iFIT/ProForm consoles.
2326+
# qmake reads defaults.pri while generating the Android deployment JSON,
2327+
# so force all ABIs there before the build starts.
2328+
sed -i 's/^ANDROID_ABIS = .*/ANDROID_ABIS = armeabi-v7a arm64-v8a x86 x86_64/' defaults.pri
2329+
23252330
ln -sfn $ANDROID_SDK_ROOT/ndk/21.4.7075529 $ANDROID_NDK
23262331
rm -rf /usr/local/lib/android/sdk/ndk/25.1.8937393
23272332
lrelease src/qdomyos-zwift.pri

‎.github/workflows/release-playstore.yml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -268,12 +268,37 @@ jobs:
268268
${{ github.workspace }}/output/android-release-signed.apk
269269
${{ github.workspace }}/output/android-release-signed.aab
270270
271+
# Whether Play requires (or forbids) changesNotSentForReview on commit
272+
# depends on that specific release, not on the app/track - it flips
273+
# between "must be set" and "must not be set" across otherwise
274+
# identical runs. So try one way, and if Play rejects it, retry the
275+
# other way instead of hardcoding a value that will eventually be wrong.
271276
- name: Publish to Play Store (internal testing track)
277+
id: publish_attempt1
272278
if: ${{ inputs.publish }}
279+
continue-on-error: true
273280
uses: r0adkll/upload-google-play@v1
274281
with:
275282
serviceAccountJsonPlainText: ${{ secrets.PLAY_SERVICE_ACCOUNT_JSON }}
276283
packageName: org.cagnulen.qdomyoszwift
277284
releaseFiles: ${{ github.workspace }}/output/android-release-signed.aab
278285
track: internal
279286
status: completed
287+
288+
- name: Publish to Play Store (retry with changesNotSentForReview inverted)
289+
id: publish_attempt2
290+
if: ${{ inputs.publish && steps.publish_attempt1.outcome == 'failure' }}
291+
uses: r0adkll/upload-google-play@v1
292+
with:
293+
serviceAccountJsonPlainText: ${{ secrets.PLAY_SERVICE_ACCOUNT_JSON }}
294+
packageName: org.cagnulen.qdomyoszwift
295+
releaseFiles: ${{ github.workspace }}/output/android-release-signed.aab
296+
track: internal
297+
changesNotSentForReview: true
298+
status: completed
299+
300+
- name: Fail job if both publish attempts failed
301+
if: ${{ inputs.publish && steps.publish_attempt1.outcome == 'failure' && steps.publish_attempt2.outcome != 'success' }}
302+
run: |
303+
echo "Both publish attempts failed (with and without changesNotSentForReview) - see the two steps above for the actual errors."
304+
exit 1

‎.github/workflows/update-translations.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ jobs:
9595
uses: peter-evans/create-pull-request@v5
9696
with:
9797
token: ${{ secrets.GITHUB_TOKEN }}
98+
base: master
9899
branch: ${{ env.BRANCH_NAME }}
99100
title: "🌍 Update translation strings"
100101
body: |

‎build-qdomyos-zwift-Qt_5_15_2_for_iOS-Debug/qdomyoszwift.xcodeproj/project.pbxproj‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,8 @@
202202
87310B1F266FBB59008BA0D6 /* homefitnessbuddy.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 87310B1C266FBB57008BA0D6 /* homefitnessbuddy.cpp */; };
203203
87310B22266FBB78008BA0D6 /* moc_homefitnessbuddy.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 87310B20266FBB6E008BA0D6 /* moc_homefitnessbuddy.cpp */; };
204204
87310B23266FBB78008BA0D6 /* moc_smartrowrower.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 87310B21266FBB77008BA0D6 /* moc_smartrowrower.cpp */; };
205+
1010C5FA2F9542C4A29D45AF /* waterrowerusb.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 989CF289E68C405BB4611498 /* waterrowerusb.cpp */; };
206+
379A5F030DD74566B5EDF9C8 /* moc_waterrowerusb.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 53238C87D8804F37ABB4A2B5 /* moc_waterrowerusb.cpp */; };
205207
87318AAD2683799100770F13 /* echelonstride.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 87318AAB2683799100770F13 /* echelonstride.cpp */; };
206208
87318AAF2683799C00770F13 /* moc_echelonstride.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 87318AAE2683799C00770F13 /* moc_echelonstride.cpp */; };
207209
87318AB126837C7600770F13 /* libQt5WebSockets.a in Link Binary With Libraries */ = {isa = PBXBuildFile; fileRef = 87318AB026837AA500770F13 /* libQt5WebSockets.a */; };
@@ -433,6 +435,8 @@
433435
8798C8872733E103003148B3 /* strydrunpowersensor.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 8798C8862733E103003148B3 /* strydrunpowersensor.cpp */; };
434436
8798C8892733E10E003148B3 /* moc_strydrunpowersensor.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 8798C8882733E10E003148B3 /* moc_strydrunpowersensor.cpp */; };
435437
8798FDC52D66075B00CF8EE8 /* OSXBtManagerInternal.mm in Compile Sources */ = {isa = PBXBuildFile; fileRef = 8798FDC32D66075B00CF8EE8 /* OSXBtManagerInternal.mm */; };
438+
8798FFD52F868DEE003E969D /* moc_mywhooshlink.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 8798FFD42F868DEE003E969D /* moc_mywhooshlink.cpp */; };
439+
8798FFD82F868E00003E969D /* mywhooshlink.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 8798FFD72F868E00003E969D /* mywhooshlink.cpp */; };
436440
8798FFA52F857787003E969D /* moc_lifespanbike.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 8798FFA42F857787003E969D /* moc_lifespanbike.cpp */; };
437441
8798FFA82F8577B3003E969D /* lifespanbike.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 8798FFA72F8577B3003E969D /* lifespanbike.cpp */; };
438442
879A38C8281BD83300F78B2A /* characteristicnotifier2ad9.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 879A38C7281BD83300F78B2A /* characteristicnotifier2ad9.cpp */; };
@@ -507,6 +511,8 @@
507511
87C5F0B626285E5F0067A1B5 /* quotedprintable.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 87C5F09A26285E5B0067A1B5 /* quotedprintable.cpp */; };
508512
87C5F0B726285E5F0067A1B5 /* mimecontentformatter.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 87C5F09B26285E5B0067A1B5 /* mimecontentformatter.cpp */; };
509513
87C5F0B826285E5F0067A1B5 /* stagesbike.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 87C5F09C26285E5B0067A1B5 /* stagesbike.cpp */; };
514+
877486F02FA8E80000A02AFD /* moc_kettlerc12bike.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 877486F12FA8E80000A02AFD /* moc_kettlerc12bike.cpp */; };
515+
877486F22FA8E80000A02AFD /* kettlerc12bike.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 877486F32FA8E80000A02AFD /* kettlerc12bike.cpp */; };
510516
87C5F0B926285E5F0067A1B5 /* mimehtml.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 87C5F0A026285E5C0067A1B5 /* mimehtml.cpp */; };
511517
87C5F0BA26285E5F0067A1B5 /* mimefile.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 87C5F0A126285E5C0067A1B5 /* mimefile.cpp */; };
512518
87C5F0BB26285E5F0067A1B5 /* mimetext.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 87C5F0A426285E5C0067A1B5 /* mimetext.cpp */; };
@@ -1128,6 +1134,9 @@
11281134
87310B1D266FBB58008BA0D6 /* smartrowrower.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = smartrowrower.h; path = ../src/devices/smartrowrower/smartrowrower.h; sourceTree = "<group>"; };
11291135
87310B20266FBB6E008BA0D6 /* moc_homefitnessbuddy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = moc_homefitnessbuddy.cpp; sourceTree = "<group>"; };
11301136
87310B21266FBB77008BA0D6 /* moc_smartrowrower.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = moc_smartrowrower.cpp; sourceTree = "<group>"; };
1137+
989CF289E68C405BB4611498 /* waterrowerusb.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = waterrowerusb.cpp; path = ../src/devices/waterrowerusb/waterrowerusb.cpp; sourceTree = "<group>"; };
1138+
2C00064A47904C7F9E743174 /* waterrowerusb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = waterrowerusb.h; path = ../src/devices/waterrowerusb/waterrowerusb.h; sourceTree = "<group>"; };
1139+
53238C87D8804F37ABB4A2B5 /* moc_waterrowerusb.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = moc_waterrowerusb.cpp; sourceTree = "<group>"; };
11311140
87318AAB2683799100770F13 /* echelonstride.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = echelonstride.cpp; path = ../src/devices/echelonstride/echelonstride.cpp; sourceTree = "<group>"; };
11321141
87318AAC2683799100770F13 /* echelonstride.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = echelonstride.h; path = ../src/devices/echelonstride/echelonstride.h; sourceTree = "<group>"; };
11331142
87318AAE2683799C00770F13 /* moc_echelonstride.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = moc_echelonstride.cpp; sourceTree = "<group>"; };
@@ -1496,6 +1505,9 @@
14961505
8798FDC22D66075B00CF8EE8 /* osxbtgcdtimer_p.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = osxbtgcdtimer_p.h; path = ../src/ios/BluetoothPatch/osxbtgcdtimer_p.h; sourceTree = SOURCE_ROOT; };
14971506
8798FDC32D66075B00CF8EE8 /* OSXBtManagerInternal.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = OSXBtManagerInternal.mm; path = ../src/ios/BluetoothPatch/OSXBtManagerInternal.mm; sourceTree = SOURCE_ROOT; };
14981507
8798FDC42D66075B00CF8EE8 /* osxbtutility_p.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = osxbtutility_p.h; path = ../src/ios/BluetoothPatch/osxbtutility_p.h; sourceTree = SOURCE_ROOT; };
1508+
8798FFD42F868DEE003E969D /* moc_mywhooshlink.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = moc_mywhooshlink.cpp; sourceTree = "<group>"; };
1509+
8798FFD62F868E00003E969D /* mywhooshlink.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = mywhooshlink.h; path = ../src/mywhooshlink.h; sourceTree = SOURCE_ROOT; };
1510+
8798FFD72F868E00003E969D /* mywhooshlink.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = mywhooshlink.cpp; path = ../src/mywhooshlink.cpp; sourceTree = SOURCE_ROOT; };
14991511
8798FFA42F857787003E969D /* moc_lifespanbike.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = moc_lifespanbike.cpp; sourceTree = "<group>"; };
15001512
8798FFA62F8577B3003E969D /* lifespanbike.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = lifespanbike.h; path = ../src/devices/lifespanbike/lifespanbike.h; sourceTree = SOURCE_ROOT; };
15011513
8798FFA72F8577B3003E969D /* lifespanbike.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = lifespanbike.cpp; path = ../src/devices/lifespanbike/lifespanbike.cpp; sourceTree = SOURCE_ROOT; };
@@ -1632,6 +1644,9 @@
16321644
87C5F0C426285E7D0067A1B5 /* moc_mimepart.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = moc_mimepart.cpp; sourceTree = "<group>"; };
16331645
87C5F0C526285E7D0067A1B5 /* moc_smtpclient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = moc_smtpclient.cpp; sourceTree = "<group>"; };
16341646
87C5F0C626285E7D0067A1B5 /* moc_stagesbike.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = moc_stagesbike.cpp; sourceTree = "<group>"; };
1647+
877486F12FA8E80000A02AFD /* moc_kettlerc12bike.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = moc_kettlerc12bike.cpp; sourceTree = "<group>"; };
1648+
877486F32FA8E80000A02AFD /* kettlerc12bike.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = kettlerc12bike.cpp; path = ../src/devices/kettlerc12bike/kettlerc12bike.cpp; sourceTree = SOURCE_ROOT; };
1649+
877486F42FA8E80000A02AFD /* kettlerc12bike.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = kettlerc12bike.h; path = ../src/devices/kettlerc12bike/kettlerc12bike.h; sourceTree = SOURCE_ROOT; };
16351650
87C5F0C726285E7D0067A1B5 /* moc_mimemultipart.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = moc_mimemultipart.cpp; sourceTree = "<group>"; };
16361651
87C5F0C826285E7D0067A1B5 /* moc_mimecontentformatter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = moc_mimecontentformatter.cpp; sourceTree = "<group>"; };
16371652
87C5F0C926285E7D0067A1B5 /* moc_chronobike.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = moc_chronobike.cpp; sourceTree = "<group>"; };
@@ -2307,6 +2322,7 @@
23072322
87318AAE2683799C00770F13 /* moc_echelonstride.cpp */,
23082323
87310B20266FBB6E008BA0D6 /* moc_homefitnessbuddy.cpp */,
23092324
87310B21266FBB77008BA0D6 /* moc_smartrowrower.cpp */,
2325+
53238C87D8804F37ABB4A2B5 /* moc_waterrowerusb.cpp */,
23102326
87A18F082660D5D9002D7C96 /* moc_ftmsrower.cpp */,
23112327
871B9FD3265E6A9A00DB41F4 /* moc_powerzonepack.cpp */,
23122328
87A3BC25265642A200D302E3 /* moc_echelonrower.cpp */,
@@ -2329,6 +2345,7 @@
23292345
87C5F0CD26285E7E0067A1B5 /* moc_quotedprintable.cpp */,
23302346
87C5F0C526285E7D0067A1B5 /* moc_smtpclient.cpp */,
23312347
87C5F0C626285E7D0067A1B5 /* moc_stagesbike.cpp */,
2348+
877486F12FA8E80000A02AFD /* moc_kettlerc12bike.cpp */,
23322349
87A0C4BD262329B500121A76 /* moc_cscbike.cpp */,
23332350
87A0C4BE262329B500121A76 /* moc_npecablebike.cpp */,
23342351
8781907F261508B10085E656 /* moc_peloton.cpp */,
@@ -2379,6 +2396,9 @@
23792396
2EB56BE3C2D93CDAB0C52E67 /* Sources */ = {
23802397
isa = PBXGroup;
23812398
children = (
2399+
8798FFD62F868E00003E969D /* mywhooshlink.h */,
2400+
8798FFD72F868E00003E969D /* mywhooshlink.cpp */,
2401+
8798FFD42F868DEE003E969D /* moc_mywhooshlink.cpp */,
23822402
870F72D52FDEC0FD00181280 /* webtranslation.cpp */,
23832403
87CCCC932FD2C32200CA53BD /* qrc_translations.cpp */,
23842404
877486E12FA8E79800A02AFD /* iconsolebike.h */,
@@ -2786,6 +2806,8 @@
27862806
87310B1A266FBB54008BA0D6 /* homefitnessbuddy.h */,
27872807
87310B1B266FBB54008BA0D6 /* smartrowrower.cpp */,
27882808
87310B1D266FBB58008BA0D6 /* smartrowrower.h */,
2809+
989CF289E68C405BB4611498 /* waterrowerusb.cpp */,
2810+
2C00064A47904C7F9E743174 /* waterrowerusb.h */,
27892811
87083D9526678EFA0072410D /* zwiftworkout.cpp */,
27902812
87083D9426678EFA0072410D /* zwiftworkout.h */,
27912813
87A18F052660D5C0002D7C96 /* ftmsrower.cpp */,
@@ -2840,6 +2862,8 @@
28402862
87C5F0A326285E5C0067A1B5 /* smtpexports.h */,
28412863
87C5F0A526285E5C0067A1B5 /* SmtpMime */,
28422864
87C5F09C26285E5B0067A1B5 /* stagesbike.cpp */,
2865+
877486F32FA8E80000A02AFD /* kettlerc12bike.cpp */,
2866+
877486F42FA8E80000A02AFD /* kettlerc12bike.h */,
28432867
87C5F09D26285E5B0067A1B5 /* stagesbike.h */,
28442868
87A0C4B9262329A600121A76 /* cscbike.cpp */,
28452869
87A0C4B8262329A600121A76 /* cscbike.h */,
@@ -3810,6 +3834,7 @@
38103834
87DA62AB2D2305F5008ADA0F /* characteristicnotifier0002.cpp in Compile Sources */,
38113835
20A50533946A39CBD2C89104 /* bluetoothdevice.cpp in Compile Sources */,
38123836
87C5F0D126285E7E0067A1B5 /* moc_stagesbike.cpp in Compile Sources */,
3837+
877486F02FA8E80000A02AFD /* moc_kettlerc12bike.cpp in Compile Sources */,
38133838
873824E927E647A8004F1B46 /* mdns.cpp in Compile Sources */,
38143839
87E5D2C625E69F3100BDBE6C /* horizontreadmill.cpp in Compile Sources */,
38153840
87E5D2C825E69F4700BDBE6C /* moc_horizontreadmill.cpp in Compile Sources */,
@@ -4020,6 +4045,7 @@
40204045
873D3C4A2C296B0100770CB9 /* moc_jumprope.cpp in Compile Sources */,
40214046
23191C28CB29474279752FD3 /* fit_protocol_validator.cpp in Compile Sources */,
40224047
275D55B5D956B2E5F1B7E46E /* fit_unicode.cpp in Compile Sources */,
4048+
8798FFD82F868E00003E969D /* mywhooshlink.cpp in Compile Sources */,
40234049
87F527BE28EEB5AA00A9F8D5 /* qzsettings.cpp in Compile Sources */,
40244050
8703BAEB273C67A90058E206 /* pafersbike.cpp in Compile Sources */,
40254051
87061399286D8D6500D2446E /* moc_wobjectdefs.cpp in Compile Sources */,
@@ -4041,6 +4067,7 @@
40414067
873824E427E647A8004F1B46 /* cache.cpp in Compile Sources */,
40424068
87A2E0222B2B053E00E6168F /* swiftDebug.mm in Compile Sources */,
40434069
87310B1E266FBB59008BA0D6 /* smartrowrower.cpp in Compile Sources */,
4070+
1010C5FA2F9542C4A29D45AF /* waterrowerusb.cpp in Compile Sources */,
40444071
87A3BC222656429600D302E3 /* rower.cpp in Compile Sources */,
40454072
C719682D8D421AF6B2DAAEA9 /* main.cpp in Compile Sources */,
40464073
87BB1774269E983200F46A1C /* moc_webserverinfosender.cpp in Compile Sources */,
@@ -4215,6 +4242,7 @@
42154242
87F1BD712DC0D59600416506 /* moc_coresensor.cpp in Compile Sources */,
42164243
87F1BD722DC0D59600416506 /* coresensor.cpp in Compile Sources */,
42174244
87DA8467284933DE00B550E9 /* moc_fakeelliptical.cpp in Compile Sources */,
4245+
8798FFD52F868DEE003E969D /* moc_mywhooshlink.cpp in Compile Sources */,
42184246
87C5F0D726285E7E0067A1B5 /* moc_mimefile.cpp in Compile Sources */,
42194247
87DBD6642F333E5700342F2B /* sunnyfitstepper.cpp in Compile Sources */,
42204248
87DBD6652F333E5700342F2B /* moc_sunnyfitstepper.cpp in Compile Sources */,
@@ -4287,6 +4315,7 @@
42874315
87C5F0B626285E5F0067A1B5 /* quotedprintable.cpp in Compile Sources */,
42884316
87DBD5DB2F2CEE1900342F2B /* thinkridercontroller.cpp in Compile Sources */,
42894317
87310B23266FBB78008BA0D6 /* moc_smartrowrower.cpp in Compile Sources */,
4318+
379A5F030DD74566B5EDF9C8 /* moc_waterrowerusb.cpp in Compile Sources */,
42904319
EE29228550794460E7654533 /* moc_trxappgateusbtreadmill.cpp in Compile Sources */,
42914320
3DB7B5F0CE1E2390CEFFC1E8 /* moc_virtualbike.cpp in Compile Sources */,
42924321
8738249527E646E3004F1B46 /* characteristicnotifier2a37.cpp in Compile Sources */,
@@ -4303,6 +4332,7 @@
43034332
87EB918827EE5FE7002535E1 /* moc_inappstoreqmltype.cpp in Compile Sources */,
43044333
87083D9626678EFA0072410D /* zwiftworkout.cpp in Compile Sources */,
43054334
87C5F0B826285E5F0067A1B5 /* stagesbike.cpp in Compile Sources */,
4335+
877486F22FA8E80000A02AFD /* kettlerc12bike.cpp in Compile Sources */,
43064336
87FC40BC2D2E74F9008BA736 /* cycleopsphantombike.cpp in Compile Sources */,
43074337
87FC40BD2D2E74F9008BA736 /* moc_cycleopsphantombike.cpp in Compile Sources */,
43084338
87C5F0D526285E7E0067A1B5 /* moc_mimehtml.cpp in Compile Sources */,
@@ -4700,6 +4730,7 @@
47004730
../../Qt/5.15.2/ios/include/QtCore/5.15.2/QtCore/,
47014731
../../Qt/5.15.2/ios/include/QtSql,
47024732
);
4733+
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
47034734
LIBRARY_SEARCH_PATHS = (
47044735
/Users/cagnulein/Qt/5.15.2/ios/plugins/platforms,
47054736
/System/Library/Frameworks/,
@@ -4903,6 +4934,7 @@
49034934
../../Qt/5.15.2/ios/include/QtCore/5.15.2/QtCore/,
49044935
../../Qt/5.15.2/ios/include/QtSql,
49054936
);
4937+
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
49064938
LIBRARY_SEARCH_PATHS = (
49074939
/Users/cagnulein/Qt/5.15.2/ios/plugins/platforms,
49084940
/System/Library/Frameworks/,

0 commit comments

Comments
 (0)