mirror of
https://github.com/Serial-Studio/Serial-Studio.git
synced 2025-01-31 17:42:55 +08:00
Do not rely on QtCore settings, it breaks builds with Qt < 6.4
This commit is contained in:
parent
1b5f094837
commit
0a16c90acd
@ -20,10 +20,10 @@
|
|||||||
* THE SOFTWARE.
|
* THE SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import QtCore
|
|
||||||
import QtQuick
|
import QtQuick
|
||||||
import QtQuick.Layouts
|
import QtQuick.Layouts
|
||||||
import QtQuick.Controls
|
import QtQuick.Controls
|
||||||
|
import Qt.labs.settings
|
||||||
|
|
||||||
import "../Widgets" as Widgets
|
import "../Widgets" as Widgets
|
||||||
|
|
||||||
|
@ -20,10 +20,10 @@
|
|||||||
* THE SOFTWARE.
|
* THE SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import QtCore
|
|
||||||
import QtQuick
|
import QtQuick
|
||||||
import QtQuick.Layouts
|
import QtQuick.Layouts
|
||||||
import QtQuick.Controls
|
import QtQuick.Controls
|
||||||
|
import Qt.labs.settings
|
||||||
|
|
||||||
import "../Widgets" as Widgets
|
import "../Widgets" as Widgets
|
||||||
|
|
||||||
|
@ -20,10 +20,10 @@
|
|||||||
* THE SOFTWARE.
|
* THE SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import QtCore
|
|
||||||
import QtQuick
|
import QtQuick
|
||||||
import QtQuick.Layouts
|
import QtQuick.Layouts
|
||||||
import QtQuick.Controls
|
import QtQuick.Controls
|
||||||
|
import Qt.labs.settings
|
||||||
|
|
||||||
import "../Widgets" as Widgets
|
import "../Widgets" as Widgets
|
||||||
import "SetupPanes" as SetupPanes
|
import "SetupPanes" as SetupPanes
|
||||||
|
@ -23,7 +23,7 @@
|
|||||||
import QtQuick
|
import QtQuick
|
||||||
import QtQuick.Layouts
|
import QtQuick.Layouts
|
||||||
import QtQuick.Controls
|
import QtQuick.Controls
|
||||||
import QtCore as QtCore
|
import Qt.labs.settings as QtSettings
|
||||||
|
|
||||||
import "Devices" as Devices
|
import "Devices" as Devices
|
||||||
import "../../Windows" as Windows
|
import "../../Windows" as Windows
|
||||||
@ -34,7 +34,7 @@ Control {
|
|||||||
//
|
//
|
||||||
// Save settings
|
// Save settings
|
||||||
//
|
//
|
||||||
QtCore.Settings {
|
QtSettings.Settings {
|
||||||
property alias driver: _driverCombo.currentIndex
|
property alias driver: _driverCombo.currentIndex
|
||||||
property alias parity: serial.parity
|
property alias parity: serial.parity
|
||||||
property alias baudRate: serial.baudRate
|
property alias baudRate: serial.baudRate
|
||||||
|
@ -20,10 +20,10 @@
|
|||||||
* THE SOFTWARE.
|
* THE SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import QtCore
|
|
||||||
import QtQuick
|
import QtQuick
|
||||||
import QtQuick.Layouts
|
import QtQuick.Layouts
|
||||||
import QtQuick.Controls
|
import QtQuick.Controls
|
||||||
|
import Qt.labs.settings
|
||||||
import SerialStudio as SerialStudio
|
import SerialStudio as SerialStudio
|
||||||
|
|
||||||
Item {
|
Item {
|
||||||
|
@ -20,11 +20,11 @@
|
|||||||
* THE SOFTWARE.
|
* THE SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import QtCore
|
|
||||||
import QtQuick
|
import QtQuick
|
||||||
import QtQuick.Window
|
import QtQuick.Window
|
||||||
import QtQuick.Layouts
|
import QtQuick.Layouts
|
||||||
import QtQuick.Controls
|
import QtQuick.Controls
|
||||||
|
import Qt.labs.settings
|
||||||
|
|
||||||
import "../FramelessWindow" as FramelessWindow
|
import "../FramelessWindow" as FramelessWindow
|
||||||
|
|
||||||
|
@ -20,11 +20,11 @@
|
|||||||
* THE SOFTWARE.
|
* THE SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import QtCore
|
|
||||||
import QtQuick
|
import QtQuick
|
||||||
import QtQuick.Window
|
import QtQuick.Window
|
||||||
import QtQuick.Layouts
|
import QtQuick.Layouts
|
||||||
import QtQuick.Controls
|
import QtQuick.Controls
|
||||||
|
import Qt.labs.settings
|
||||||
|
|
||||||
import "../FramelessWindow" as FramelessWindow
|
import "../FramelessWindow" as FramelessWindow
|
||||||
|
|
||||||
|
@ -20,11 +20,11 @@
|
|||||||
* THE SOFTWARE.
|
* THE SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import QtCore
|
|
||||||
import QtQuick
|
import QtQuick
|
||||||
import QtQuick.Window
|
import QtQuick.Window
|
||||||
import QtQuick.Layouts
|
import QtQuick.Layouts
|
||||||
import QtQuick.Controls
|
import QtQuick.Controls
|
||||||
|
import Qt.labs.settings
|
||||||
|
|
||||||
import "../Panes"
|
import "../Panes"
|
||||||
import "../Windows"
|
import "../Windows"
|
||||||
|
@ -20,11 +20,11 @@
|
|||||||
* THE SOFTWARE.
|
* THE SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import QtCore
|
|
||||||
import QtQuick
|
import QtQuick
|
||||||
import QtQuick.Window
|
import QtQuick.Window
|
||||||
import QtQuick.Layouts
|
import QtQuick.Layouts
|
||||||
import QtQuick.Controls
|
import QtQuick.Controls
|
||||||
|
import Qt.labs.settings
|
||||||
|
|
||||||
import "../ProjectEditor"
|
import "../ProjectEditor"
|
||||||
import "../Widgets" as Widgets
|
import "../Widgets" as Widgets
|
||||||
|
Loading…
x
Reference in New Issue
Block a user