diff options
Diffstat (limited to 'examples/quick/layouts')
| -rw-r--r-- | examples/quick/layouts/CMakeLists.txt | 34 | ||||
| -rw-r--r-- | examples/quick/layouts/doc/src/qtquicklayouts-examples.qdoc | 1 | ||||
| -rw-r--r-- | examples/quick/layouts/layouts.qml | 35 | ||||
| -rw-r--r-- | examples/quick/layouts/layouts.qmlproject | 16 |
4 files changed, 39 insertions, 47 deletions
diff --git a/examples/quick/layouts/CMakeLists.txt b/examples/quick/layouts/CMakeLists.txt index 74235b1553..2979b8173d 100644 --- a/examples/quick/layouts/CMakeLists.txt +++ b/examples/quick/layouts/CMakeLists.txt @@ -1,18 +1,12 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause cmake_minimum_required(VERSION 3.16) project(layouts LANGUAGES CXX) -if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") -endif() - -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/layouts") - find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick) -qt_standard_project_setup() +qt_standard_project_setup(REQUIRES 6.5) qt_add_executable(layoutsexample WIN32 @@ -22,20 +16,28 @@ qt_add_executable(layoutsexample qt_add_qml_module(layoutsexample URI layouts - AUTO_RESOURCE_PREFIX QML_FILES "layouts.qml" ) target_link_libraries(layoutsexample PRIVATE - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick + Qt6::Core + Qt6::Gui + Qt6::Qml + Qt6::Quick ) install(TARGETS layoutsexample - RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" - BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" - LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION . + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +) + +qt_generate_deploy_qml_app_script( + TARGET layoutsexample + OUTPUT_SCRIPT deploy_script + MACOS_BUNDLE_POST_BUILD + NO_UNSUPPORTED_PLATFORM_ERROR + DEPLOY_USER_QML_MODULES_ON_UNSUPPORTED_PLATFORM ) +install(SCRIPT ${deploy_script}) diff --git a/examples/quick/layouts/doc/src/qtquicklayouts-examples.qdoc b/examples/quick/layouts/doc/src/qtquicklayouts-examples.qdoc index dcbbaeeed7..a7b021f1f9 100644 --- a/examples/quick/layouts/doc/src/qtquicklayouts-examples.qdoc +++ b/examples/quick/layouts/doc/src/qtquicklayouts-examples.qdoc @@ -6,6 +6,7 @@ \brief Demonstrates how to use layout types to arrange a UI. \image qtquicklayouts-example-layouts.png \ingroup qtquickexamples + \examplecategory {User Interface Components} This example shows how to easily arrange UI components into \l{Qt Quick Layouts}{layouts} with \l{GridLayout}, \l{RowLayout}, and diff --git a/examples/quick/layouts/layouts.qml b/examples/quick/layouts/layouts.qml index eb6554cb80..92fe305559 100644 --- a/examples/quick/layouts/layouts.qml +++ b/examples/quick/layouts/layouts.qml @@ -5,12 +5,14 @@ import QtQuick import QtQuick.Controls import QtQuick.Layouts +pragma ComponentBehavior: Bound + ApplicationWindow { id: appWindow visible: true - title: "Basic layouts" - property int margin: 11 + title: qsTr("Basic layouts") + readonly property int margin: 11 Component.onCompleted: { width = mainLayout.implicitWidth + 2 * margin @@ -26,27 +28,30 @@ ApplicationWindow { anchors.margins: appWindow.margin GroupBox { id: rowBox - title: "Row layout" + title: qsTr("Row layout") Layout.fillWidth: true + Layout.fillHeight: false Layout.minimumWidth: rowLayout.Layout.minimumWidth + 30 RowLayout { id: rowLayout anchors.fill: parent TextField { - placeholderText: "This wants to grow horizontally" + placeholderText: qsTr("This wants to grow horizontally") Layout.fillWidth: true } Button { - text: "Button" + text: qsTr("Button") + Layout.fillWidth: false } } } GroupBox { id: gridBox - title: "Grid layout" + title: qsTr("Grid layout") Layout.fillWidth: true + Layout.fillHeight: false Layout.minimumWidth: gridLayout.Layout.minimumWidth + 30 GridLayout { @@ -55,17 +60,17 @@ ApplicationWindow { flow: GridLayout.TopToBottom anchors.fill: parent - Label { text: "Line 1" } - Label { text: "Line 2" } - Label { text: "Line 3" } + Label { text: qsTr("Line 1") } + Label { text: qsTr("Line 2") } + Label { text: qsTr("Line 3") } TextField { } TextField { } TextField { } TextArea { - text: "This widget spans over three rows in the GridLayout.\n" - + "All items in the GridLayout are implicitly positioned from top to bottom." + text: qsTr("This widget spans over three rows in the GridLayout.\n") + + qsTr("All items in the GridLayout are implicitly positioned from top to bottom.") wrapMode: TextArea.WordWrap Layout.rowSpan: 3 Layout.fillHeight: true @@ -77,14 +82,14 @@ ApplicationWindow { } TextArea { id: t3 - text: "This fills the whole cell" + text: qsTr("This fills the whole cell") Layout.minimumHeight: 30 Layout.fillHeight: true Layout.fillWidth: true } GroupBox { id: stackBox - title: "Stack layout" + title: qsTr("Stack layout") implicitWidth: 200 implicitHeight: 60 Layout.minimumHeight: 60 @@ -104,8 +109,8 @@ ApplicationWindow { color: Qt.hsla((0.5 + index) / stackRepeater.count, 0.3, 0.7, 1) Button { anchors.centerIn: parent - text: "Page " + (parent.index + 1) - onClicked: { stackLayout.advance() } + text: qsTr("Page ") + (parent.index + 1) + onClicked: stackLayout.advance() } } } diff --git a/examples/quick/layouts/layouts.qmlproject b/examples/quick/layouts/layouts.qmlproject deleted file mode 100644 index e5a8bf02ca..0000000000 --- a/examples/quick/layouts/layouts.qmlproject +++ /dev/null @@ -1,16 +0,0 @@ -import QmlProject 1.1 - -Project { - mainFile: "main.qml" - - /* Include .qml, .js, and image files from current directory and subdirectories */ - QmlFiles { - directory: "." - } - JavaScriptFiles { - directory: "." - } - ImageFiles { - directory: "." - } -} |