Do not rely on QtCore settings, it breaks builds with Qt < 6.4

Serial-Studio · Feb 6, 2023 · 0a16c90 · 0a16c90
1 parent 1b5f094
commit 0a16c90
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 10 deletions.
diff --git a/assets/qml/Dashboard/DashboardTitle.qml b/assets/qml/Dashboard/DashboardTitle.qml
@@ -20,10 +20,10 @@
  * THE SOFTWARE.
  */
 
-import QtCore
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.Controls
+import Qt.labs.settings
 
 import "../Widgets" as Widgets
 

diff --git a/assets/qml/Dashboard/ViewOptions.qml b/assets/qml/Dashboard/ViewOptions.qml
@@ -20,10 +20,10 @@
  * THE SOFTWARE.
  */
 
-import QtCore
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.Controls
+import Qt.labs.settings
 
 import "../Widgets" as Widgets
 

diff --git a/assets/qml/Panes/Setup.qml b/assets/qml/Panes/Setup.qml
@@ -20,10 +20,10 @@
  * THE SOFTWARE.
  */
 
-import QtCore
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.Controls
+import Qt.labs.settings
 
 import "../Widgets" as Widgets
 import "SetupPanes" as SetupPanes

diff --git a/assets/qml/Panes/SetupPanes/Hardware.qml b/assets/qml/Panes/SetupPanes/Hardware.qml
@@ -23,7 +23,7 @@
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.Controls
-import QtCore as QtCore
+import Qt.labs.settings as QtSettings
 
 import "Devices" as Devices
 import "../../Windows" as Windows
@@ -34,7 +34,7 @@ Control {
     //
     // Save settings
     //
-    QtCore.Settings {
+    QtSettings.Settings {
         property alias driver: _driverCombo.currentIndex
         property alias parity: serial.parity
         property alias baudRate: serial.baudRate

diff --git a/assets/qml/Widgets/Terminal.qml b/assets/qml/Widgets/Terminal.qml
@@ -20,10 +20,10 @@
  * THE SOFTWARE.
  */
 
-import QtCore
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.Controls
+import Qt.labs.settings
 import SerialStudio as SerialStudio
 
 Item {

diff --git a/assets/qml/Windows/Donate.qml b/assets/qml/Windows/Donate.qml
@@ -20,11 +20,11 @@
  * THE SOFTWARE.
  */
 
-import QtCore
 import QtQuick
 import QtQuick.Window
 import QtQuick.Layouts
 import QtQuick.Controls
+import Qt.labs.settings
 
 import "../FramelessWindow" as FramelessWindow
 

diff --git a/assets/qml/Windows/MQTTConfiguration.qml b/assets/qml/Windows/MQTTConfiguration.qml
@@ -20,11 +20,11 @@
  * THE SOFTWARE.
  */
 
-import QtCore
 import QtQuick
 import QtQuick.Window
 import QtQuick.Layouts
 import QtQuick.Controls
+import Qt.labs.settings
 
 import "../FramelessWindow" as FramelessWindow
 

diff --git a/assets/qml/Windows/MainWindow.qml b/assets/qml/Windows/MainWindow.qml
@@ -20,11 +20,11 @@
  * THE SOFTWARE.
  */
 
-import QtCore
 import QtQuick
 import QtQuick.Window
 import QtQuick.Layouts
 import QtQuick.Controls
+import Qt.labs.settings
 
 import "../Panes"
 import "../Windows"

diff --git a/assets/qml/Windows/ProjectEditor.qml b/assets/qml/Windows/ProjectEditor.qml
@@ -20,11 +20,11 @@
  * THE SOFTWARE.
  */
 
-import QtCore
 import QtQuick
 import QtQuick.Window
 import QtQuick.Layouts
 import QtQuick.Controls
+import Qt.labs.settings
 
 import "../ProjectEditor"
 import "../Widgets" as Widgets