From 4b3cb2a0555576e762491678c08d5d2286f9d6f9 Mon Sep 17 00:00:00 2001 From: "Jeffrey M. Friesen" Date: Tue, 3 Sep 2024 15:54:54 +0200 Subject: [PATCH] very minor changes to includes for iOS builds (#379) --- .gitignore | 1 + configparams.h | 1 + display_tool/dispeditor.cpp | 1 + ios/Info.plist | 6 +++--- macos/Info.plist | 2 ++ pages/pageloganalysis.cpp | 1 + pages/pagevescpackage.cpp | 3 +++ vescinterface.h | 1 + 8 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index e0075438d..9e79462a9 100644 --- a/.gitignore +++ b/.gitignore @@ -49,3 +49,4 @@ build_android_signed *.DS_Store res/firmwares/*/ +/build diff --git a/configparams.h b/configparams.h index a10a4dd3e..c4f87cad9 100644 --- a/configparams.h +++ b/configparams.h @@ -22,6 +22,7 @@ #include #include +#include #include #include #include "configparam.h" diff --git a/display_tool/dispeditor.cpp b/display_tool/dispeditor.cpp index aee5cfc25..08c92b3a5 100644 --- a/display_tool/dispeditor.cpp +++ b/display_tool/dispeditor.cpp @@ -27,6 +27,7 @@ #include #include #include +#include DispEditor::DispEditor(QWidget *parent) : QWidget(parent), diff --git a/ios/Info.plist b/ios/Info.plist index d4901a447..0a304ee86 100644 --- a/ios/Info.plist +++ b/ios/Info.plist @@ -11,17 +11,17 @@ CFBundleIdentifier com.vesc-project.vesc-tool CFBundleInfoDictionaryVersion - 6.0 + 6.05 CFBundleName VESC Tool CFBundlePackageType APPL CFBundleShortVersionString - 6.0 + 6.05 CFBundleSignature ???? CFBundleVersion - 6.0 + 6.05 ITSAppUsesNonExemptEncryption LSApplicationCategoryType diff --git a/macos/Info.plist b/macos/Info.plist index f8e3f903c..a8cc174ca 100644 --- a/macos/Info.plist +++ b/macos/Info.plist @@ -4,6 +4,8 @@ NSBluetoothPeripheralUsageDescription VESC Tool uses bluetooth to connect to embedded devices + NSBluetoothAlwaysUsageDescription + VESC Tool uses bluetooth to connect to embedded devices NSDocumentsFolderUsageDescription VESC Tool can store various logs and data files for configuration NSBluetoothAlwaysUsageDescription diff --git a/pages/pageloganalysis.cpp b/pages/pageloganalysis.cpp index 37bcdc2a1..68eca0791 100644 --- a/pages/pageloganalysis.cpp +++ b/pages/pageloganalysis.cpp @@ -25,6 +25,7 @@ #include #include #include +#include PageLogAnalysis::PageLogAnalysis(QWidget *parent) : QWidget(parent), diff --git a/pages/pagevescpackage.cpp b/pages/pagevescpackage.cpp index 3746cabd9..626e92361 100644 --- a/pages/pagevescpackage.cpp +++ b/pages/pagevescpackage.cpp @@ -24,6 +24,9 @@ #include #include #include +#include +#include + PageVescPackage::PageVescPackage(QWidget *parent) : QWidget(parent), diff --git a/vescinterface.h b/vescinterface.h index 544df7391..fd9ae725d 100755 --- a/vescinterface.h +++ b/vescinterface.h @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include