adapt for qt5.
This commit is contained in:
@ -1,5 +1,5 @@
|
||||
import QtQuick
|
||||
import QtQuick.Controls
|
||||
import QtQuick 2.15
|
||||
import QtQuick.Controls 2.15
|
||||
|
||||
Popup {
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
import QtQuick
|
||||
import QtQuick.Controls
|
||||
import QtQuick.Layouts
|
||||
import AntiClipSettings
|
||||
import QtQuick 2.15
|
||||
import QtQuick.Controls 2.15
|
||||
import QtQuick.Layouts 1.15
|
||||
import AntiClipSettings 1.0
|
||||
|
||||
Item {
|
||||
id: root
|
||||
|
@ -1,6 +1,6 @@
|
||||
import QtQuick
|
||||
import QtQuick.Controls
|
||||
import QtQuick.Layouts
|
||||
import QtQuick 2.15
|
||||
import QtQuick.Controls 2.15
|
||||
import QtQuick.Layouts 1.15
|
||||
|
||||
Column {
|
||||
id: root
|
||||
|
12
qml/Main.qml
12
qml/Main.qml
@ -1,8 +1,10 @@
|
||||
import QtQuick
|
||||
import QtQuick.Controls
|
||||
import QtQuick.Layouts
|
||||
import QtQuick 2.15
|
||||
import QtQuick.Controls 2.15
|
||||
import QtQuick.Layouts 1.15
|
||||
import QtQuick.Dialogs
|
||||
import AntiClipSettings
|
||||
import AntiClipSettings 1.0
|
||||
import Qt.labs.platform 1.1 as Labs
|
||||
|
||||
|
||||
ApplicationWindow {
|
||||
id: window
|
||||
@ -114,7 +116,7 @@ ApplicationWindow {
|
||||
id: otaPopup
|
||||
}
|
||||
|
||||
FolderDialog {
|
||||
Labs.FolderDialog {
|
||||
id: folderDialog
|
||||
onAccepted: {
|
||||
App.collector.path = folderDialog.selectedFolder
|
||||
|
@ -1,5 +1,5 @@
|
||||
import QtQuick
|
||||
import QtQuick.Controls
|
||||
import QtQuick 2.15
|
||||
import QtQuick.Controls 2.15
|
||||
|
||||
Dialog {
|
||||
id: control
|
||||
|
@ -1,7 +1,7 @@
|
||||
import QtQuick
|
||||
import QtQuick.Controls
|
||||
import QtQuick.Layouts
|
||||
import AntiClipSettings
|
||||
import QtQuick 2.15
|
||||
import QtQuick.Controls 2.15
|
||||
import QtQuick.Layouts 1.15
|
||||
import AntiClipSettings 1.0
|
||||
|
||||
Popup {
|
||||
id: root
|
||||
|
@ -1,9 +1,8 @@
|
||||
import QtCore
|
||||
import QtQuick
|
||||
import QtQuick.Controls
|
||||
import QtQuick.Layouts
|
||||
import QtQuick 2.15
|
||||
import QtQuick.Controls 2.15
|
||||
import QtQuick.Layouts 1.15
|
||||
import QtQuick.Dialogs
|
||||
import AntiClipSettings
|
||||
import AntiClipSettings 1.0
|
||||
|
||||
Popup {
|
||||
id: root
|
||||
@ -96,14 +95,19 @@ Popup {
|
||||
FileDialog {
|
||||
id: fileDialog
|
||||
nameFilters: ["OTA文件 (*.bin)"]
|
||||
currentFolder: StandardPaths.standardLocations(
|
||||
StandardPaths.DesktopLocation)[0]
|
||||
|
||||
onAccepted: {
|
||||
var fileUrl = fileDialog.selectedFile.toString()
|
||||
var localFilePath = fileUrl.startsWith(
|
||||
"file:///") ? fileUrl.substring(8) : fileUrl
|
||||
otaFile.text = localFilePath
|
||||
}
|
||||
onVisibleChanged: {
|
||||
if(!isQt5){
|
||||
currentFolder= StandardPaths.standardLocations(
|
||||
StandardPaths.DesktopLocation)[0]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Connections {
|
||||
|
@ -1,5 +1,5 @@
|
||||
import QtQuick
|
||||
import QtQuick.Controls
|
||||
import QtQuick 2.15
|
||||
import QtQuick.Controls 2.15
|
||||
|
||||
Popup{
|
||||
id: control
|
||||
|
Reference in New Issue
Block a user