diff options
author | Oliver Eftevaag <oliver.eftevaag@qt.io> | 2021-02-11 13:48:43 +0100 |
---|---|---|
committer | Oliver Eftevaag <oliver.eftevaag@qt.io> | 2021-02-22 17:10:15 +0100 |
commit | b2f89bbbb1a03a0f207e2c47f24812a64ed86bcd (patch) | |
tree | 5ce15b085eaa990a8b81ee6b49871292aabcb048 | |
parent | 4fd2ffae92ec835ed1a8e8a43575bff268e2c788 (diff) |
Make localstorage example independent of the 'shared' directory
Removed dependency to the components in the 'shared' directory from the
project files. The CMakeLists.txt is generated from the qmake project
file using the pro2cmake.py utility.
Task-number: QTBUG-90884
Change-Id: I4f52a065d02bdfc747a2bca89ad0c1707a7ef9ec
Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
-rw-r--r-- | examples/quick/localstorage/localstorage/CMakeLists.txt | 71 | ||||
-rw-r--r-- | examples/quick/localstorage/localstorage/localstorage.pro | 3 |
2 files changed, 1 insertions, 73 deletions
diff --git a/examples/quick/localstorage/localstorage/CMakeLists.txt b/examples/quick/localstorage/localstorage/CMakeLists.txt index 2ed02985ca..bfb304b1cc 100644 --- a/examples/quick/localstorage/localstorage/CMakeLists.txt +++ b/examples/quick/localstorage/localstorage/CMakeLists.txt @@ -50,77 +50,6 @@ qt6_add_resources(localstorage "localstorage" FILES ${localstorage_resource_files} ) -set_source_files_properties("../../shared/Button.qml" - PROPERTIES QT_RESOURCE_ALIAS "Button.qml" -) -set_source_files_properties("../../shared/CheckBox.qml" - PROPERTIES QT_RESOURCE_ALIAS "CheckBox.qml" -) -set_source_files_properties("../../shared/FlickrRssModel.qml" - PROPERTIES QT_RESOURCE_ALIAS "FlickrRssModel.qml" -) -set_source_files_properties("../../shared/Label.qml" - PROPERTIES QT_RESOURCE_ALIAS "Label.qml" -) -set_source_files_properties("../../shared/LauncherList.qml" - PROPERTIES QT_RESOURCE_ALIAS "LauncherList.qml" -) -set_source_files_properties("../../shared/SimpleLauncherDelegate.qml" - PROPERTIES QT_RESOURCE_ALIAS "SimpleLauncherDelegate.qml" -) -set_source_files_properties("../../shared/Slider.qml" - PROPERTIES QT_RESOURCE_ALIAS "Slider.qml" -) -set_source_files_properties("../../shared/TabSet.qml" - PROPERTIES QT_RESOURCE_ALIAS "TabSet.qml" -) -set_source_files_properties("../../shared/TextField.qml" - PROPERTIES QT_RESOURCE_ALIAS "TextField.qml" -) -set_source_files_properties("../../shared/images/back.png" - PROPERTIES QT_RESOURCE_ALIAS "images/back.png" -) -set_source_files_properties("../../shared/images/checkmark.png" - PROPERTIES QT_RESOURCE_ALIAS "images/checkmark.png" -) -set_source_files_properties("../../shared/images/next.png" - PROPERTIES QT_RESOURCE_ALIAS "images/next.png" -) -set_source_files_properties("../../shared/images/qt-logo.png" - PROPERTIES QT_RESOURCE_ALIAS "images/qt-logo.png" -) -set_source_files_properties("../../shared/images/slider_handle.png" - PROPERTIES QT_RESOURCE_ALIAS "images/slider_handle.png" -) -set_source_files_properties("../../shared/images/tab.png" - PROPERTIES QT_RESOURCE_ALIAS "images/tab.png" -) -set(shared_resource_files - "Button.qml" - "CheckBox.qml" - "FlickrRssModel.qml" - "Label.qml" - "LauncherList.qml" - "SimpleLauncherDelegate.qml" - "Slider.qml" - "TabSet.qml" - "TextField.qml" - "images/back.png" - "images/checkmark.png" - "images/next.png" - "images/qt-logo.png" - "images/slider_handle.png" - "images/tab.png" -) - -qt6_add_resources(localstorage "shared" - PREFIX - "/shared" - BASE - "../../shared" - FILES - ${shared_resource_files} -) install(TARGETS localstorage RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/quick/localstorage/localstorage/localstorage.pro b/examples/quick/localstorage/localstorage/localstorage.pro index 80c306fcc2..8feca66f28 100644 --- a/examples/quick/localstorage/localstorage/localstorage.pro +++ b/examples/quick/localstorage/localstorage/localstorage.pro @@ -3,8 +3,7 @@ TEMPLATE = app QT += quick qml SOURCES += main.cpp RESOURCES += \ - localstorage.qrc \ - ../../shared/shared.qrc + localstorage.qrc target.path = $$[QT_INSTALL_EXAMPLES]/quick/localstorage/localstorage INSTALLS += target |