diff options
| author | J-P Nurmi <j-p.nurmi@nokia.com> | 2011-07-13 10:45:03 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-07-14 04:21:10 +0200 |
| commit | 1d82a1e1b47cb599480346d9ad77e35461c72d9a (patch) | |
| tree | fdcdba8a4cca895d9e1464fbfe9d7c88445b2739 | |
| parent | 98729e41f83a0d99b94236435a5f5d19b3aedc4e (diff) | |
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>
| -rw-r--r-- | examples/declarative-camera/declarative-camera.pro | 2 | ||||
| -rw-r--r-- | examples/declarative-camera/qmlcamera.cpp | 2 | ||||
| -rw-r--r-- | src/imports/multimedia/multimedia.pro | 2 | ||||
| -rw-r--r-- | src/imports/multimedia/qdeclarativeaudio_p.h | 2 | ||||
| -rw-r--r-- | src/imports/multimedia/qdeclarativecamera_p.h | 2 | ||||
| -rw-r--r-- | src/imports/multimedia/qdeclarativevideo_p.h | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/examples/declarative-camera/declarative-camera.pro b/examples/declarative-camera/declarative-camera.pro index d0db15776..22112bf30 100644 --- a/examples/declarative-camera/declarative-camera.pro +++ b/examples/declarative-camera/declarative-camera.pro @@ -1,7 +1,7 @@ TEMPLATE=app -QT += declarative network multimediakit +QT += declarative qtquick1 network multimediakit !maemo5 { contains(QT_CONFIG, opengl) { diff --git a/examples/declarative-camera/qmlcamera.cpp b/examples/declarative-camera/qmlcamera.cpp index f6d3e9c36..8494e3feb 100644 --- a/examples/declarative-camera/qmlcamera.cpp +++ b/examples/declarative-camera/qmlcamera.cpp @@ -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) diff --git a/src/imports/multimedia/multimedia.pro b/src/imports/multimedia/multimedia.pro index c3874d3ba..bef8cb06a 100644 --- a/src/imports/multimedia/multimedia.pro +++ b/src/imports/multimedia/multimedia.pro @@ -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 diff --git a/src/imports/multimedia/qdeclarativeaudio_p.h b/src/imports/multimedia/qdeclarativeaudio_p.h index bc7139a82..f1802c618 100644 --- a/src/imports/multimedia/qdeclarativeaudio_p.h +++ b/src/imports/multimedia/qdeclarativeaudio_p.h @@ -56,7 +56,7 @@ #include "qdeclarativemediabase_p.h" #include <QtCore/qbasictimer.h> -#include <QtDeclarative/qdeclarativeitem.h> +#include <QtQuick1/qdeclarativeitem.h> QT_BEGIN_HEADER diff --git a/src/imports/multimedia/qdeclarativecamera_p.h b/src/imports/multimedia/qdeclarativecamera_p.h index cf2fe79a7..07ebb1a32 100644 --- a/src/imports/multimedia/qdeclarativecamera_p.h +++ b/src/imports/multimedia/qdeclarativecamera_p.h @@ -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> diff --git a/src/imports/multimedia/qdeclarativevideo_p.h b/src/imports/multimedia/qdeclarativevideo_p.h index a11e9cd2d..af7747d9b 100644 --- a/src/imports/multimedia/qdeclarativevideo_p.h +++ b/src/imports/multimedia/qdeclarativevideo_p.h @@ -58,7 +58,7 @@ #include <qgraphicsvideoitem.h> #include <QtCore/qbasictimer.h> -#include <QtDeclarative/qdeclarativeitem.h> +#include <QtQuick1/qdeclarativeitem.h> QT_BEGIN_HEADER |