diff options
author | Thomas Hartmann <thomas.hartmann@qt.io> | 2021-11-11 15:43:47 +0100 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-11-17 01:43:12 +0000 |
commit | abc5294f11091c6c61c3b02858333acec4922ca7 (patch) | |
tree | a304166025bcb4038b12f107b5432696d9190558 /examples | |
parent | 54c0b739f20cb9080422ca2c88bdf760f3050614 (diff) |
Add .qmproject file for examples containing .ui.qml files
If an example contains ui.qml it should also have
a .qmlproject file for Qt Design Studio.
The id 'item' is not allowed in ui.qml files.
Change-Id: Ib01d22b361c00f67062f97af52489e9704aaf927
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
(cherry picked from commit 05560ed24561535e264995dc3c09d4ae4873f95c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'examples')
-rw-r--r-- | examples/webenginequick/customdialogs/forms/JavaScriptForm.ui.qml | 2 | ||||
-rw-r--r-- | examples/webenginequick/customdialogs/forms/forms.qmlproject | 45 |
2 files changed, 46 insertions, 1 deletions
diff --git a/examples/webenginequick/customdialogs/forms/JavaScriptForm.ui.qml b/examples/webenginequick/customdialogs/forms/JavaScriptForm.ui.qml index 14d9dc304..1d486eaac 100644 --- a/examples/webenginequick/customdialogs/forms/JavaScriptForm.ui.qml +++ b/examples/webenginequick/customdialogs/forms/JavaScriptForm.ui.qml @@ -53,7 +53,7 @@ import QtQuick.Layouts import QtQuick.Controls Item { - id: item + id: root property alias cancelButton: cancelButton property alias okButton: okButton property string message: "Message" diff --git a/examples/webenginequick/customdialogs/forms/forms.qmlproject b/examples/webenginequick/customdialogs/forms/forms.qmlproject new file mode 100644 index 000000000..b06afaaf1 --- /dev/null +++ b/examples/webenginequick/customdialogs/forms/forms.qmlproject @@ -0,0 +1,45 @@ +import QmlProject + +Project { + mainFile: "MenuForm.ui.qml" + + /* Include .qml, .js, and image files from current directory and subdirectories */ + QmlFiles { + directory: "." + } + + JavaScriptFiles { + directory: "." + } + + ImageFiles { + directory: "." + } + + Files { + filter: "*.conf" + files: ["qtquickcontrols2.conf"] + } + + Files { + filter: "qmldir" + directory: "." + } + + Files { + filter: "*.ttf;*.otf" + } + + Environment { + QT_QUICK_CONTROLS_CONF: "qtquickcontrols2.conf" + QT_AUTO_SCREEN_SCALE_FACTOR: "1" + } + + qt6Project: true + + /* List of plugin directories passed to QML runtime */ + importPaths: [ ".", "imports" ] + + /* Required for deployment */ + targetDirectory: "/opt/forms" +} |