summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntti Määttä <antti.maatta@qt.io>2019-10-03 13:37:59 +0300
committerAntti Määttä <antti.maatta@qt.io>2019-10-03 13:44:12 +0300
commit431ade2ff8b8874ac7812b7a19b791844b1056c3 (patch)
treee7c746e45235ab8496d43ce3a6d3e440f1a0b486
parent68c21f6227163ec67cb15b003413544084d7f6a1 (diff)
Use QtQuick dialogs in simpleqml example
Use QtQuick dialogs instead of qt labs dialogs, which are not always available. Change-Id: I4a5bfe3a0d443f44cdcde6de8be1a8ee76fa99c2 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
-rw-r--r--examples/studio3d/simpleqml/main.cpp3
-rw-r--r--examples/studio3d/simpleqml/main.qml8
2 files changed, 8 insertions, 3 deletions
diff --git a/examples/studio3d/simpleqml/main.cpp b/examples/studio3d/simpleqml/main.cpp
index f2640b5..7fe9bfb 100644
--- a/examples/studio3d/simpleqml/main.cpp
+++ b/examples/studio3d/simpleqml/main.cpp
@@ -55,6 +55,9 @@
int main(int argc, char *argv[])
{
QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
+ QCoreApplication::setOrganizationName("The Qt Company");
+ QCoreApplication::setOrganizationDomain("qt.io");
+ QCoreApplication::setApplicationName("SimpleQml");
qputenv("QSG_INFO", "1");
QApplication app(argc, argv);
diff --git a/examples/studio3d/simpleqml/main.qml b/examples/studio3d/simpleqml/main.qml
index ed0278e..abdcb79 100644
--- a/examples/studio3d/simpleqml/main.qml
+++ b/examples/studio3d/simpleqml/main.qml
@@ -53,7 +53,7 @@ import QtStudio3D.OpenGL 2.4
import QtQuick.Window 2.3
import QtQuick.Controls 2.2
import QtQuick.Layouts 1.3
-import Qt.labs.platform 1.0
+import QtQuick.Dialogs 1.3
Rectangle {
id: root
@@ -286,8 +286,10 @@ Rectangle {
FileDialog {
id: openDialog
- fileMode: FileDialog.OpenFile
nameFilters: ["UIP files (*.uip)", "UIA files (*.uia)", "All files (*)"]
- onAccepted: s3dpres.source = file
+ selectExisting: true
+ selectFolder: false
+ selectMultiple: false
+ onAccepted: s3dpres.source = fileUrl
}
}