diff options
| author | axis <qt-info@nokia.com> | 2010-03-16 08:47:16 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-03-16 08:47:16 (GMT) |
| commit | 815af5a5e42f0d9eb7ee85e7e1bf1faae8d3a47c (patch) | |
| tree | 5d5e3ebc84dd6866a060b0d5416b6db873905e4e /src/src.pro | |
| parent | 7ca339be57f1b8dbf9e289fae578c110813eb767 (diff) | |
| parent | fdcb62d5d6a3e295273042555d2551eb491a5b2d (diff) | |
| download | Qt-815af5a5e42f0d9eb7ee85e7e1bf1faae8d3a47c.zip Qt-815af5a5e42f0d9eb7ee85e7e1bf1faae8d3a47c.tar.gz Qt-815af5a5e42f0d9eb7ee85e7e1bf1faae8d3a47c.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7-s60
Conflicts:
demos/embedded/anomaly/anomaly.pro
demos/embedded/flightinfo/flightinfo.pro
demos/embedded/lightmaps/lightmaps.pro
demos/embedded/weatherinfo/weatherinfo.pro
examples/network/fortuneclient/fortuneclient.pro
examples/network/fortuneserver/fortuneserver.pro
examples/network/network-chat/network-chat.pro
mkspecs/common/symbian/symbian.conf
mkspecs/features/symbian/platform_paths.prf
qmake/generators/symbian/symmake.cpp
qmake/generators/symbian/symmake.h
src/s60installs/s60installs.pro
Diffstat (limited to 'src/src.pro')
| -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 56ede4f..0033942 100644 --- a/src/src.pro +++ b/src/src.pro @@ -109,7 +109,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 |