diff options
author | Michal Klocek <michal.klocek@theqtcompany.com> | 2015-02-20 16:16:31 +0100 |
---|---|---|
committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-04-14 06:47:18 +0000 |
commit | 243be754315c052a5626a640be9eca4f7055704e (patch) | |
tree | 1eba9d5fea7d6033be5d9d45d9f610e3ebf16c84 /examples/location/mapviewer/mapviewer.pro | |
parent | ee1deee9a2293a82829efc724ad448aa9a210ae1 (diff) | |
download | qtlocation-243be754315c052a5626a640be9eca4f7055704e.tar.gz |
Clean up files in mapviewer example.
Rename files, move the subdirectories, remove
obsolete dependencies to location examples plugin.
Conflicts:
examples/location/mapviewer/mapviewer.pro
Change-Id: Id85dfffc32761eb9d2999b8e07b87f9912700659
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Diffstat (limited to 'examples/location/mapviewer/mapviewer.pro')
-rw-r--r-- | examples/location/mapviewer/mapviewer.pro | 59 |
1 files changed, 32 insertions, 27 deletions
diff --git a/examples/location/mapviewer/mapviewer.pro b/examples/location/mapviewer/mapviewer.pro index 4ab8c30d..51a271dc 100644 --- a/examples/location/mapviewer/mapviewer.pro +++ b/examples/location/mapviewer/mapviewer.pro @@ -2,34 +2,39 @@ TARGET = qml_location_mapviewer TEMPLATE = app QT += qml network quick positioning location -SOURCES += qmlmapviewerwrapper.cpp +SOURCES += main.cpp RESOURCES += \ - mapviewerwrapper.qrc - -qmlcontent.files += \ - mapviewer.qml - -OTHER_FILES += $$qmlcontent.files - -qmlcontentmap.files += \ - content/map/MapComponent.qml \ - content/map/Marker.qml \ - content/map/CircleItem.qml \ - content/map/RectangleItem.qml \ - content/map/PolylineItem.qml \ - content/map/PolygonItem.qml \ - content/map/ImageItem.qml \ - content/map/MiniMap.qml -OTHER_FILES += $$qmlcontentmap.files - -qmlcontentdialogs.files += \ - content/dialogs/RouteDialog.qml -OTHER_FILES += $$qmlcontentdialogs.files - -include(../common/common.pri) + mapviewer.qrc + +OTHER_FILES +=mapviewer.qml \ + map/MapComponent.qml \ + map/Marker.qml \ + map/CircleItem.qml \ + map/RectangleItem.qml \ + map/PolylineItem.qml \ + map/PolygonItem.qml \ + map/ImageItem.qml \ + map/MiniMap.qml \ + menus/ItemPopupMenu.qml \ + menus/MainMenu.qml \ + menus/MapPopupMenu.qml \ + menus/MarkerPopupMenu \ + forms/Geocode.qml \ + forms/GeocodeForm.ui.qml\ + forms/Message.qml \ + forms/MessageForm.ui.qml \ + forms/ReverseGeocode.qml \ + forms/ReverseGeocodeForm.ui.qml \ + forms/RouteCoordinate.qml \ + forms/Locale.qml \ + forms/LocaleForm.ui.qml \ + forms/RouteAddress.qml \ + forms/RouteAddressForm.ui.qml \ + forms/RouteCoordinateForm.ui.qml \ + forms/RouteList.qml \ + forms/RouteListDelegate.qml \ + forms/RouteListHeader.qml target.path = $$[QT_INSTALL_EXAMPLES]/location/mapviewer -additional.files = ../common -additional.path = $$[QT_INSTALL_EXAMPLES]/location/common -INSTALLS += target additional +INSTALLS += target |