diff options
| author | Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> | 2010-03-16 00:56:27 (GMT) |
|---|---|---|
| committer | Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> | 2010-03-16 00:56:27 (GMT) |
| commit | 1ef014ebae2c28c38c25facd90ba8be71b195195 (patch) | |
| tree | 620f31d1907a77d1287253424b9071d7a6d1608e | |
| parent | 4d4ed81c6df7954d89dad554267cba8d3cfd6bde (diff) | |
| parent | 9a6c65fc2568c52c3950fdcd326141a62c0cee3e (diff) | |
| download | Qt-1ef014ebae2c28c38c25facd90ba8be71b195195.zip Qt-1ef014ebae2c28c38c25facd90ba8be71b195195.tar.gz Qt-1ef014ebae2c28c38c25facd90ba8be71b195195.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7
| -rw-r--r-- | src/src.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/src.pro b/src/src.pro index 809a078..0fbce6b 100644 --- a/src/src.pro +++ b/src/src.pro @@ -102,7 +102,7 @@ src_declarative.target = sub-declarative src_tools_idc.depends = src_corelib # target defined in tools.pro src_tools_uic3.depends = src_qt3support src_xml # target defined in tools.pro src_phonon.depends = src_gui - src_multimedia.depends = src_gui + src_multimedia.depends = src_gui src_opengl src_tools_activeqt.depends = src_tools_idc src_gui src_declarative.depends = src_xml src_gui src_script src_network src_svg src_plugins.depends = src_gui src_sql src_svg src_multimedia |