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

Fixed build break

Browse Source 
QDeclarativeItem and QDeclarativeView was moved from QtDeclarative
to QtQuick1, also added qtquick1 module to the .pro file for
the declarative camera example.

Change-Id: Iae0828871d94d5f424b5329664303e2c0b9539bf
Reviewed-on: http://codereview.qt.nokia.com/1559
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
This commit is contained in:
J-P Nurmi
2011-07-13 10:45:03 +02:00
committed by Qt by Nokia
parent 98729e41f8
commit 1d82a1e1b4
6 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,7 @@
TEMPLATE=app TEMPLATE=app
QT += declarative network multimediakit QT += declarative qtquick1 network multimediakit
!maemo5 { !maemo5 {
contains(QT_CONFIG, opengl) { contains(QT_CONFIG, opengl) {

2
examples/declarative-camera/qmlcamera.cpp
View File

@@ -40,7 +40,7 @@
#include <QtGui/QApplication> #include <QtGui/QApplication>
#include <QtGui/QDesktopWidget> #include <QtGui/QDesktopWidget>
#include <QtDeclarative/QDeclarativeView> #include <QtQuick1/qdeclarativeview.h>
#include <QtDeclarative/QDeclarativeEngine> #include <QtDeclarative/QDeclarativeEngine>
#if !defined(QT_NO_OPENGL) #if !defined(QT_NO_OPENGL)

2
src/imports/multimedia/multimedia.pro
View File

@@ -3,7 +3,7 @@ TARGETPATH = Qt/multimediakit
include(../qimportbase.pri) include(../qimportbase.pri)
QT += declarative network multimediakit-private QT += declarative qtquick1 network multimediakit-private
DESTDIR = $$QT.multimediakit.imports/$$TARGETPATH DESTDIR = $$QT.multimediakit.imports/$$TARGETPATH
target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH

2
src/imports/multimedia/qdeclarativeaudio_p.h
View File

@@ -56,7 +56,7 @@
#include "qdeclarativemediabase_p.h" #include "qdeclarativemediabase_p.h"
#include <QtCore/qbasictimer.h> #include <QtCore/qbasictimer.h>
#include <QtDeclarative/qdeclarativeitem.h> #include <QtQuick1/qdeclarativeitem.h>
QT_BEGIN_HEADER QT_BEGIN_HEADER

2
src/imports/multimedia/qdeclarativecamera_p.h
View File

@@ -55,7 +55,7 @@
#include "qgraphicsvideoitem.h" #include "qgraphicsvideoitem.h"
#include <QtCore/qbasictimer.h> #include <QtCore/qbasictimer.h>
#include <QtDeclarative/qdeclarativeitem.h> #include <QtQuick1/qdeclarativeitem.h>
#include <QtCore/QTime> #include <QtCore/QTime>
#include <qcamera.h> #include <qcamera.h>

2
src/imports/multimedia/qdeclarativevideo_p.h
View File

@@ -58,7 +58,7 @@
#include <qgraphicsvideoitem.h> #include <qgraphicsvideoitem.h>
#include <QtCore/qbasictimer.h> #include <QtCore/qbasictimer.h>
#include <QtDeclarative/qdeclarativeitem.h> #include <QtQuick1/qdeclarativeitem.h>
QT_BEGIN_HEADER QT_BEGIN_HEADER