aboutsummaryrefslogtreecommitdiffstats
path: root/examples/quickcontrols
diff options
context:
space:
mode:
Diffstat (limited to 'examples/quickcontrols')
-rw-r--r--examples/quickcontrols/attachedstyleproperties/MyStyle/CMakeLists.txt1
-rw-r--r--examples/quickcontrols/chattutorial/chapter1/CMakeLists.txt1
-rw-r--r--examples/quickcontrols/chattutorial/chapter1/chapter1.pro2
-rw-r--r--examples/quickcontrols/chattutorial/chapter1/main.cpp2
-rw-r--r--examples/quickcontrols/chattutorial/chapter2/CMakeLists.txt1
-rw-r--r--examples/quickcontrols/chattutorial/chapter2/chapter2.pro2
-rw-r--r--examples/quickcontrols/chattutorial/chapter2/main.cpp2
-rw-r--r--examples/quickcontrols/chattutorial/chapter3/CMakeLists.txt2
-rw-r--r--examples/quickcontrols/chattutorial/chapter3/chapter3.pro2
-rw-r--r--examples/quickcontrols/chattutorial/chapter3/main.cpp2
-rw-r--r--examples/quickcontrols/chattutorial/chapter4/CMakeLists.txt2
-rw-r--r--examples/quickcontrols/chattutorial/chapter4/chapter4.pro2
-rw-r--r--examples/quickcontrols/chattutorial/chapter4/main.cpp2
-rw-r--r--examples/quickcontrols/chattutorial/chapter5/CMakeLists.txt2
-rw-r--r--examples/quickcontrols/chattutorial/chapter5/chapter5.pro2
-rw-r--r--examples/quickcontrols/chattutorial/chapter5/main.cpp2
16 files changed, 16 insertions, 13 deletions
diff --git a/examples/quickcontrols/attachedstyleproperties/MyStyle/CMakeLists.txt b/examples/quickcontrols/attachedstyleproperties/MyStyle/CMakeLists.txt
index e6e6e10370..9cb00a81e7 100644
--- a/examples/quickcontrols/attachedstyleproperties/MyStyle/CMakeLists.txt
+++ b/examples/quickcontrols/attachedstyleproperties/MyStyle/CMakeLists.txt
@@ -4,6 +4,7 @@ endif()
set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols/attachedstyleproperties")
+qt_policy(SET QTP0001 NEW)
qt_add_qml_module(MyStyle
URI MyStyle
IMPORTS
diff --git a/examples/quickcontrols/chattutorial/chapter1/CMakeLists.txt b/examples/quickcontrols/chattutorial/chapter1/CMakeLists.txt
index 52a9dcb19b..549790b9e8 100644
--- a/examples/quickcontrols/chattutorial/chapter1/CMakeLists.txt
+++ b/examples/quickcontrols/chattutorial/chapter1/CMakeLists.txt
@@ -25,6 +25,7 @@ target_link_libraries(chattutorial-chapter1 PRIVATE
Qt::Quick
)
+qt_policy(SET QTP0001 NEW)
qt_add_qml_module(chattutorial-chapter1
URI chapter1
QML_FILES
diff --git a/examples/quickcontrols/chattutorial/chapter1/chapter1.pro b/examples/quickcontrols/chattutorial/chapter1/chapter1.pro
index c44cd50659..40c7d2ff7d 100644
--- a/examples/quickcontrols/chattutorial/chapter1/chapter1.pro
+++ b/examples/quickcontrols/chattutorial/chapter1/chapter1.pro
@@ -6,7 +6,7 @@ CONFIG += c++11
SOURCES += main.cpp
resources.files = main.qml
-resources.prefix = chapter1/
+resources.prefix = qt/qml/chapter1/
RESOURCES += resources \
qtquickcontrols2.conf
diff --git a/examples/quickcontrols/chattutorial/chapter1/main.cpp b/examples/quickcontrols/chattutorial/chapter1/main.cpp
index 3752f91d90..7252c0c3ad 100644
--- a/examples/quickcontrols/chattutorial/chapter1/main.cpp
+++ b/examples/quickcontrols/chattutorial/chapter1/main.cpp
@@ -9,7 +9,7 @@ int main(int argc, char *argv[])
QGuiApplication app(argc, argv);
QQmlApplicationEngine engine;
- engine.load(QUrl(QStringLiteral("qrc:/chapter1/main.qml")));
+ engine.load(QUrl(QStringLiteral("qrc:/qt/qml/chapter1/main.qml")));
return app.exec();
}
diff --git a/examples/quickcontrols/chattutorial/chapter2/CMakeLists.txt b/examples/quickcontrols/chattutorial/chapter2/CMakeLists.txt
index 0669626a06..561861afc0 100644
--- a/examples/quickcontrols/chattutorial/chapter2/CMakeLists.txt
+++ b/examples/quickcontrols/chattutorial/chapter2/CMakeLists.txt
@@ -25,6 +25,7 @@ target_link_libraries(chattutorial-chapter2 PRIVATE
Qt::Quick
)
+qt_policy(SET QTP0001 NEW)
qt_add_qml_module(chattutorial-chapter2
URI chapter2
QML_FILES
diff --git a/examples/quickcontrols/chattutorial/chapter2/chapter2.pro b/examples/quickcontrols/chattutorial/chapter2/chapter2.pro
index 00cf68b57c..8679db986a 100644
--- a/examples/quickcontrols/chattutorial/chapter2/chapter2.pro
+++ b/examples/quickcontrols/chattutorial/chapter2/chapter2.pro
@@ -19,7 +19,7 @@ resources.files = \
images/Hans_Gude@3x.png \
images/Hans_Gude@4x.png \
main.qml
-resources.prefix = chapter2/
+resources.prefix = qt/qml/chapter2/
RESOURCES += resources \
qtquickcontrols2.conf
diff --git a/examples/quickcontrols/chattutorial/chapter2/main.cpp b/examples/quickcontrols/chattutorial/chapter2/main.cpp
index eeb87becca..07f034a827 100644
--- a/examples/quickcontrols/chattutorial/chapter2/main.cpp
+++ b/examples/quickcontrols/chattutorial/chapter2/main.cpp
@@ -9,7 +9,7 @@ int main(int argc, char *argv[])
QGuiApplication app(argc, argv);
QQmlApplicationEngine engine;
- engine.load(QUrl(QStringLiteral("qrc:/chapter2/main.qml")));
+ engine.load(QUrl(QStringLiteral("qrc:/qt/qml/chapter2/main.qml")));
return app.exec();
}
diff --git a/examples/quickcontrols/chattutorial/chapter3/CMakeLists.txt b/examples/quickcontrols/chattutorial/chapter3/CMakeLists.txt
index e55597f2c8..92ac5683fd 100644
--- a/examples/quickcontrols/chattutorial/chapter3/CMakeLists.txt
+++ b/examples/quickcontrols/chattutorial/chapter3/CMakeLists.txt
@@ -25,7 +25,7 @@ target_link_libraries(chattutorial-chapter3 PRIVATE
Qt::Quick
)
-# Resources:
+qt_policy(SET QTP0001 NEW)
qt_add_qml_module(chattutorial-chapter3
URI chapter3
QML_FILES
diff --git a/examples/quickcontrols/chattutorial/chapter3/chapter3.pro b/examples/quickcontrols/chattutorial/chapter3/chapter3.pro
index 9a4c5b5703..5314e2dd36 100644
--- a/examples/quickcontrols/chattutorial/chapter3/chapter3.pro
+++ b/examples/quickcontrols/chattutorial/chapter3/chapter3.pro
@@ -21,7 +21,7 @@ resources.files = \
images/Hans_Gude@3x.png \
images/Hans_Gude@4x.png \
main.qml
-resources.prefix = chapter3/
+resources.prefix = qt/qml/chapter3/
RESOURCES += resources \
qtquickcontrols2.conf
diff --git a/examples/quickcontrols/chattutorial/chapter3/main.cpp b/examples/quickcontrols/chattutorial/chapter3/main.cpp
index 4347d3ff6c..71e250bed5 100644
--- a/examples/quickcontrols/chattutorial/chapter3/main.cpp
+++ b/examples/quickcontrols/chattutorial/chapter3/main.cpp
@@ -9,7 +9,7 @@ int main(int argc, char *argv[])
QGuiApplication app(argc, argv);
QQmlApplicationEngine engine;
- engine.load(QUrl(QStringLiteral("qrc:/chapter3/main.qml")));
+ engine.load(QUrl(QStringLiteral("qrc:/qt/qml/chapter3/main.qml")));
return app.exec();
}
diff --git a/examples/quickcontrols/chattutorial/chapter4/CMakeLists.txt b/examples/quickcontrols/chattutorial/chapter4/CMakeLists.txt
index c26fe1416b..cc56b319e7 100644
--- a/examples/quickcontrols/chattutorial/chapter4/CMakeLists.txt
+++ b/examples/quickcontrols/chattutorial/chapter4/CMakeLists.txt
@@ -28,7 +28,7 @@ target_link_libraries(chattutorial-chapter4 PRIVATE
Qt::Sql
)
-# Resources:
+qt_policy(SET QTP0001 NEW)
qt_add_qml_module(chattutorial-chapter4
URI chapter4
QML_FILES
diff --git a/examples/quickcontrols/chattutorial/chapter4/chapter4.pro b/examples/quickcontrols/chattutorial/chapter4/chapter4.pro
index baf2d319d5..399b3506c2 100644
--- a/examples/quickcontrols/chattutorial/chapter4/chapter4.pro
+++ b/examples/quickcontrols/chattutorial/chapter4/chapter4.pro
@@ -26,7 +26,7 @@ resources.files = \
images/Hans_Gude@3x.png \
images/Hans_Gude@4x.png \
main.qml
-resources.prefix = chapter4/
+resources.prefix = qt/qml/chapter4/
RESOURCES += resources \
qtquickcontrols2.conf
diff --git a/examples/quickcontrols/chattutorial/chapter4/main.cpp b/examples/quickcontrols/chattutorial/chapter4/main.cpp
index 0ca281c7d9..4c7289deb3 100644
--- a/examples/quickcontrols/chattutorial/chapter4/main.cpp
+++ b/examples/quickcontrols/chattutorial/chapter4/main.cpp
@@ -43,7 +43,7 @@ int main(int argc, char *argv[])
connectToDatabase();
QQmlApplicationEngine engine;
- engine.load(QUrl(QStringLiteral("qrc:/chapter4/main.qml")));
+ engine.load(QUrl(QStringLiteral("qrc:/qt/qml/chapter4/main.qml")));
if (engine.rootObjects().isEmpty())
return -1;
diff --git a/examples/quickcontrols/chattutorial/chapter5/CMakeLists.txt b/examples/quickcontrols/chattutorial/chapter5/CMakeLists.txt
index 39126e51bd..dfffa0f6de 100644
--- a/examples/quickcontrols/chattutorial/chapter5/CMakeLists.txt
+++ b/examples/quickcontrols/chattutorial/chapter5/CMakeLists.txt
@@ -28,7 +28,7 @@ target_link_libraries(chattutorial-chapter5 PRIVATE
Qt::Sql
)
-# Resources:
+qt_policy(SET QTP0001 NEW)
qt_add_qml_module(chattutorial-chapter5
URI chapter5
QML_FILES
diff --git a/examples/quickcontrols/chattutorial/chapter5/chapter5.pro b/examples/quickcontrols/chattutorial/chapter5/chapter5.pro
index 3ba8d97ddc..9f44cb0459 100644
--- a/examples/quickcontrols/chattutorial/chapter5/chapter5.pro
+++ b/examples/quickcontrols/chattutorial/chapter5/chapter5.pro
@@ -28,7 +28,7 @@ resources.files = \
images/Hans_Gude@3x.png \
images/Hans_Gude@4x.png \
main.qml
-resources.prefix = chapter5/
+resources.prefix = qt/qml/chapter5/
RESOURCES += resources \
qtquickcontrols2.conf
diff --git a/examples/quickcontrols/chattutorial/chapter5/main.cpp b/examples/quickcontrols/chattutorial/chapter5/main.cpp
index cfa5aa6f57..a084655830 100644
--- a/examples/quickcontrols/chattutorial/chapter5/main.cpp
+++ b/examples/quickcontrols/chattutorial/chapter5/main.cpp
@@ -43,7 +43,7 @@ int main(int argc, char *argv[])
connectToDatabase();
QQmlApplicationEngine engine;
- engine.load(QUrl(QStringLiteral("qrc:/chapter5/main.qml")));
+ engine.load(QUrl(QStringLiteral("qrc:/qt/qml/chapter5/main.qml")));
if (engine.rootObjects().isEmpty())
return -1;
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-21 18:31:24 +0000