diff options
| author | Michal Klocek <michal.klocek@theqtcompany.com> | 2015-01-27 15:03:06 +0100 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-01-29 10:41:29 +0000 |
| commit | 84f04d6e9dd53405d69bf92bf28c4414eeccb652 (patch) | |
| tree | 596a75b67579d72b22b7c42ae087f04b5adf0636 /examples/location/mapviewer/mapviewer.pro | |
| parent | 0713b376bfd37ea2606e127eb0e67e5aee9ea8f3 (diff) | |
| download | qtlocation-84f04d6e9dd53405d69bf92bf28c4414eeccb652.tar.gz | |
Remove 3DItem and VideoItem items from mapviewer example.
Change-Id: I2b5fb05a6cab0b944bd3e3a3dff94a15a12d91be
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Diffstat (limited to 'examples/location/mapviewer/mapviewer.pro')
| -rw-r--r-- | examples/location/mapviewer/mapviewer.pro | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/examples/location/mapviewer/mapviewer.pro b/examples/location/mapviewer/mapviewer.pro index 8c667498..43d5bc9d 100644 --- a/examples/location/mapviewer/mapviewer.pro +++ b/examples/location/mapviewer/mapviewer.pro @@ -8,8 +8,8 @@ RESOURCES += \ mapviewerwrapper.qrc qmlcontent.files += \ - mapviewer.qml \ - demo.ogv + mapviewer.qml + OTHER_FILES += $$qmlcontent.files qmlcontentmap.files += \ @@ -20,8 +20,6 @@ qmlcontentmap.files += \ content/map/PolylineItem.qml \ content/map/PolygonItem.qml \ content/map/ImageItem.qml \ - content/map/VideoItem.qml \ - content/map/3dItem.qml \ content/map/MiniMap.qml OTHER_FILES += $$qmlcontentmap.files @@ -36,16 +34,3 @@ target.path = $$[QT_INSTALL_EXAMPLES]/location/mapviewer additional.files = ../common additional.path = $$[QT_INSTALL_EXAMPLES]/location/common INSTALLS += target additional - -# ensure copying of media file while shadow building -!equals($${_PRO_FILE_PWD_}, $${OUT_PWD}) { - MEDIAFILE = $${_PRO_FILE_PWD_}/demo.ogv - copy2build.input = MEDIAFILE - copy2build.output = $${OUT_PWD}/demo.ogv - !contains(TEMPLATE_PREFIX, vc):copy2build.variable_out = PRE_TARGETDEPS - copy2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} - copy2build.name = COPY ${QMAKE_FILE_IN} - copy2build.CONFIG += no_link - copy2build.CONFIG += no_clean - QMAKE_EXTRA_COMPILERS += copy2build -} |