very minor changes to includes for iOS builds (#379)

vedderb · Sep 3, 2024 · 4b3cb2a · 4b3cb2a
1 parent cb7bf8c
commit 4b3cb2a
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -49,3 +49,4 @@ build_android_signed
 *.DS_Store
 
 res/firmwares/*/
+/build
diff --git a/configparams.h b/configparams.h
@@ -22,6 +22,7 @@
 
 #include <QObject>
 #include <QHash>
+#include <QStringList>
 #include <QXmlStreamWriter>
 #include <QXmlStreamReader>
 #include "configparam.h"

diff --git a/display_tool/dispeditor.cpp b/display_tool/dispeditor.cpp
@@ -27,6 +27,7 @@
 #include <QColor>
 #include <QImage>
 #include <QColorDialog>
+#include <QMessageBox>
 
 DispEditor::DispEditor(QWidget *parent) :
     QWidget(parent),

diff --git a/ios/Info.plist b/ios/Info.plist
@@ -11,17 +11,17 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.vesc-project.vesc-tool</string>
 	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
+	<string>6.05</string>
 	<key>CFBundleName</key>
 	<string>VESC Tool</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.0</string>
+	<string>6.05</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>6.0</string>
+	<string>6.05</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationCategoryType</key>

diff --git a/macos/Info.plist b/macos/Info.plist
@@ -4,6 +4,8 @@
 <dict>
 	<key>NSBluetoothPeripheralUsageDescription</key>
 	<string>VESC Tool uses bluetooth to connect to embedded devices</string>
+        <key>NSBluetoothAlwaysUsageDescription</key>
+        <string>VESC Tool uses bluetooth to connect to embedded devices</string>
 	<key>NSDocumentsFolderUsageDescription</key>
 	<string>VESC Tool can store various logs and data files for configuration</string>
 	<key>NSBluetoothAlwaysUsageDescription</key>

diff --git a/pages/pageloganalysis.cpp b/pages/pageloganalysis.cpp
@@ -25,6 +25,7 @@
 #include <QMessageBox>
 #include <cmath>
 #include <QStandardPaths>
+#include <QScrollBar>
 
 PageLogAnalysis::PageLogAnalysis(QWidget *parent) :
     QWidget(parent),

diff --git a/pages/pagevescpackage.cpp b/pages/pagevescpackage.cpp
@@ -24,6 +24,9 @@
 #include <QFileDialog>
 #include <QProgressDialog>
 #include <QDirIterator>
+#include <QDirIterator>
+#include <QScrollBar>
+
 
 PageVescPackage::PageVescPackage(QWidget *parent) :
     QWidget(parent),

diff --git a/vescinterface.h b/vescinterface.h
@@ -25,6 +25,7 @@
 #include <QTimer>
 #include <QByteArray>
 #include <QList>
+#include <QVariantList>
 #include <QTcpSocket>
 #include <QUdpSocket>
 #include <QSettings>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -49,3 +49,4 @@ build_android_signed
		*.DS_Store

		res/firmwares/*/
		/build