diff options
| author | Peter Yard <peter.yard@nokia.com> | 2010-04-27 00:39:42 (GMT) |
|---|---|---|
| committer | Peter Yard <peter.yard@nokia.com> | 2010-04-27 00:39:42 (GMT) |
| commit | 88b2bf18c558d0e2f8a9268802f277212f17e61e (patch) | |
| tree | d41ca52003037fba9b45605aa6d2ed86f73b940a /tests/auto/qmediaservice/tst_qmediaservice.cpp | |
| parent | 4f3a7b5992b5aed67cced46d5d8c8c2f052dfb66 (diff) | |
| parent | 09293f1d07b019dc7bfe95afb93364cc87774e82 (diff) | |
| download | Qt-88b2bf18c558d0e2f8a9268802f277212f17e61e.zip Qt-88b2bf18c558d0e2f8a9268802f277212f17e61e.tar.gz Qt-88b2bf18c558d0e2f8a9268802f277212f17e61e.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'tests/auto/qmediaservice/tst_qmediaservice.cpp')
| -rw-r--r-- | tests/auto/qmediaservice/tst_qmediaservice.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/qmediaservice/tst_qmediaservice.cpp b/tests/auto/qmediaservice/tst_qmediaservice.cpp index a0cb69d..a544e77 100644 --- a/tests/auto/qmediaservice/tst_qmediaservice.cpp +++ b/tests/auto/qmediaservice/tst_qmediaservice.cpp @@ -41,9 +41,9 @@ #include <QtTest/QtTest> -#include <QtMultimedia/qvideodevicecontrol.h> -#include <QtMultimedia/qmediacontrol.h> -#include <QtMultimedia/qmediaservice.h> +#include <QtMediaServices/qvideodevicecontrol.h> +#include <QtMediaServices/qmediacontrol.h> +#include <QtMediaServices/qmediaservice.h> #include <QtGui/qapplication.h> #include <QtGui/qstyle.h> |