slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename QtMultimediaKit to QtMultimedia.

Browse Source 
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>
This commit is contained in:
Michael Goddard
2011-10-06 14:31:58 +10:00
committed by Qt by Nokia
parent 55bc4f2b46
commit 03f22bcdaf
395 changed files with 1393 additions and 3088 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/declarative-camera/CameraPropertyButton.qml
View File

@@ -39,7 +39,7 @@
****************************************************************************/
import Qt 4.7
import QtMultimediaKit 1.1
import QtMultimedia 4.0
Item {
id: propertyButton

2
examples/declarative-camera/CaptureControls.qml
View File

@@ -39,7 +39,7 @@
****************************************************************************/
import Qt 4.7
import QtMultimediaKit 1.1
import QtMultimedia 4.0
FocusScope {
property Camera camera

2
examples/declarative-camera/FocusButton.qml
View File

@@ -39,7 +39,7 @@
****************************************************************************/
import Qt 4.7
import QtMultimediaKit 1.1
import QtMultimedia 4.0
CameraButton {
property Camera camera

2
examples/declarative-camera/PhotoPreview.qml
View File

@@ -39,7 +39,7 @@
****************************************************************************/
import Qt 4.7
import QtMultimediaKit 1.1
import QtMultimedia 4.0
Item {
property alias source : preview.source

2
examples/declarative-camera/ZoomControl.qml
View File

@@ -39,7 +39,7 @@
****************************************************************************/
import Qt 4.7
import QtMultimediaKit 1.1
import QtMultimedia 4.0
Item {
id : zoomControl

6
examples/declarative-camera/declarative-camera.pro
View File

@@ -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

2
examples/declarative-camera/declarative-camera.qml
View File

@@ -39,7 +39,7 @@
****************************************************************************/
import Qt 4.7
import QtMultimediaKit 1.1
import QtMultimedia 4.0
Rectangle {
id : cameraUI