diff options
author | Kurt Korbatits <kurt.korbatits@nokia.com> | 2010-02-07 23:53:17 (GMT) |
---|---|---|
committer | Kurt Korbatits <kurt.korbatits@nokia.com> | 2010-02-07 23:53:17 (GMT) |
commit | ac33de5bf257eb215a09c232d950be265d57d22f (patch) | |
tree | 3947891872c1a41deaa32e8995e2e233548b3352 /src/3rdparty/phonon/mmf/utils.h | |
parent | 3108f02f35685bd57486e198277c600e09d98b13 (diff) | |
parent | 8ca95cbc98a97a8208120e4aa76bfd5c16b01df9 (diff) | |
download | Qt-ac33de5bf257eb215a09c232d950be265d57d22f.zip Qt-ac33de5bf257eb215a09c232d950be265d57d22f.tar.gz Qt-ac33de5bf257eb215a09c232d950be265d57d22f.tar.bz2 |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6
Diffstat (limited to 'src/3rdparty/phonon/mmf/utils.h')
-rw-r--r-- | src/3rdparty/phonon/mmf/utils.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/phonon/mmf/utils.h b/src/3rdparty/phonon/mmf/utils.h index 56ccafc..acad55a 100644 --- a/src/3rdparty/phonon/mmf/utils.h +++ b/src/3rdparty/phonon/mmf/utils.h @@ -44,7 +44,7 @@ enum PanicCode { class Utils { - Q_DECLARE_TR_FUNCTIONS(Utils) + Q_DECLARE_TR_FUNCTIONS(Phonon::MMF) public: /** |