Fixed build break
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:
@@ -1,7 +1,7 @@
|
||||
|
||||
TEMPLATE=app
|
||||
|
||||
QT += declarative network multimediakit
|
||||
QT += declarative qtquick1 network multimediakit
|
||||
|
||||
!maemo5 {
|
||||
contains(QT_CONFIG, opengl) {
|
||||
|
||||
@@ -40,7 +40,7 @@
|
||||
|
||||
#include <QtGui/QApplication>
|
||||
#include <QtGui/QDesktopWidget>
|
||||
#include <QtDeclarative/QDeclarativeView>
|
||||
#include <QtQuick1/qdeclarativeview.h>
|
||||
#include <QtDeclarative/QDeclarativeEngine>
|
||||
|
||||
#if !defined(QT_NO_OPENGL)
|
||||
|
||||
@@ -3,7 +3,7 @@ TARGETPATH = Qt/multimediakit
|
||||
|
||||
include(../qimportbase.pri)
|
||||
|
||||
QT += declarative network multimediakit-private
|
||||
QT += declarative qtquick1 network multimediakit-private
|
||||
|
||||
DESTDIR = $$QT.multimediakit.imports/$$TARGETPATH
|
||||
target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
|
||||
|
||||
@@ -56,7 +56,7 @@
|
||||
#include "qdeclarativemediabase_p.h"
|
||||
|
||||
#include <QtCore/qbasictimer.h>
|
||||
#include <QtDeclarative/qdeclarativeitem.h>
|
||||
#include <QtQuick1/qdeclarativeitem.h>
|
||||
|
||||
|
||||
QT_BEGIN_HEADER
|
||||
|
||||
@@ -55,7 +55,7 @@
|
||||
|
||||
#include "qgraphicsvideoitem.h"
|
||||
#include <QtCore/qbasictimer.h>
|
||||
#include <QtDeclarative/qdeclarativeitem.h>
|
||||
#include <QtQuick1/qdeclarativeitem.h>
|
||||
#include <QtCore/QTime>
|
||||
|
||||
#include <qcamera.h>
|
||||
|
||||
@@ -58,7 +58,7 @@
|
||||
#include <qgraphicsvideoitem.h>
|
||||
|
||||
#include <QtCore/qbasictimer.h>
|
||||
#include <QtDeclarative/qdeclarativeitem.h>
|
||||
#include <QtQuick1/qdeclarativeitem.h>
|
||||
|
||||
|
||||
QT_BEGIN_HEADER
|
||||
|
||||
Reference in New Issue
Block a user