summaryrefslogtreecommitdiff
path: root/examples/tutorials
diff options
context:
space:
mode:
Diffstat (limited to 'examples/tutorials')
-rw-r--r--examples/tutorials/alarms/alarms.pro2
-rw-r--r--examples/tutorials/alarms/controls_conf.qrc5
-rw-r--r--examples/tutorials/alarms/main.cpp11
-rw-r--r--examples/tutorials/alarms/qml.qrc3
4 files changed, 15 insertions, 6 deletions
diff --git a/examples/tutorials/alarms/alarms.pro b/examples/tutorials/alarms/alarms.pro
index 14fc29a8..4e75fa52 100644
--- a/examples/tutorials/alarms/alarms.pro
+++ b/examples/tutorials/alarms/alarms.pro
@@ -4,7 +4,7 @@ QT += quick
SOURCES += main.cpp
-RESOURCES += qml.qrc
+RESOURCES += qml.qrc controls_conf.qrc
target.path = $$[QT_INSTALL_EXAMPLES]/demos/alarms
INSTALLS += target
diff --git a/examples/tutorials/alarms/controls_conf.qrc b/examples/tutorials/alarms/controls_conf.qrc
new file mode 100644
index 00000000..4fbf17b7
--- /dev/null
+++ b/examples/tutorials/alarms/controls_conf.qrc
@@ -0,0 +1,5 @@
+<RCC>
+ <qresource prefix="/">
+ <file>qtquickcontrols2.conf</file>
+ </qresource>
+</RCC>
diff --git a/examples/tutorials/alarms/main.cpp b/examples/tutorials/alarms/main.cpp
index 3e1bdd84..04d2f8dc 100644
--- a/examples/tutorials/alarms/main.cpp
+++ b/examples/tutorials/alarms/main.cpp
@@ -57,9 +57,14 @@ int main(int argc, char *argv[])
QGuiApplication app(argc, argv);
QQmlApplicationEngine engine;
- engine.load(QUrl(QStringLiteral("qrc:/main.qml")));
- if (engine.rootObjects().isEmpty())
- return -1;
+ const QUrl url(u"qrc:/alarms/main.qml"_qs);
+ QObject::connect(&engine, &QQmlApplicationEngine::objectCreated, &app,
+ [url](QObject *obj, const QUrl &objUrl) {
+ if (!obj && url == objUrl)
+ QCoreApplication::exit(-1);
+ },
+ Qt::QueuedConnection);
+ engine.load(url);
return app.exec();
}
diff --git a/examples/tutorials/alarms/qml.qrc b/examples/tutorials/alarms/qml.qrc
index ae9ac907..270febb2 100644
--- a/examples/tutorials/alarms/qml.qrc
+++ b/examples/tutorials/alarms/qml.qrc
@@ -1,7 +1,6 @@
<RCC>
- <qresource prefix="/">
+ <qresource prefix="/alarms/">
<file>main.qml</file>
- <file>qtquickcontrols2.conf</file>
<file>TumblerDelegate.qml</file>
<file>AlarmModel.qml</file>
<file>AlarmDelegate.qml</file>