diff options
author | Zhang Hao <zhanghao@uniontech.com> | 2022-01-07 11:21:19 +0800 |
---|---|---|
committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2022-07-22 11:12:38 +0200 |
commit | 7c00aa7aa1476fc45adc5abf54185545ecc4c14e (patch) | |
tree | 0d031abbf250f9059813ecf95b0cd5502d17a3fb /examples | |
parent | c335c5119003b26bcdd55fb1722fdb370cbfaf1b (diff) | |
download | qtlocation-7c00aa7aa1476fc45adc5abf54185545ecc4c14e.tar.gz |
Porting Examples: use CMake replace qmake
This commit re-enables follow examples:
* places
* places_list
* places_map
* minimal_map
* itemview_transitions
* planespotter
Since mapviewer and geojson_viewer example need refactoring for Qt6,so
this patch ignore them, but this patch will create them's CMakeList.txt
file.
Task-number: QTBUG-96795
Done-with: Lauri Laanmets <lauri.laanmets@eesti.ee>
Pick-to: 6.2
Change-Id: Ib1385b978b243165163729668ca5d5504e81d9f9
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'examples')
46 files changed, 653 insertions, 107 deletions
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index b8a29eeb..6dc8720a 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -1,10 +1,7 @@ # Generated from examples.pro. qt_examples_build_begin(EXTERNAL_BUILD) - -# TODO: Enable location examples later! -# if(TARGET Qt::Location AND TARGET Qt::Positioning) -# add_subdirectory(location) -# endif() - +if(TARGET Qt::Location AND TARGET Qt::Positioning) + add_subdirectory(location) + endif() qt_examples_build_end() diff --git a/examples/location/CMakeLists.txt b/examples/location/CMakeLists.txt new file mode 100644 index 00000000..b36f5bd9 --- /dev/null +++ b/examples/location/CMakeLists.txt @@ -0,0 +1,14 @@ +# Generated from location.pro. + +if(TARGET Qt::Quick) + add_subdirectory(places) + add_subdirectory(places_list) + add_subdirectory(places_map) +# add_subdirectory(mapviewer) + add_subdirectory(minimal_map) + add_subdirectory(itemview_transitions) + add_subdirectory(planespotter) +endif() +#if(TARGET Qt::Quick AND TARGET Qt::Widgets) +# add_subdirectory(geojson_viewer) +#endif() diff --git a/examples/location/geojson_viewer/CMakeLists.txt b/examples/location/geojson_viewer/CMakeLists.txt new file mode 100644 index 00000000..7de77f58 --- /dev/null +++ b/examples/location/geojson_viewer/CMakeLists.txt @@ -0,0 +1,60 @@ +# Generated from geojson_viewer.pro. + +cmake_minimum_required(VERSION 3.16) +project(qml_location_geojsonviewer LANGUAGES CXX) + +set(CMAKE_INCLUDE_CURRENT_DIR ON) + +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) +set(CMAKE_AUTOUIC ON) + +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/location/geojsonviewer") + +find_package(Qt6 COMPONENTS Core) +find_package(Qt6 COMPONENTS Gui) +find_package(Qt6 COMPONENTS Qml) +find_package(Qt6 COMPONENTS Network) +find_package(Qt6 COMPONENTS Quick) +find_package(Qt6 COMPONENTS Positioning) +find_package(Qt6 COMPONENTS Location) +find_package(Qt6 COMPONENTS Widgets) + +qt_add_executable(qml_location_geojsonviewer WIN32 MACOSX_BUNDLE + main.cpp +) + +target_link_libraries(qml_location_geojsonviewer PUBLIC + Qt::Core + Qt::Gui + Qt::LocationPrivate + Qt::Positioning + Qt::Qml + Qt::Quick + Qt::Widgets +) + + +# Resources: +set(qml_resource_files + "GeoJsonDelegate.qml" + "GeoJsonDelegateMapObject.qml" + "main.qml" +) + +qt6_add_resources(qml_location_geojsonviewer "qml" + PREFIX + "/" + FILES + ${qml_resource_files} +) + +install(TARGETS qml_location_geojsonviewer + RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" +) diff --git a/examples/location/itemview_transitions/CMakeLists.txt b/examples/location/itemview_transitions/CMakeLists.txt new file mode 100644 index 00000000..f12754cc --- /dev/null +++ b/examples/location/itemview_transitions/CMakeLists.txt @@ -0,0 +1,59 @@ +# Generated from itemview_transitions.pro. + +cmake_minimum_required(VERSION 3.16) +project(itemview_transitions LANGUAGES CXX) + +set(CMAKE_INCLUDE_CURRENT_DIR ON) + +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) +set(CMAKE_AUTOUIC ON) + +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/location/itemview_transitions") + +find_package(Qt6 COMPONENTS Core) +find_package(Qt6 COMPONENTS Gui) +find_package(Qt6 COMPONENTS Qml) +find_package(Qt6 COMPONENTS Quick) +find_package(Qt6 COMPONENTS Location) + +qt_add_executable(itemview_transitions WIN32 MACOSX_BUNDLE + main.cpp +) +target_link_libraries(itemview_transitions PUBLIC + Qt::Core + Qt::Gui + Qt::Location + Qt::Qml + Qt::Quick +) + + +file(GLOB resource_glob_0 RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "*.qml") +foreach(file IN LISTS resource_glob_0) + set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/${file}" PROPERTIES QT_RESOURCE_ALIAS "${file}") +endforeach() + +# Resources: +set(qmake_qmlfiles_resource_files + "${resource_glob_0}" +) + +qt6_add_resources(itemview_transitions "qmake_qmlfiles" + PREFIX + "/" + BASE + "$$PWD" + FILES + ${qmake_qmlfiles_resource_files} +) + +install(TARGETS itemview_transitions + RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" +) diff --git a/examples/location/itemview_transitions/OsloListModel.qml b/examples/location/itemview_transitions/OsloListModel.qml index 38e57991..8da288ab 100644 --- a/examples/location/itemview_transitions/OsloListModel.qml +++ b/examples/location/itemview_transitions/OsloListModel.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick ListModel { diff --git a/examples/location/itemview_transitions/main.qml b/examples/location/itemview_transitions/main.qml index d386a6db..a7035ae7 100644 --- a/examples/location/itemview_transitions/main.qml +++ b/examples/location/itemview_transitions/main.qml @@ -48,11 +48,11 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Window 2.0 -import QtLocation 5.12 -import QtPositioning 5.12 -import QtQuick.Shapes 1.1 +import QtQuick +import QtQuick.Window +import QtLocation +import QtPositioning +import QtQuick.Shapes Window { width: 512 diff --git a/examples/location/mapviewer/CMakeLists.txt b/examples/location/mapviewer/CMakeLists.txt new file mode 100644 index 00000000..dae0a81c --- /dev/null +++ b/examples/location/mapviewer/CMakeLists.txt @@ -0,0 +1,101 @@ +# Generated from mapviewer.pro. + +cmake_minimum_required(VERSION 3.16) +project(qml_location_mapviewer LANGUAGES CXX) + +set(CMAKE_INCLUDE_CURRENT_DIR ON) + +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) +set(CMAKE_AUTOUIC ON) + +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/location/mapviewer") + +find_package(Qt6 COMPONENTS Core) +find_package(Qt6 COMPONENTS Gui) +find_package(Qt6 COMPONENTS Qml) +find_package(Qt6 COMPONENTS Network) +find_package(Qt6 COMPONENTS Quick) +find_package(Qt6 COMPONENTS Positioning) +find_package(Qt6 COMPONENTS Location) + +qt_add_executable(qml_location_mapviewer WIN32 MACOSX_BUNDLE + main.cpp +) +target_link_libraries(qml_location_mapviewer PUBLIC + Qt::Core + Qt::Gui + Qt::Location + Qt::Network + Qt::Positioning + Qt::Qml + Qt::Quick +) + + +# Resources: +set(mapviewer_resource_files + "forms/Geocode.qml" + "forms/GeocodeForm.ui.qml" + "forms/Locale.qml" + "forms/LocaleForm.ui.qml" + "forms/Message.qml" + "forms/MessageForm.ui.qml" + "forms/ReverseGeocode.qml" + "forms/ReverseGeocodeForm.ui.qml" + "forms/RouteAddress.qml" + "forms/RouteAddressForm.ui.qml" + "forms/RouteCoordinate.qml" + "forms/RouteCoordinateForm.ui.qml" + "forms/RouteList.qml" + "forms/RouteListDelegate.qml" + "forms/RouteListHeader.qml" + "helper.js" + "map/CircleItem.qml" + "map/ImageItem.qml" + "map/MapComponent.qml" + "map/MapSliders.qml" + "map/Marker.qml" + "map/MiniMap.qml" + "map/PolygonItem.qml" + "map/PolylineItem.qml" + "map/RectangleItem.qml" + "mapviewer.qml" + "menus/ItemPopupMenu.qml" + "menus/MainMenu.qml" + "menus/MapPopupMenu.qml" + "menus/MarkerPopupMenu.qml" + "resources/icon.png" + "resources/marker.png" + "resources/scale.png" + "resources/scale_end.png" +) + +qt6_add_resources(qml_location_mapviewer "mapviewer" + PREFIX + "/" + FILES + ${mapviewer_resource_files} +) + +if(QT_FEATURE_geoservices_mapboxgl) + target_link_libraries(qml_location_mapviewer PUBLIC + Qt::Sql + ) +endif() + +if(QT_FEATURE_geoservices_osm) + target_link_libraries(qml_location_mapviewer PUBLIC + Qt::Concurrent + ) +endif() + +install(TARGETS qml_location_mapviewer + RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" +) diff --git a/examples/location/minimal_map/CMakeLists.txt b/examples/location/minimal_map/CMakeLists.txt new file mode 100644 index 00000000..4f5e70bc --- /dev/null +++ b/examples/location/minimal_map/CMakeLists.txt @@ -0,0 +1,50 @@ +# Generated from minimal_map.pro. + +cmake_minimum_required(VERSION 3.16) +project(minimal_map LANGUAGES CXX) + +set(CMAKE_INCLUDE_CURRENT_DIR ON) + +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) +set(CMAKE_AUTOUIC ON) + +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/location/minimal_map") + +find_package(Qt6 COMPONENTS Core) +find_package(Qt6 COMPONENTS Gui) +find_package(Qt6 COMPONENTS Location) +find_package(Qt6 COMPONENTS Qml) + +qt_add_executable(minimal_map WIN32 MACOSX_BUNDLE + main.cpp +) +target_link_libraries(minimal_map PUBLIC + Qt::Core + Qt::Gui + Qt::Location + Qt::Qml +) + + +# Resources: +set(qml_resource_files + "main.qml" +) + +qt6_add_resources(minimal_map "qml" + PREFIX + "/" + FILES + ${qml_resource_files} +) + +install(TARGETS minimal_map + RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" +) diff --git a/examples/location/places/CMakeLists.txt b/examples/location/places/CMakeLists.txt new file mode 100644 index 00000000..74e9196c --- /dev/null +++ b/examples/location/places/CMakeLists.txt @@ -0,0 +1,93 @@ +# Generated from places.pro. + +cmake_minimum_required(VERSION 3.16) +project(qml_location_places LANGUAGES CXX) + +set(CMAKE_INCLUDE_CURRENT_DIR ON) + +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) +set(CMAKE_AUTOUIC ON) + +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/location/places") + +find_package(Qt6 COMPONENTS Core) +find_package(Qt6 COMPONENTS Gui) +find_package(Qt6 COMPONENTS Qml) +find_package(Qt6 COMPONENTS Quick) +find_package(Qt6 COMPONENTS Network) +find_package(Qt6 COMPONENTS Positioning) +find_package(Qt6 COMPONENTS Location) + +qt_add_executable(qml_location_places WIN32 MACOSX_BUNDLE + main.cpp +) +target_link_libraries(qml_location_places PUBLIC + Qt::Core + Qt::Gui + Qt::Location + Qt::Network + Qt::Positioning + Qt::Qml + Qt::Quick +) + + +# Resources: +set(places_resource_files + "forms/Message.qml" + "forms/MessageForm.ui.qml" + "forms/PlaceDetails.qml" + "forms/PlaceDetailsForm.ui.qml" + "forms/SearchBoundingBox.qml" + "forms/SearchBoundingBoxForm.ui.qml" + "forms/SearchBoundingCircle.qml" + "forms/SearchBoundingCircleForm.ui.qml" + "forms/SearchCenter.qml" + "forms/SearchCenterForm.ui.qml" + "forms/SearchOptions.qml" + "forms/SearchOptionsForm.ui.qml" + "helper.js" + "items/MainMenu.qml" + "items/MapComponent.qml" + "items/SearchBar.qml" + "places.qml" + "resources/categories.png" + "resources/left.png" + "resources/marker.png" + "resources/right.png" + "resources/scale.png" + "resources/scale_end.png" + "resources/search.png" + "resources/star.png" + "views/CategoryDelegate.qml" + "views/CategoryView.qml" + "views/EditorialDelegate.qml" + "views/EditorialPage.qml" + "views/EditorialView.qml" + "views/ImageView.qml" + "views/RatingView.qml" + "views/ReviewDelegate.qml" + "views/ReviewPage.qml" + "views/ReviewView.qml" + "views/SearchResultDelegate.qml" + "views/SearchResultView.qml" + "views/SuggestionView.qml" +) + +qt6_add_resources(qml_location_places "places" + PREFIX + "/" + FILES + ${places_resource_files} +) + +install(TARGETS qml_location_places + RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" +) diff --git a/examples/location/places/forms/Message.qml b/examples/location/places/forms/Message.qml index 0a73344d..83ce4f4a 100644 --- a/examples/location/places/forms/Message.qml +++ b/examples/location/places/forms/Message.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.5 +import QtQuick MessageForm { property string title diff --git a/examples/location/places/forms/MessageForm.ui.qml b/examples/location/places/forms/MessageForm.ui.qml index cff76c07..96ae2a5a 100644 --- a/examples/location/places/forms/MessageForm.ui.qml +++ b/examples/location/places/forms/MessageForm.ui.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.4 -import QtQuick.Layouts 1.2 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts Item { id: root diff --git a/examples/location/places/forms/PlaceDetails.qml b/examples/location/places/forms/PlaceDetails.qml index dde49c84..2040ce5d 100644 --- a/examples/location/places/forms/PlaceDetails.qml +++ b/examples/location/places/forms/PlaceDetails.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.5 +import QtQuick import "../helper.js" as Helper PlaceDetailsForm { diff --git a/examples/location/places/forms/PlaceDetailsForm.ui.qml b/examples/location/places/forms/PlaceDetailsForm.ui.qml index ad87ea7b..f65f5e5c 100644 --- a/examples/location/places/forms/PlaceDetailsForm.ui.qml +++ b/examples/location/places/forms/PlaceDetailsForm.ui.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.4 -import QtQuick.Layouts 1.2 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts import "../views" Item { diff --git a/examples/location/places/forms/SearchBoundingBox.qml b/examples/location/places/forms/SearchBoundingBox.qml index 81f5fd27..fae83389 100644 --- a/examples/location/places/forms/SearchBoundingBox.qml +++ b/examples/location/places/forms/SearchBoundingBox.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.5 -import QtPositioning 5.5 +import QtQuick +import QtPositioning SearchBoundingBoxForm { property variant searchRegion diff --git a/examples/location/places/forms/SearchBoundingBoxForm.ui.qml b/examples/location/places/forms/SearchBoundingBoxForm.ui.qml index 75180f6d..cc511bc2 100644 --- a/examples/location/places/forms/SearchBoundingBoxForm.ui.qml +++ b/examples/location/places/forms/SearchBoundingBoxForm.ui.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.4 -import QtQuick.Layouts 1.2 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts Item { property alias clearButton: clearButton diff --git a/examples/location/places/forms/SearchBoundingCircle.qml b/examples/location/places/forms/SearchBoundingCircle.qml index e8337b47..0a01d570 100644 --- a/examples/location/places/forms/SearchBoundingCircle.qml +++ b/examples/location/places/forms/SearchBoundingCircle.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.5 -import QtPositioning 5.5 +import QtQuick +import QtPositioning SearchBoundingCircleForm { property variant searchRegion diff --git a/examples/location/places/forms/SearchBoundingCircleForm.ui.qml b/examples/location/places/forms/SearchBoundingCircleForm.ui.qml index b31d8992..5748af87 100644 --- a/examples/location/places/forms/SearchBoundingCircleForm.ui.qml +++ b/examples/location/places/forms/SearchBoundingCircleForm.ui.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.4 -import QtQuick.Layouts 1.2 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts Item { property alias clearButton: clearButton diff --git a/examples/location/places/forms/SearchCenter.qml b/examples/location/places/forms/SearchCenter.qml index d1d82a3d..d243517a 100644 --- a/examples/location/places/forms/SearchCenter.qml +++ b/examples/location/places/forms/SearchCenter.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.5 -import QtPositioning 5.5 +import QtQuick +import QtPositioning SearchCenterForm { property string title; diff --git a/examples/location/places/forms/SearchCenterForm.ui.qml b/examples/location/places/forms/SearchCenterForm.ui.qml index df29acc7..20a7ef87 100644 --- a/examples/location/places/forms/SearchCenterForm.ui.qml +++ b/examples/location/places/forms/SearchCenterForm.ui.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.4 -import QtQuick.Layouts 1.2 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts Item { property alias clearButton: clearButton diff --git a/examples/location/places/forms/SearchOptions.qml b/examples/location/places/forms/SearchOptions.qml index fe64f159..9b92f226 100644 --- a/examples/location/places/forms/SearchOptions.qml +++ b/examples/location/places/forms/SearchOptions.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.5 -import QtLocation 5.6 -import QtPositioning 5.5 +import QtQuick +import QtLocation +import QtPositioning SearchOptionsForm { id: root diff --git a/examples/location/places/forms/SearchOptionsForm.ui.qml b/examples/location/places/forms/SearchOptionsForm.ui.qml index a2df9f10..462abcac 100644 --- a/examples/location/places/forms/SearchOptionsForm.ui.qml +++ b/examples/location/places/forms/SearchOptionsForm.ui.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.4 -import QtQuick.Layouts 1.2 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts Item { property alias clearButton: clearButton diff --git a/examples/location/places/items/MainMenu.qml b/examples/location/places/items/MainMenu.qml index 3e6ff0e7..ced7e777 100644 --- a/examples/location/places/items/MainMenu.qml +++ b/examples/location/places/items/MainMenu.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.4 -import QtLocation 5.6 +import QtQuick +import QtQuick.Controls +import QtLocation MenuBar { property variant providerMenu: providerMenu diff --git a/examples/location/places/items/MapComponent.qml b/examples/location/places/items/MapComponent.qml index baa43a22..8faccbc1 100644 --- a/examples/location/places/items/MapComponent.qml +++ b/examples/location/places/items/MapComponent.qml @@ -48,10 +48,10 @@ ** ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.4 -import QtPositioning 5.5 -import QtLocation 5.6 +import QtQuick +import QtQuick.Controls +import QtPositioning +import QtLocation import "../helper.js" as Helper Map { diff --git a/examples/location/places/items/SearchBar.qml b/examples/location/places/items/SearchBar.qml index e5f1998a..ce681436 100644 --- a/examples/location/places/items/SearchBar.qml +++ b/examples/location/places/items/SearchBar.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.4 -import QtQuick.Layouts 1.2 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts ToolBar { diff --git a/examples/location/places/places.qml b/examples/location/places/places.qml index a511f0ea..cd756dc7 100644 --- a/examples/location/places/places.qml +++ b/examples/location/places/places.qml @@ -48,11 +48,11 @@ ** ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.4 -import QtQuick.Layouts 1.2 -import QtPositioning 5.5 -import QtLocation 5.6 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import QtPositioning +import QtLocation import "items" ApplicationWindow { diff --git a/examples/location/places/views/CategoryDelegate.qml b/examples/location/places/views/CategoryDelegate.qml index 4cd5b19a..238cbdb5 100644 --- a/examples/location/places/views/CategoryDelegate.qml +++ b/examples/location/places/views/CategoryDelegate.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.4 -import QtLocation 5.6 +import QtQuick +import QtQuick.Controls +import QtLocation Item { id: root diff --git a/examples/location/places/views/CategoryView.qml b/examples/location/places/views/CategoryView.qml index 218569aa..6d364f35 100644 --- a/examples/location/places/views/CategoryView.qml +++ b/examples/location/places/views/CategoryView.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.5 -import QtLocation 5.6 -import QtQml.Models 2.1 +import QtQuick +import QtLocation +import QtQml.Models //! [CategoryModel view] diff --git a/examples/location/places/views/EditorialDelegate.qml b/examples/location/places/views/EditorialDelegate.qml index ae8ab108..4c424f17 100644 --- a/examples/location/places/views/EditorialDelegate.qml +++ b/examples/location/places/views/EditorialDelegate.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.5 -import QtLocation 5.6 -import QtQuick.Controls 1.4 +import QtQuick +import QtLocation +import QtQuick.Controls Item { id: root diff --git a/examples/location/places/views/EditorialPage.qml b/examples/location/places/views/EditorialPage.qml index 76f956df..c1cf3f85 100644 --- a/examples/location/places/views/EditorialPage.qml +++ b/examples/location/places/views/EditorialPage.qml @@ -48,10 +48,10 @@ ** ****************************************************************************/ -import QtQuick 2.5 -import QtLocation 5.6 -import QtQuick.Controls 1.4 -import QtQuick.Layouts 1.2 +import QtQuick +import QtLocation +import QtQuick.Controls +import QtQuick.Layouts Item { id: root diff --git a/examples/location/places/views/EditorialView.qml b/examples/location/places/views/EditorialView.qml index 8b93f3ce..721e26f2 100644 --- a/examples/location/places/views/EditorialView.qml +++ b/examples/location/places/views/EditorialView.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.5 -import QtLocation 5.6 +import QtQuick +import QtLocation //! [PlaceEditorialModel view] ListView { diff --git a/examples/location/places/views/ImageView.qml b/examples/location/places/views/ImageView.qml index 6ece8935..ee752079 100644 --- a/examples/location/places/views/ImageView.qml +++ b/examples/location/places/views/ImageView.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.5 -import QtLocation 5.6 -import QtQuick.Controls 1.4 +import QtQuick +import QtLocation +import QtQuick.Controls Item { id: root diff --git a/examples/location/places/views/RatingView.qml b/examples/location/places/views/RatingView.qml index 1f713556..0fc22038 100644 --- a/examples/location/places/views/RatingView.qml +++ b/examples/location/places/views/RatingView.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.5 +import QtQuick Row { property real rating: 0 diff --git a/examples/location/places/views/ReviewDelegate.qml b/examples/location/places/views/ReviewDelegate.qml index 08cdef8b..b593893d 100644 --- a/examples/location/places/views/ReviewDelegate.qml +++ b/examples/location/places/views/ReviewDelegate.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.5 -import QtLocation 5.6 -import QtQuick.Controls 1.4 +import QtQuick +import QtLocation +import QtQuick.Controls Item { id: root diff --git a/examples/location/places/views/ReviewPage.qml b/examples/location/places/views/ReviewPage.qml index 19fbd77b..3698c719 100644 --- a/examples/location/places/views/ReviewPage.qml +++ b/examples/location/places/views/ReviewPage.qml @@ -48,10 +48,10 @@ ** ****************************************************************************/ -import QtQuick 2.5 -import QtLocation 5.6 -import QtQuick.Controls 1.4 -import QtQuick.Layouts 1.2 +import QtQuick +import QtLocation +import QtQuick.Controls +import QtQuick.Layouts Item { id: root diff --git a/examples/location/places/views/ReviewView.qml b/examples/location/places/views/ReviewView.qml index 669a06dc..953433b4 100644 --- a/examples/location/places/views/ReviewView.qml +++ b/examples/location/places/views/ReviewView.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.5 -import QtLocation 5.6 +import QtQuick +import QtLocation //! [ReviewModel delegate] ListView { diff --git a/examples/location/places/views/SearchResultDelegate.qml b/examples/location/places/views/SearchResultDelegate.qml index d6b37171..991d377e 100644 --- a/examples/location/places/views/SearchResultDelegate.qml +++ b/examples/location/places/views/SearchResultDelegate.qml @@ -48,10 +48,10 @@ ** ****************************************************************************/ -import QtQuick 2.5 -import QtLocation 5.6 -import QtQuick.Controls 1.4 -import QtQuick.Layouts 1.2 +import QtQuick +import QtLocation +import QtQuick.Controls +import QtQuick.Layouts import "../helper.js" as Helper Item { diff --git a/examples/location/places/views/SearchResultView.qml b/examples/location/places/views/SearchResultView.qml index 6e6c415c..52da14ce 100644 --- a/examples/location/places/views/SearchResultView.qml +++ b/examples/location/places/views/SearchResultView.qml @@ -48,10 +48,10 @@ ** ****************************************************************************/ -import QtQuick 2.5 -import QtLocation 5.6 -import QtQuick.Controls 1.4 -import QtQuick.Layouts 1.2 +import QtQuick +import QtLocation +import QtQuick.Controls +import QtQuick.Layouts //! [PlaceSearchModel place list] ListView { diff --git a/examples/location/places/views/SuggestionView.qml b/examples/location/places/views/SuggestionView.qml index 960b5a2e..b2e87723 100644 --- a/examples/location/places/views/SuggestionView.qml +++ b/examples/location/places/views/SuggestionView.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 1.4 +import QtQuick +import QtQuick.Controls //! [PlaceSearchSuggestionModel view 1] ListView { diff --git a/examples/location/places_list/CMakeLists.txt b/examples/location/places_list/CMakeLists.txt new file mode 100644 index 00000000..c4815a0a --- /dev/null +++ b/examples/location/places_list/CMakeLists.txt @@ -0,0 +1,58 @@ +# Generated from places_list.pro. + +cmake_minimum_required(VERSION 3.16) +project(places_list LANGUAGES CXX) + +set(CMAKE_INCLUDE_CURRENT_DIR ON) + +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) +set(CMAKE_AUTOUIC ON) + +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/location/places_list") + +find_package(Qt6 COMPONENTS Core) +find_package(Qt6 COMPONENTS Gui) +find_package(Qt6 COMPONENTS Quick) +find_package(Qt6 COMPONENTS Qml) +find_package(Qt6 COMPONENTS Network) +find_package(Qt6 COMPONENTS Positioning) +find_package(Qt6 COMPONENTS Location) + +qt_add_executable(places_list WIN32 MACOSX_BUNDLE + main.cpp +) +target_link_libraries(places_list PUBLIC + Qt::Core + Qt::Gui + Qt::Location + Qt::Network + Qt::Positioning + Qt::Qml + Qt::Quick +) + + +# Resources: +set(places_list_resource_files + "Marker.qml" + "marker.png" + "places_list.qml" +) + +qt6_add_resources(places_list "places_list" + PREFIX + "/" + FILES + ${places_list_resource_files} +) + +install(TARGETS places_list + RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" +) diff --git a/examples/location/places_list/Marker.qml b/examples/location/places_list/Marker.qml index c1f33dee..7b1a7c13 100644 --- a/examples/location/places_list/Marker.qml +++ b/examples/location/places_list/Marker.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick Rectangle { width: image.width diff --git a/examples/location/places_list/places_list.qml b/examples/location/places_list/places_list.qml index 931983e2..01c2e15e 100644 --- a/examples/location/places_list/places_list.qml +++ b/examples/location/places_list/places_list.qml @@ -49,9 +49,9 @@ ****************************************************************************/ //! [Imports] -import QtQuick 2.0 -import QtPositioning 5.5 -import QtLocation 5.6 +import QtQuick +import QtPositioning +import QtLocation //! [Imports] Rectangle { diff --git a/examples/location/places_map/CMakeLists.txt b/examples/location/places_map/CMakeLists.txt new file mode 100644 index 00000000..83bd76a8 --- /dev/null +++ b/examples/location/places_map/CMakeLists.txt @@ -0,0 +1,57 @@ +# Generated from places_map.pro. + +cmake_minimum_required(VERSION 3.16) +project(places_map LANGUAGES CXX) + +set(CMAKE_INCLUDE_CURRENT_DIR ON) + +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) +set(CMAKE_AUTOUIC ON) + +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/location/places_map") + +find_package(Qt6 COMPONENTS Core) +find_package(Qt6 COMPONENTS Gui) +find_package(Qt6 COMPONENTS Quick) +find_package(Qt6 COMPONENTS Qml) +find_package(Qt6 COMPONENTS Network) +find_package(Qt6 COMPONENTS Positioning) +find_package(Qt6 COMPONENTS Location) + +qt_add_executable(places_map WIN32 MACOSX_BUNDLE + main.cpp +) +target_link_libraries(places_map PUBLIC + Qt::Core + Qt::Gui + Qt::Location + Qt::Network + Qt::Positioning + Qt::Qml + Qt::Quick +) + + +# Resources: +set(places_map_resource_files + "marker.png" + "places_map.qml" +) + +qt6_add_resources(places_map "places_map" + PREFIX + "/" + FILES + ${places_map_resource_files} +) + +install(TARGETS places_map + RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" +) diff --git a/examples/location/places_map/places_map.qml b/examples/location/places_map/places_map.qml index 7f2afc2e..c2a7882a 100644 --- a/examples/location/places_map/places_map.qml +++ b/examples/location/places_map/places_map.qml @@ -49,9 +49,9 @@ ****************************************************************************/ //! [Imports] -import QtQuick 2.0 -import QtPositioning 5.5 -import QtLocation 5.6 +import QtQuick +import QtPositioning +import QtLocation //! [Imports] Rectangle { diff --git a/examples/location/planespotter/CMakeLists.txt b/examples/location/planespotter/CMakeLists.txt new file mode 100644 index 00000000..13c56f04 --- /dev/null +++ b/examples/location/planespotter/CMakeLists.txt @@ -0,0 +1,57 @@ +# Generated from planespotter.pro. + +cmake_minimum_required(VERSION 3.16) +project(planespotter LANGUAGES CXX) + +set(CMAKE_INCLUDE_CURRENT_DIR ON) + +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) +set(CMAKE_AUTOUIC ON) + +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/location/planespotter") + +find_package(Qt6 COMPONENTS Core) +find_package(Qt6 COMPONENTS Gui) +find_package(Qt6 COMPONENTS Qml) +find_package(Qt6 COMPONENTS Quick) +find_package(Qt6 COMPONENTS Positioning) +find_package(Qt6 COMPONENTS Location) + +qt_add_executable(planespotter WIN32 MACOSX_BUNDLE + main.cpp +) +target_link_libraries(planespotter PUBLIC + Qt::Core + Qt::Gui + Qt::Location + Qt::Positioning + Qt::PositioningPrivate + Qt::Qml + Qt::Quick +) + + +# Resources: +set(qml_resource_files + "Plane.qml" + "airplane.png" + "planespotter.qml" +) + +qt6_add_resources(planespotter "qml" + PREFIX + "/" + FILES + ${qml_resource_files} +) + +install(TARGETS planespotter + RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" +) diff --git a/examples/location/planespotter/Plane.qml b/examples/location/planespotter/Plane.qml index 167f08d4..b7784431 100644 --- a/examples/location/planespotter/Plane.qml +++ b/examples/location/planespotter/Plane.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.4 -import QtLocation 5.6 +import QtQuick +import QtLocation //! [PlaneMapQuick1] // Plane.qml diff --git a/examples/location/planespotter/planespotter.qml b/examples/location/planespotter/planespotter.qml index b218d149..e214008b 100644 --- a/examples/location/planespotter/planespotter.qml +++ b/examples/location/planespotter/planespotter.qml @@ -48,10 +48,10 @@ ** ****************************************************************************/ -import QtQuick 2.4 -import QtQuick.Window 2.2 -import QtPositioning 5.5 -import QtLocation 5.6 +import QtQuick +import QtQuick.Window +import QtPositioning +import QtLocation Window { width: 700 |