diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2012-07-10 13:20:32 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-11 06:01:35 +0200 |
| commit | aa41db38b4d0858929617611cfa4a1daf9decb66 (patch) | |
| tree | 5f1dfaaf006be04e9d6e1022b706c02cbbdebc63 | |
| parent | 9a059980ae56e76f83dae56f640dd2828796d321 (diff) | |
| download | qtlocation-aa41db38b4d0858929617611cfa4a1daf9decb66.tar.gz | |
Only build mapviewer example when Qt Multimedia is available.
The VideoItem element, which demonstrates how to use a MapQuickItem,
uses elements from Qt Multimedia.
Adds qtmultimedia to sync.profile.
Task-number: QTBUG-26468
Change-Id: Ie0b0027d68588e04dbf0d0e0a6f4f86c6229e6e8
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Natalia Shubina <natalia.shubina@nokia.com>
| -rw-r--r-- | examples/declarative/declarative.pro | 5 | ||||
| -rw-r--r-- | sync.profile | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/examples/declarative/declarative.pro b/examples/declarative/declarative.pro index d57619ba..266f3295 100644 --- a/examples/declarative/declarative.pro +++ b/examples/declarative/declarative.pro @@ -1,4 +1,3 @@ TEMPLATE = subdirs -SUBDIRS += flickr \ - mapviewer \ - places +SUBDIRS += flickr places +!isEmpty(QT.multimedia.name):SUBDIRS += mapviewer diff --git a/sync.profile b/sync.profile index 71774b99..236e9a43 100644 --- a/sync.profile +++ b/sync.profile @@ -15,5 +15,6 @@ "qtxmlpatterns" => "refs/heads/master", "qtdeclarative" => "refs/heads/master", "qtjsbackend" => "refs/heads/master", - "qt3d" => "refs/heads/master" + "qt3d" => "refs/heads/master", + "qtmultimedia" => "refs/heads/master" ); |