diff options
| author | Bea Lam <bea.lam@nokia.com> | 2010-03-01 05:05:24 (GMT) |
|---|---|---|
| committer | Bea Lam <bea.lam@nokia.com> | 2010-03-01 05:05:24 (GMT) |
| commit | e8b2404e04ff38511a96ae2dfb2aa097c6ec8166 (patch) | |
| tree | 91f59051e690551cb89df3d0304bb714c711b2f0 /tests/auto/qdeclarativeaudio/qdeclarativeaudio.pro | |
| parent | 8095b3074a47ff317cafdce5e8a8f955bf8c97fa (diff) | |
| parent | 20def6f5fe3e02bda1c5f5873ed1923d36511312 (diff) | |
| download | Qt-e8b2404e04ff38511a96ae2dfb2aa097c6ec8166.zip Qt-e8b2404e04ff38511a96ae2dfb2aa097c6ec8166.tar.gz Qt-e8b2404e04ff38511a96ae2dfb2aa097c6ec8166.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
Conflicts:
tests/auto/declarative/qdeclarativeproperty/tst_qdeclarativeproperty.cpp
Diffstat (limited to 'tests/auto/qdeclarativeaudio/qdeclarativeaudio.pro')
| -rw-r--r-- | tests/auto/qdeclarativeaudio/qdeclarativeaudio.pro | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/tests/auto/qdeclarativeaudio/qdeclarativeaudio.pro b/tests/auto/qdeclarativeaudio/qdeclarativeaudio.pro index f3262ee..13bf606 100644 --- a/tests/auto/qdeclarativeaudio/qdeclarativeaudio.pro +++ b/tests/auto/qdeclarativeaudio/qdeclarativeaudio.pro @@ -2,5 +2,3 @@ load(qttest_p4) SOURCES += tst_qdeclarativeaudio.cpp QT += multimedia declarative -requires(contains(QT_CONFIG, multimedia)) -requires(contains(QT_CONFIG, declarative)) |