qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
qtdeclarative/examples/quickcontrols/chattutorial/chapter2/chapter2.pro

28 lines
680 B
Prolog
Raw Normal View History

Fix CMakeLists.txts of chattutorial - Run pro2cmake.py on each .pro and did some manual adjustments. - Rename directories to simplify resource paths, URIs, etc. - Rename executables to ensure they're distinguishable from other targets in Creator's locator. - Duplicate images into each example due to issues with resources. - Now that we use qt_add_qml_module, the qtquickcontrols2.conf file will no longer be at the resource root, so specify it separately with qt6_add_resources. - Update qmake files. - Fix documentation. Task-number: QTBUG-98130 Pick-to: 6.2 Change-Id: I210ef2cbcd45dd7f4df881332174bff1b18c5be7 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2021-11-08 11:02:30 +00:00
TEMPLATE = app
QT += qml quick
CONFIG += c++11
SOURCES += main.cpp
Examples: Fix .pro files for chattutorial Chat Tutorial application was not able to find main.qml file when using qmake. It was caused by cmake adaptation for using qt_add_qml_module. The main.qml file is currently searched in the chapter directory. To these changes also qmake configuration must be adapted. Pick-to: 6.4 6.3 6.2 Fixes: QTCREATORBUG-27655 Change-Id: I1e92d806dbfeb17e613596f96fd24f53fb6eba1d Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-08-11 13:27:12 +00:00
resources.files = \
Fix CMakeLists.txts of chattutorial - Run pro2cmake.py on each .pro and did some manual adjustments. - Rename directories to simplify resource paths, URIs, etc. - Rename executables to ensure they're distinguishable from other targets in Creator's locator. - Duplicate images into each example due to issues with resources. - Now that we use qt_add_qml_module, the qtquickcontrols2.conf file will no longer be at the resource root, so specify it separately with qt6_add_resources. - Update qmake files. - Fix documentation. Task-number: QTBUG-98130 Pick-to: 6.2 Change-Id: I210ef2cbcd45dd7f4df881332174bff1b18c5be7 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2021-11-08 11:02:30 +00:00
images/Albert_Einstein.png \
images/Albert_Einstein@2x.png \
images/Albert_Einstein@3x.png \
images/Albert_Einstein@4x.png \
images/Ernest_Hemingway.png \
images/Ernest_Hemingway@2x.png \
images/Ernest_Hemingway@3x.png \
images/Ernest_Hemingway@4x.png \
images/Hans_Gude.png \
images/Hans_Gude@2x.png \
images/Hans_Gude@3x.png \
images/Hans_Gude@4x.png \
Examples: Fix .pro files for chattutorial Chat Tutorial application was not able to find main.qml file when using qmake. It was caused by cmake adaptation for using qt_add_qml_module. The main.qml file is currently searched in the chapter directory. To these changes also qmake configuration must be adapted. Pick-to: 6.4 6.3 6.2 Fixes: QTCREATORBUG-27655 Change-Id: I1e92d806dbfeb17e613596f96fd24f53fb6eba1d Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-08-11 13:27:12 +00:00
main.qml
resources.prefix = chapter2/
RESOURCES += resources \
Fix CMakeLists.txts of chattutorial - Run pro2cmake.py on each .pro and did some manual adjustments. - Rename directories to simplify resource paths, URIs, etc. - Rename executables to ensure they're distinguishable from other targets in Creator's locator. - Duplicate images into each example due to issues with resources. - Now that we use qt_add_qml_module, the qtquickcontrols2.conf file will no longer be at the resource root, so specify it separately with qt6_add_resources. - Update qmake files. - Fix documentation. Task-number: QTBUG-98130 Pick-to: 6.2 Change-Id: I210ef2cbcd45dd7f4df881332174bff1b18c5be7 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2021-11-08 11:02:30 +00:00
qtquickcontrols2.conf
Doc: remove "2" from Qt Quick Controls files Work on this was already started for the documentation in 1abdfe5d5a052f2298b7bf657513dfa7e0c66a56. The CMake target (docs_QuickControls2) probably can't be renamed until we rename the library, which won't happen until Qt 7. Task-number: QTBUG-95413 Change-Id: Ied20805a91286436606577c3de39671a447f27dd Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-11-23 08:50:43 +00:00
target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols/chattutorial/chapter2
Fix CMakeLists.txts of chattutorial - Run pro2cmake.py on each .pro and did some manual adjustments. - Rename directories to simplify resource paths, URIs, etc. - Rename executables to ensure they're distinguishable from other targets in Creator's locator. - Duplicate images into each example due to issues with resources. - Now that we use qt_add_qml_module, the qtquickcontrols2.conf file will no longer be at the resource root, so specify it separately with qt6_add_resources. - Update qmake files. - Fix documentation. Task-number: QTBUG-98130 Pick-to: 6.2 Change-Id: I210ef2cbcd45dd7f4df881332174bff1b18c5be7 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2021-11-08 11:02:30 +00:00
INSTALLS += target