From 1d82a1e1b47cb599480346d9ad77e35461c72d9a Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Wed, 13 Jul 2011 10:45:03 +0200 Subject: 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 Reviewed-by: Michael Goddard --- examples/declarative-camera/declarative-camera.pro | 2 +- examples/declarative-camera/qmlcamera.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'examples/declarative-camera') 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 #include -#include +#include #include #if !defined(QT_NO_OPENGL) -- cgit v1.2.3