From 431ade2ff8b8874ac7812b7a19b791844b1056c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20M=C3=A4=C3=A4tt=C3=A4?= Date: Thu, 3 Oct 2019 13:37:59 +0300 Subject: Use QtQuick dialogs in simpleqml example MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use QtQuick dialogs instead of qt labs dialogs, which are not always available. Change-Id: I4a5bfe3a0d443f44cdcde6de8be1a8ee76fa99c2 Reviewed-by: Miikka Heikkinen Reviewed-by: Tomi Korpipää --- examples/studio3d/simpleqml/main.cpp | 3 +++ examples/studio3d/simpleqml/main.qml | 8 +++++--- 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'examples') 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 } } -- cgit v1.2.3