Commit f2535a54 authored by armin's avatar armin
Browse files

Merge branch 'osxcompat' into 'master'

osx compat

See merge request !202
parents 9f848160 93098759
Pipeline #755 passed with stage
in 2 minutes and 30 seconds
Subproject commit ae908aa266522a566b55b96bf7d0d87c3a272dfb
Subproject commit cc6c044ac55f500273ba4774c94f9719932a5ef7
No preview for this file type
No preview for this file type
......@@ -182,8 +182,9 @@ ApplicationWindow {
}
}
onClosing: {
Print.log(Qt.platform.os);
if (Qt.platform.os !== "linux" && Qt.platform.os !== "windows"
&& Qt.platform.os !== "macOS") {
&& Qt.platform.os !== "osx") {
Print.log(close)
Print.log(mainStack.depth)
if (mainStack.depth <= 2) {
......
......@@ -245,7 +245,7 @@ Item {
}
onPressed: {
if (Qt.platform.os == "linux"|| Qt.platform.os == "windows") {
if (Qt.platform.os == "linux"|| Qt.platform.os == "windows"||Qt.platform.os == "osx") {
fileDialog.open()
} else if(Qt.platform.os == "ios"){
console.log("ios picker called")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment