Skip to content

Commit f4fe837

Browse files
committed
qml_features: use depends feature of QML modules
1 parent ebccb5c commit f4fe837

File tree

2 files changed

+22
-18
lines changed

2 files changed

+22
-18
lines changed

examples/qml_features/qml/pages/MultipleQObjectsPage.qml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ Page {
5555
}
5656

5757
Label {
58-
// TODO: QColor needs a dependency in qmldir on QtQuick
5958
color: root.first.color
6059
Layout.fillWidth: true
6160
horizontalAlignment: Text.AlignHCenter

examples/qml_features/rust/build.rs

Lines changed: 22 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,28 @@
88
use cxx_qt_build::{CxxQtBuilder, QmlModule};
99

1010
fn main() {
11-
CxxQtBuilder::new_qml_module(QmlModule::new("com.kdab.cxx_qt.demo").qml_files([
12-
"../qml/main.qml",
13-
"../qml/pages/ContainersPage.qml",
14-
"../qml/pages/CustomBaseClassPage.qml",
15-
"../qml/pages/CustomParentClassPage.qml",
16-
"../qml/pages/ExternCxxQtPage.qml",
17-
"../qml/pages/InvokablesPage.qml",
18-
"../qml/pages/MultipleQObjectsPage.qml",
19-
"../qml/pages/NamingPage.qml",
20-
"../qml/pages/NestedQObjectsPage.qml",
21-
"../qml/pages/PropertiesPage.qml",
22-
"../qml/pages/SerialisationPage.qml",
23-
"../qml/pages/SignalsPage.qml",
24-
"../qml/pages/SingletonPage.qml",
25-
"../qml/pages/ThreadingPage.qml",
26-
"../qml/pages/TypesPage.qml",
27-
]))
11+
CxxQtBuilder::new_qml_module(
12+
QmlModule::new("com.kdab.cxx_qt.demo")
13+
.qml_files([
14+
"../qml/main.qml",
15+
"../qml/pages/ContainersPage.qml",
16+
"../qml/pages/CustomBaseClassPage.qml",
17+
"../qml/pages/CustomParentClassPage.qml",
18+
"../qml/pages/ExternCxxQtPage.qml",
19+
"../qml/pages/InvokablesPage.qml",
20+
"../qml/pages/MultipleQObjectsPage.qml",
21+
"../qml/pages/NamingPage.qml",
22+
"../qml/pages/NestedQObjectsPage.qml",
23+
"../qml/pages/PropertiesPage.qml",
24+
"../qml/pages/SerialisationPage.qml",
25+
"../qml/pages/SignalsPage.qml",
26+
"../qml/pages/SingletonPage.qml",
27+
"../qml/pages/ThreadingPage.qml",
28+
"../qml/pages/TypesPage.qml",
29+
])
30+
// Need to depend on QtQuick for QColor to work with qmllint/qmlls
31+
.depend("QtQuick"),
32+
)
2833
.files([
2934
"src/containers.rs",
3035
"src/custom_base_class.rs",

0 commit comments

Comments
 (0)