diff options
| author | Michael Goddard <michael.goddard@nokia.com> | 2011-10-06 14:31:58 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-07 06:16:34 +0200 |
| commit | 03f22bcdaf1f80083618856d6e4140d3062f175b (patch) | |
| tree | fdfbf0895f4fbd91fb1f4a247cf09e28a1056096 /examples/declarative-camera | |
| parent | 55bc4f2b46b0099d187db16e049d760cd55626e6 (diff) | |
Rename QtMultimediaKit to QtMultimedia.
There are a few legacy bits left in place so it passes CI, and
then qt5.git etc can be updated.
Change-Id: I6b082e50e6958c72fdabc2974992e16d90dafa3a
Reviewed-on: http://codereview.qt-project.org/5368
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
Diffstat (limited to 'examples/declarative-camera')
| -rw-r--r-- | examples/declarative-camera/CameraPropertyButton.qml | 2 | ||||
| -rw-r--r-- | examples/declarative-camera/CaptureControls.qml | 2 | ||||
| -rw-r--r-- | examples/declarative-camera/FocusButton.qml | 2 | ||||
| -rw-r--r-- | examples/declarative-camera/PhotoPreview.qml | 2 | ||||
| -rw-r--r-- | examples/declarative-camera/ZoomControl.qml | 2 | ||||
| -rw-r--r-- | examples/declarative-camera/declarative-camera.pro | 6 | ||||
| -rw-r--r-- | examples/declarative-camera/declarative-camera.qml | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/examples/declarative-camera/CameraPropertyButton.qml b/examples/declarative-camera/CameraPropertyButton.qml index 91ddeffa0..152bb9375 100644 --- a/examples/declarative-camera/CameraPropertyButton.qml +++ b/examples/declarative-camera/CameraPropertyButton.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import Qt 4.7 -import QtMultimediaKit 1.1 +import QtMultimedia 4.0 Item { id: propertyButton diff --git a/examples/declarative-camera/CaptureControls.qml b/examples/declarative-camera/CaptureControls.qml index 3332fe1d2..6120dad01 100644 --- a/examples/declarative-camera/CaptureControls.qml +++ b/examples/declarative-camera/CaptureControls.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import Qt 4.7 -import QtMultimediaKit 1.1 +import QtMultimedia 4.0 FocusScope { property Camera camera diff --git a/examples/declarative-camera/FocusButton.qml b/examples/declarative-camera/FocusButton.qml index 3522b0e68..6a54c8d22 100644 --- a/examples/declarative-camera/FocusButton.qml +++ b/examples/declarative-camera/FocusButton.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import Qt 4.7 -import QtMultimediaKit 1.1 +import QtMultimedia 4.0 CameraButton { property Camera camera diff --git a/examples/declarative-camera/PhotoPreview.qml b/examples/declarative-camera/PhotoPreview.qml index 97deec8fb..6cd7f35b0 100644 --- a/examples/declarative-camera/PhotoPreview.qml +++ b/examples/declarative-camera/PhotoPreview.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import Qt 4.7 -import QtMultimediaKit 1.1 +import QtMultimedia 4.0 Item { property alias source : preview.source diff --git a/examples/declarative-camera/ZoomControl.qml b/examples/declarative-camera/ZoomControl.qml index 0d804d3d9..b141523c1 100644 --- a/examples/declarative-camera/ZoomControl.qml +++ b/examples/declarative-camera/ZoomControl.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import Qt 4.7 -import QtMultimediaKit 1.1 +import QtMultimedia 4.0 Item { id : zoomControl diff --git a/examples/declarative-camera/declarative-camera.pro b/examples/declarative-camera/declarative-camera.pro index ad544e9f4..f1599741d 100644 --- a/examples/declarative-camera/declarative-camera.pro +++ b/examples/declarative-camera/declarative-camera.pro @@ -1,7 +1,7 @@ TEMPLATE=app -QT += declarative qtquick1 network multimediakit +QT += declarative qtquick1 network multimedia contains(QT_CONFIG, opengl) { QT += opengl @@ -13,9 +13,9 @@ else:TARGET = QmlCamera RESOURCES += declarative-camera.qrc -target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/qml_camera +target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/qml_camera sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/qml_camera +sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/qml_camera INSTALLS += target sources diff --git a/examples/declarative-camera/declarative-camera.qml b/examples/declarative-camera/declarative-camera.qml index 000185459..fdc210de6 100644 --- a/examples/declarative-camera/declarative-camera.qml +++ b/examples/declarative-camera/declarative-camera.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import Qt 4.7 -import QtMultimediaKit 1.1 +import QtMultimedia 4.0 Rectangle { id : cameraUI |