diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a172f8634..97bfdac07 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -416,7 +416,7 @@ jobs: with: version: '5.15.2' host: 'linux' - modules: 'qtnetworkauth qtcharts qtsql' + modules: 'qtnetworkauth qtcharts' cache: 'true' cache-key-prefix: 'install-qt-action-linux' diff --git a/defaults.pri b/defaults.pri index 807f6485c..342c3d568 100644 --- a/defaults.pri +++ b/defaults.pri @@ -1,4 +1,4 @@ -QT += gui bluetooth widgets xml positioning quick networkauth websockets texttospeech location multimedia +QT += gui bluetooth widgets xml positioning quick networkauth websockets texttospeech location multimedia sql QTPLUGIN += qavfmediaplayer QT+= charts diff --git a/src/qdomyos-zwift.pro.user b/src/qdomyos-zwift.pro.user index a156e9b8c..dbb951889 100644 --- a/src/qdomyos-zwift.pro.user +++ b/src/qdomyos-zwift.pro.user @@ -1,10 +1,10 @@ - + EnvironmentId - {49de5078-9d78-40d6-831d-94a49a41b09c} + {568050d7-c503-4fc0-9ae4-06a869edadb0} ProjectExplorer.Project.ActiveTarget @@ -37,6 +37,7 @@ true true 1 + false true false 0 @@ -45,6 +46,7 @@ 0 8 true + false 1 true true @@ -59,6 +61,7 @@ true + false true true true @@ -69,8 +72,9 @@ true true - Builtin.Questionable + Builtin.BuildSystem + true true Builtin.DefaultTidyAndClazy 4 @@ -83,488 +87,27 @@ ProjectExplorer.Project.Target.0 - - Android.Device.Type - Android Qt 5.15.0 (android) Clang Multi-Abi - Android Qt 5.15.0 (android) Clang Multi-Abi - {712d43d8-c043-4a4a-954b-8c1d1814d550} - 1 - 0 - 0 - - true - 0 - /Users/cagnulein/qdomyos-zwift/build-qdomyos-zwift-Android_Qt_5_15_0_android_Clang_Multi_Abi-Debug - /Users/cagnulein/qdomyos-zwift/build-qdomyos-zwift-Android_Qt_5_15_0_android_Clang_Multi_Abi-Debug - - - true - QtProjectManager.QMakeBuildStep - - false - - armeabi-v7a - arm64-v8a - - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - - true - Qt4ProjectManager.AndroidPackageInstallationStep - - - android-31 - - true - QmakeProjectManager.AndroidBuildApkStep - false - - 4 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - - Debug - Qt4ProjectManager.Qt4BuildConfiguration - 2 - 1 - 2 - - - true - 2 - /Users/cagnulein/qdomyos-zwift/build-qdomyos-zwift-Android_Qt_5_15_0_android_Clang_Multi_Abi-Release - /Users/cagnulein/qdomyos-zwift/build-qdomyos-zwift-Android_Qt_5_15_0_android_Clang_Multi_Abi-Release - - - true - QtProjectManager.QMakeBuildStep - - false - - armeabi-v7a - arm64-v8a - x86 - x86_64 - - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - - true - Qt4ProjectManager.AndroidPackageInstallationStep - - - android-31 - /Volumes/Backup/qdomyos-zwift/android_release.keystore - true - QmakeProjectManager.AndroidBuildApkStep - false - - 4 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - - Release - Qt4ProjectManager.Qt4BuildConfiguration - 2 - 1 - 2 - - - true - 0 - /Users/cagnulein/qdomyos-zwift/build-qdomyos-zwift-Android_Qt_5_15_0_android_Clang_Multi_Abi-Profile - /Users/cagnulein/qdomyos-zwift/build-qdomyos-zwift-Android_Qt_5_15_0_android_Clang_Multi_Abi-Profile - - - true - QtProjectManager.QMakeBuildStep - - false - - armeabi-v7a - - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - - true - Qt4ProjectManager.AndroidPackageInstallationStep - - - android-31 - - true - QmakeProjectManager.AndroidBuildApkStep - false - - 4 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - - Profile - Qt4ProjectManager.Qt4BuildConfiguration - 0 - 0 - 0 - - - true - 2 - /Users/cagnulein/qdomyos-zwift/build-qdomyos-zwift-Android_Qt_5_15_0_android_Clang_Multi_Abi-Release_amazon - /Users/cagnulein/qdomyos-zwift/build-qdomyos-zwift-Android_Qt_5_15_0_android_Clang_Multi_Abi-Release_amazon - - - true - QtProjectManager.QMakeBuildStep - - false - - armeabi-v7a - arm64-v8a - x86 - x86_64 - - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - - true - Qt4ProjectManager.AndroidPackageInstallationStep - - - android-31 - /Volumes/Backup/qdomyos-zwift/android_release.keystore - true - QmakeProjectManager.AndroidBuildApkStep - false - - 4 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - - AMAZON=1 - - Amazon - Qt4ProjectManager.Qt4BuildConfiguration - 2 - 1 - 2 - - - true - 2 - /Users/cagnulein/qdomyos-zwift/build-qdomyos-zwift-Android_Qt_5_15_0_android_Clang_Multi_Abi-Release_License - /Users/cagnulein/qdomyos-zwift/build-qdomyos-zwift-Android_Qt_5_15_0_android_Clang_Multi_Abi-Release_License - - - true - QtProjectManager.QMakeBuildStep - DEFINES+=LICENSE - false - - armeabi-v7a - arm64-v8a - x86 - x86_64 - - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - - true - Qt4ProjectManager.AndroidPackageInstallationStep - - - android-31 - /Volumes/Backup/qdomyos-zwift/android_release.keystore - true - QmakeProjectManager.AndroidBuildApkStep - false - - 4 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - - ApkLicense - Qt4ProjectManager.Qt4BuildConfiguration - 2 - 1 - 2 - - 5 - - - - true - Qt4ProjectManager.AndroidDeployQtStep - false - - 1 - Deploy - Deploy - ProjectExplorer.BuildSteps.Deploy - - 1 - - false - Qt4ProjectManager.AndroidDeployConfiguration2 - - 1 - - - armeabi-v7a - armeabi - - d052f34 - 23 - - - dwarf - - cpu-cycles - - - 250 - - -e - cpu-cycles - --call-graph - dwarf,4096 - -F - 250 - - -F - true - 4096 - false - false - 1000 - - true - - false - false - false - false - true - 0.01 - 10 - true - kcachegrind - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - - - - - 0 - - qdomyos-zwift - Qt4ProjectManager.AndroidRunConfiguration:/Users/cagnulein/qdomyos-zwift/src/qdomyos-zwift.pro - /Users/cagnulein/qdomyos-zwift/src/qdomyos-zwift.pro - - false - - false - true - false - false - true - - 1 - - - - ProjectExplorer.Project.Target.1 Desktop - MacOS - MacOS - {908b5b6f-94bb-4e80-bc56-0dc1c85b27a4} - 1 + Desktop + Desktop + {2eb206bb-7c50-4d71-9631-4ca0a2afd6d4} + 0 0 0 - true - 0 - /Users/cagnulein/qdomyos-zwift/build-qdomyos-zwift-MacOS-Debug - /Users/cagnulein/qdomyos-zwift/build-qdomyos-zwift-MacOS-Debug + /home/cagnulein/qdomyos-zwift/build-qdomyos-zwift-Desktop-Release + /home/cagnulein/qdomyos-zwift/build-qdomyos-zwift-Desktop-Release true QtProjectManager.QMakeBuildStep - false true Qt4ProjectManager.MakeStep - - false - - - false 2 Build @@ -575,63 +118,7 @@ true Qt4ProjectManager.MakeStep - - true clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - - Debug - Qt4ProjectManager.Qt4BuildConfiguration - 2 - 2 - 2 - - - true - 1 - /Users/cagnulein/qdomyos-zwift/build-qdomyos-zwift-MacOS-Release - /Users/cagnulein/qdomyos-zwift/build-qdomyos-zwift-MacOS-Release - - - true - QtProjectManager.QMakeBuildStep - - false - - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false 1 Clean @@ -641,66 +128,14 @@ 2 false + false Release Qt4ProjectManager.Qt4BuildConfiguration 0 1 - 2 - - true - 0 - /Users/cagnulein/qdomyos-zwift/build-qdomyos-zwift-MacOS-Profile - /Users/cagnulein/qdomyos-zwift/build-qdomyos-zwift-MacOS-Profile - - - true - QtProjectManager.QMakeBuildStep - - false - - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - - Profile - Qt4ProjectManager.Qt4BuildConfiguration - 0 - 0 - 0 - - 3 + 1 0 @@ -714,629 +149,28 @@ ProjectExplorer.DefaultDeployConfiguration 1 - - dwarf - - cpu-cycles - - - 250 - - -e - cpu-cycles - --call-graph - dwarf,4096 - -F - 250 - - -F true - 4096 - false - false - 1000 - true - - false - false - false - false - true - 0.01 - 10 - true - kcachegrind - 1 - 25 - - 1 true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - 2 - Qt4ProjectManager.Qt4RunConfiguration:/Users/cagnulein/qdomyos-zwift/src/qdomyos-zwift.pro - /Users/cagnulein/qdomyos-zwift/src/qdomyos-zwift.pro - - false - + Qt4ProjectManager.Qt4RunConfiguration:/home/cagnulein/qdomyos-zwift/src/qdomyos-zwift.pro + /home/cagnulein/qdomyos-zwift/src/qdomyos-zwift.pro false true - false true - false - false - true - - - - 1 - - - - ProjectExplorer.Project.Target.2 - - Ios.Device.Type - iOS - iOS - {0d01c6fb-716f-42e8-ba52-8b0fbf1ad8fd} - 0 - 0 - 0 - - true - 0 - true - - /Users/cagnulein/qdomyos-zwift/build-qdomyos-zwift-Qt_5_15_2_for_iOS-Debug - /Users/cagnulein/qdomyos-zwift/build-qdomyos-zwift-Qt_5_15_2_for_iOS-Debug - - - true - QtProjectManager.QMakeBuildStep - - false - - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - - Debug - Qt4ProjectManager.Qt4BuildConfiguration - 2 - 2 - 2 - - - true - 2 - true - - /Users/cagnulein/qdomyos-zwift/build-qdomyos-zwift-iOS-Release - /Users/cagnulein/qdomyos-zwift/build-qdomyos-zwift-iOS-Release - - - true - QtProjectManager.QMakeBuildStep - - false - - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - - Release - Qt4ProjectManager.Qt4BuildConfiguration - 0 - 0 - 2 - - - true - 0 - true - - /Users/cagnulein/qdomyos-zwift/build-qdomyos-zwift-iOS-Profile - /Users/cagnulein/qdomyos-zwift/build-qdomyos-zwift-iOS-Profile - - - true - QtProjectManager.QMakeBuildStep - - false - - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - - Profile - Qt4ProjectManager.Qt4BuildConfiguration - 0 - 0 - 0 - - 3 - - - - true - Qt4ProjectManager.IosDeployStep - - 1 - Deploy - Deploy - ProjectExplorer.BuildSteps.Deploy - - 1 - - false - Qt4ProjectManager.IosDeployConfiguration - - 1 - - - dwarf - - cpu-cycles - - - 250 - - -e - cpu-cycles - --call-graph - dwarf,4096 - -F - 250 - - -F - true - 4096 - false - false - 1000 - - true - - false - false - false - false - true - 0.01 - 10 - true - kcachegrind - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - - - - - 0 - - Run on iOS Device - Qt4ProjectManager.IosRunConfiguration:/Users/cagnulein/qdomyos-zwift/src/qdomyos-zwift.pro - /Users/cagnulein/qdomyos-zwift/src/qdomyos-zwift.pro - - false - - false - true - false - false - true - - 1 - - - - ProjectExplorer.Project.Target.3 - - Ios.Device.Type - Qt 5.15.2 for iOS - Qt 5.15.2 for iOS - {299d4f36-6e55-4615-8efb-0f5c4fc89dfd} - 0 - 0 - 0 - - true - 0 - true - - /Users/cagnulein/qdomyos-zwift/build-qdomyos-zwift-Qt_5_15_2_for_iOS-Debug - /Users/cagnulein/qdomyos-zwift/build-qdomyos-zwift-Qt_5_15_2_for_iOS-Debug - - - true - QtProjectManager.QMakeBuildStep - - false - - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - - Debug - Qt4ProjectManager.Qt4BuildConfiguration - 2 - 2 - 2 - - - true - 2 - true - - /Users/cagnulein/qdomyos-zwift/build-qdomyos-zwift-Qt_5_15_2_for_iOS-Release - /Users/cagnulein/qdomyos-zwift/build-qdomyos-zwift-Qt_5_15_2_for_iOS-Release - - - true - QtProjectManager.QMakeBuildStep - - false - - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - - Release - Qt4ProjectManager.Qt4BuildConfiguration - 0 - 0 - 2 - - - true - 0 - true - - /Users/cagnulein/qdomyos-zwift/build-qdomyos-zwift-Qt_5_15_2_for_iOS-Profile - /Users/cagnulein/qdomyos-zwift/build-qdomyos-zwift-Qt_5_15_2_for_iOS-Profile - - - true - QtProjectManager.QMakeBuildStep - - false - - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - - Profile - Qt4ProjectManager.Qt4BuildConfiguration - 0 - 0 - 0 - - 3 - - - - true - Qt4ProjectManager.IosDeployStep - - 1 - Deploy - Deploy - ProjectExplorer.BuildSteps.Deploy - - 1 - - false - Qt4ProjectManager.IosDeployConfiguration - - 1 - - - dwarf - - cpu-cycles - - - 250 - - -e - cpu-cycles - --call-graph - dwarf,4096 - -F - 250 - - -F - true - 4096 - false - false - 1000 - - true - - false - false - false - false - true - 0.01 - 10 - true - kcachegrind - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - - - - - 0 - - Run on iOS Device - Qt4ProjectManager.IosRunConfiguration:/Users/cagnulein/qdomyos-zwift/src/qdomyos-zwift.pro - /Users/cagnulein/qdomyos-zwift/src/qdomyos-zwift.pro - - false - - false - true - false false true + /home/cagnulein/qdomyos-zwift/build-qdomyos-zwift-Desktop-Release 1 ProjectExplorer.Project.TargetCount - 4 + 1 ProjectExplorer.Project.Updater.FileVersion