Migrate QML settings from Qt labs to QtCore

AlbrechtL · Apr 10, 2024 · 30ed40c · 30ed40c
1 parent 8cff97f
commit 30ed40c
Show file tree

Hide file tree

Showing 16 changed files with 17 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -119,7 +119,7 @@ General Information
 ---
 The following libraries and their development files are needed:
 
-* Qt 6.2 (Qt 6.1 and below is not supported)
+* Qt 6.5 (Qt 6.4 and below is not supported)
 * FFTW3f
 * libfaad
 * librtlsdr
@@ -145,7 +145,7 @@ sudo apt install libfaad-dev libmpg123-dev libfftw3-dev librtlsdr-dev libusb-1.0
 3. Install the following Qt packages
 
 ```
-sudo apt install libqt6charts6-dev qt6-base-dev qt6-tools-dev-tools qt6-multimedia-dev qt6-wayland-dev libqt6core5compat6-dev libqt63dquick6 libqt6qml6 qt6-declarative-dev qml6-module-qt-labs-settings  qml6-module-qtquick-controls qml6-module-qtquick qml6-module-qt5compat-graphicaleffects qml6-module-qtcharts  qml6-module-qtmultimedia qml6-module-qtquick-window qml6-module-qtquick-layouts qml6-module-qtqml-workerscript qml6-module-qtwayland-compositor qml6-module-qtquick-templates qml6-module-qt-labs-platform qtcreator
+sudo apt install libqt6charts6-dev qt6-base-dev qt6-tools-dev-tools qt6-multimedia-dev qt6-wayland-dev libqt6core5compat6-dev libqt63dquick6 libqt6qml6 qt6-declarative-dev  qml6-module-qtquick-controls qml6-module-qtquick qml6-module-qt5compat-graphicaleffects qml6-module-qtcharts  qml6-module-qtmultimedia qml6-module-qtquick-window qml6-module-qtquick-layouts qml6-module-qtqml-workerscript qml6-module-qtwayland-compositor qml6-module-qtquick-templates qtcreator
 ```
 
 4. Clone welle.io

diff --git a/src/welle-gui/QML/GeneralView.qml b/src/welle-gui/QML/GeneralView.qml
@@ -25,7 +25,7 @@
 
 import QtQuick
 import QtQuick.Layouts
-import Qt.labs.settings
+import QtCore
 
 import "components"
 

diff --git a/src/welle-gui/QML/MainView.qml b/src/welle-gui/QML/MainView.qml
@@ -29,7 +29,7 @@ import QtQuick.Controls
 import QtQuick.Controls.Universal
 import QtQuick.Window
 import Qt5Compat.GraphicalEffects
-import Qt.labs.settings
+import QtCore
 
 import "texts"
 import "settingpages"

diff --git a/src/welle-gui/QML/MotView.qml b/src/welle-gui/QML/MotView.qml
@@ -26,7 +26,7 @@
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.Controls
-import Qt.labs.platform
+import QtCore
 
 import "texts"
 import "components"

diff --git a/src/welle-gui/QML/components/WSpectrum.qml b/src/welle-gui/QML/components/WSpectrum.qml
@@ -27,7 +27,7 @@ import QtQuick
 import QtCharts
 import QtQuick.Layouts
 import QtQuick.Controls
-import Qt.labs.settings
+import QtCore
 import io.welle
 
 // Import custom styles

diff --git a/src/welle-gui/QML/expertviews/ImpulseResponseGraph.qml b/src/welle-gui/QML/expertviews/ImpulseResponseGraph.qml
@@ -26,7 +26,7 @@
 import QtQuick
 import QtCharts
 import QtQuick.Layouts
-import Qt.labs.settings
+import QtCore
 
 
 // Import custom styles

diff --git a/src/welle-gui/QML/expertviews/NullSymbolGraph.qml b/src/welle-gui/QML/expertviews/NullSymbolGraph.qml
@@ -25,7 +25,7 @@
 
 import QtQuick
 import QtQuick.Layouts
-import Qt.labs.settings
+import QtCore
 
 // Import custom styles
 import "../texts"

diff --git a/src/welle-gui/QML/expertviews/SpectrumGraph.qml b/src/welle-gui/QML/expertviews/SpectrumGraph.qml
@@ -26,7 +26,7 @@
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.Controls
-import Qt.labs.settings
+import QtCore
 
 // Import custom styles
 import "../texts"

diff --git a/src/welle-gui/QML/settingpages/AirspySettings.qml b/src/welle-gui/QML/settingpages/AirspySettings.qml
@@ -26,7 +26,7 @@
 import QtQuick 2.6
 import QtQuick.Controls 2.0
 import QtQuick.Layouts 1.1
-import Qt.labs.settings 1.0
+import QtCore 1.0
 
 // Import custom styles
 import "../texts"

diff --git a/src/welle-gui/QML/settingpages/ChannelSettings.qml b/src/welle-gui/QML/settingpages/ChannelSettings.qml
@@ -26,7 +26,7 @@
 import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
-import Qt.labs.settings
+import QtCore
 
 import "../texts"
 import "../components"

diff --git a/src/welle-gui/QML/settingpages/ExpertSettings.qml b/src/welle-gui/QML/settingpages/ExpertSettings.qml
@@ -26,7 +26,7 @@
 import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
-import Qt.labs.settings
+import QtCore
 
 import "../texts"
 import "../components"

diff --git a/src/welle-gui/QML/settingpages/GlobalSettings.qml b/src/welle-gui/QML/settingpages/GlobalSettings.qml
@@ -26,7 +26,7 @@
 import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
-import Qt.labs.settings
+import QtCore
 
 // Import custom styles
 import "../texts"

diff --git a/src/welle-gui/QML/settingpages/RTLSDRSettings.qml b/src/welle-gui/QML/settingpages/RTLSDRSettings.qml
@@ -26,7 +26,7 @@
 import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
-import Qt.labs.settings
+import QtCore
 
 // Import custom styles
 import "../texts"

diff --git a/src/welle-gui/QML/settingpages/RTLTCPSettings.qml b/src/welle-gui/QML/settingpages/RTLTCPSettings.qml
@@ -26,7 +26,7 @@
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.Controls
-import Qt.labs.settings
+import QtCore
 
 // Import custom styles
 import "../texts"

diff --git a/src/welle-gui/QML/settingpages/RawFileSettings.qml b/src/welle-gui/QML/settingpages/RawFileSettings.qml
@@ -27,7 +27,7 @@ import QtQuick
 import QtQuick.Layouts
 import QtQuick.Controls
 import QtQuick.Dialogs
-import Qt.labs.settings
+import QtCore
 
 // Import custom styles
 import "../texts"

diff --git a/src/welle-gui/QML/settingpages/SoapySDRSettings.qml b/src/welle-gui/QML/settingpages/SoapySDRSettings.qml
@@ -26,7 +26,7 @@
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.Controls
-import Qt.labs.settings
+import QtCore
 
 // Import custom styles
 import "../texts"