Updated declarative components to use the QML module

Change-Id: I4b49466ba5248683c2285f98ce17bc2c24bba515 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
2012-03-14 08:39:43 +10:00
parent 8d63785425
commit 8e82f57c6a
31 changed files with 78 additions and 68 deletions
--- a/tests/auto/integration/qdeclarativevideooutput/qdeclarativevideooutput.pro
+++ b/tests/auto/integration/qdeclarativevideooutput/qdeclarativevideooutput.pro
@@ -1,7 +1,7 @@
 CONFIG += testcase
 TARGET = tst_qdeclarativevideooutput

-QT += multimedia-private declarative testlib quick
+QT += multimedia-private qml testlib quick
 CONFIG += no_private_qt_headers_warning

 OTHER_FILES += \
--- a/tests/auto/integration/qdeclarativevideooutput/tst_qdeclarativevideooutput.cpp
+++ b/tests/auto/integration/qdeclarativevideooutput/tst_qdeclarativevideooutput.cpp
@@ -43,8 +43,8 @@

 #include <QtTest/QtTest>

-#include <QDeclarativeEngine>
-#include <QDeclarativeComponent>
+#include <QtQml/qqmlengine.h>
+#include <QtQml/qqmlcomponent.h>

 #include "qdeclarativevideooutput_p.h"

--- a/tests/auto/unit/multimedia.pro
+++ b/tests/auto/unit/multimedia.pro
@@ -33,3 +33,8 @@ SUBDIRS += \
    qdeclarativeaudio \
    qdeclarativeaudio_4 \
    qaudiodecoder
+
+disabled {
+    SUBDIRS += \
+        qdeclarativevideo
+}
--- a/tests/auto/unit/qdeclarativeaudio/qdeclarativeaudio.pro
+++ b/tests/auto/unit/qdeclarativeaudio/qdeclarativeaudio.pro
@@ -1,7 +1,7 @@
 CONFIG += testcase
 TARGET = tst_qdeclarativeaudio

-QT += multimedia-private declarative testlib
+QT += multimedia-private qml testlib
 CONFIG += no_private_qt_headers_warning

 HEADERS += \
--- a/tests/auto/unit/qdeclarativeaudio_4/qdeclarativeaudio_4.pro
+++ b/tests/auto/unit/qdeclarativeaudio_4/qdeclarativeaudio_4.pro
@@ -1,7 +1,7 @@
 CONFIG += testcase
 TARGET = tst_qdeclarativeaudio_4

-QT += multimedia-private declarative testlib
+QT += multimedia-private qml testlib
 CONFIG += no_private_qt_headers_warning

 HEADERS += \
--- a/tests/auto/unit/qdeclarativevideo/qdeclarativevideo.pro
+++ b/tests/auto/unit/qdeclarativevideo/qdeclarativevideo.pro
@@ -1,7 +1,7 @@
 CONFIG += testcase
 TARGET = tst_qdeclarativevideo

-QT += multimedia-private declarative testlib
+QT += multimedia-private qml testlib
 CONFIG += no_private_qt_headers_warning

 HEADERS += \