diff options
| author | David Laing <david.laing@nokia.com> | 2010-07-05 13:20:17 +1000 |
|---|---|---|
| committer | David Laing <david.laing@nokia.com> | 2010-07-05 13:20:17 +1000 |
| commit | 0d38ab954335556df39456af585a566ed8e022c8 (patch) | |
| tree | 9e82694b5553218d86d88e2f9d4b3604b20f7daa /src/messaging/qmessageid.cpp | |
| parent | 719c7ad0e9a9a64f48f137098356c8712580754f (diff) | |
Revert "Revert "Merge branch 'master' of ../../mainline/qtmobility""
This reverts commit e38ebf00c0b539a7756b21946693e201269b976a.
Conflicts:
examples/telephony/dialer/dialer.pro
src/s60installs/bwins/QtMultimediaKitu.def
src/s60installs/bwins/QtServiceFrameworku.def
src/s60installs/bwins/QtSystemInfou.def
src/s60installs/eabi/QtSystemInfou.def
Diffstat (limited to 'src/messaging/qmessageid.cpp')
| -rw-r--r-- | src/messaging/qmessageid.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/messaging/qmessageid.cpp b/src/messaging/qmessageid.cpp index 748c1ef181..e23e03598a 100644 --- a/src/messaging/qmessageid.cpp +++ b/src/messaging/qmessageid.cpp @@ -45,6 +45,9 @@ QTM_BEGIN_NAMESPACE /*! \class QMessageId + + \inmodule QtMessaging + \ingroup messaging \brief The QMessageId class provides a unique identifier for a QMessage message within the |