diff options
| author | Justin McPherson <justin.mcpherson@nokia.com> | 2010-03-03 05:07:34 (GMT) |
|---|---|---|
| committer | Justin McPherson <justin.mcpherson@nokia.com> | 2010-03-03 07:10:34 (GMT) |
| commit | f68389023cb8f0365c51fdc1fca06910f36dda2d (patch) | |
| tree | 0a489af18045940213f17d6e49bdfa86a6e507ba /tests/auto/qdeclarativeaudio | |
| parent | 55cec1c8e73f90f968ce181c3310e5e16f2d5bd8 (diff) | |
| download | Qt-f68389023cb8f0365c51fdc1fca06910f36dda2d.zip Qt-f68389023cb8f0365c51fdc1fca06910f36dda2d.tar.gz Qt-f68389023cb8f0365c51fdc1fca06910f36dda2d.tar.bz2 | |
Remove dependency on declarative from multimedia.
Move all declarative related classes into the multimedia declarative module.
Reviewed-by: Andrew den Exter
Diffstat (limited to 'tests/auto/qdeclarativeaudio')
| -rw-r--r-- | tests/auto/qdeclarativeaudio/qdeclarativeaudio.pro | 12 | ||||
| -rw-r--r-- | tests/auto/qdeclarativeaudio/tst_qdeclarativeaudio.cpp | 2 |
2 files changed, 12 insertions, 2 deletions
diff --git a/tests/auto/qdeclarativeaudio/qdeclarativeaudio.pro b/tests/auto/qdeclarativeaudio/qdeclarativeaudio.pro index 13bf606..bfc2223 100644 --- a/tests/auto/qdeclarativeaudio/qdeclarativeaudio.pro +++ b/tests/auto/qdeclarativeaudio/qdeclarativeaudio.pro @@ -1,4 +1,14 @@ load(qttest_p4) -SOURCES += tst_qdeclarativeaudio.cpp + +HEADERS += \ + $$PWD/../../../src/plugins/qdeclarativemodules/multimedia/qdeclarativeaudio_p.h \ + $$PWD/../../../src/plugins/qdeclarativemodules/multimedia/qdeclarativemediabase_p.h \ + $$PWD/../../../src/plugins/qdeclarativemodules/multimedia/qmetadatacontrolmetaobject_p.h + +SOURCES += \ + tst_qdeclarativeaudio.cpp \ + $$PWD/../../../src/plugins/qdeclarativemodules/multimedia/qdeclarativeaudio.cpp \ + $$PWD/../../../src/plugins/qdeclarativemodules/multimedia/qdeclarativemediabase.cpp \ + $$PWD/../../../src/plugins/qdeclarativemodules/multimedia/qmetadatacontrolmetaobject.cpp QT += multimedia declarative diff --git a/tests/auto/qdeclarativeaudio/tst_qdeclarativeaudio.cpp b/tests/auto/qdeclarativeaudio/tst_qdeclarativeaudio.cpp index 11439ce..55c7135 100644 --- a/tests/auto/qdeclarativeaudio/tst_qdeclarativeaudio.cpp +++ b/tests/auto/qdeclarativeaudio/tst_qdeclarativeaudio.cpp @@ -41,7 +41,7 @@ #include <QtTest/QtTest> -#include <QtMultimedia/private/qdeclarativeaudio_p.h> +#include "../../../src/plugins/qdeclarativemodules/multimedia/qdeclarativeaudio_p.h" #include <QtGui/qapplication.h> #include <QtMultimedia/qmediaplayercontrol.h> |