diff options
| author | Andrew den Exter <andrew.den-exter@nokia.com> | 2010-07-02 14:32:18 +1000 |
|---|---|---|
| committer | Andrew den Exter <andrew.den-exter@nokia.com> | 2010-07-02 14:32:18 +1000 |
| commit | 976f83c87c7fc79e022ceb523b84cf18e051055a (patch) | |
| tree | c4269060b8e8b754f205a5c7fbe0f0af3c439285 /doc/src | |
| parent | 9e00a13751d69bf999baa541450c6b06b470ebc2 (diff) | |
| parent | ad1ca46ab14d3c37cb38a76cd1b5b9a0c3331f5b (diff) | |
Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtmobility
Diffstat (limited to 'doc/src')
| -rw-r--r-- | doc/src/messaging.qdoc | 11 | ||||
| -rw-r--r-- | doc/src/qt-defines.qdocconf | 6 | ||||
| -rw-r--r-- | doc/src/qt-html-templates.qdocconf | 4 | ||||
| -rw-r--r-- | doc/src/snippets/snippets.pro | 4 |
4 files changed, 19 insertions, 6 deletions
diff --git a/doc/src/messaging.qdoc b/doc/src/messaging.qdoc index 5aac38e348..dcbd311378 100644 --- a/doc/src/messaging.qdoc +++ b/doc/src/messaging.qdoc @@ -28,6 +28,17 @@ /*! + \module QtMessaging + \title QtMessaging Module + \brief The QtMessaging module provides access to messaging services. + + The module enables access to messaging services to search and sort + messages, send messages, retrieve message data, and launch the preferred + messaging client on the system to either display an existing message, + compose a new message, or respond to an existing message. +*/ + +/*! \page messaging.html \ingroup mobility diff --git a/doc/src/qt-defines.qdocconf b/doc/src/qt-defines.qdocconf index 3e71d07766..4a05aaaa75 100644 --- a/doc/src/qt-defines.qdocconf +++ b/doc/src/qt-defines.qdocconf @@ -12,7 +12,7 @@ defines = Q_QDOC \ Q_NO_USING_KEYWORD \ __cplusplus -versionsym = QT_VERSION_STR +versionsym = Qt Mobility 1.1 codeindent = 1 @@ -41,8 +41,8 @@ extraimages.HTML = qt-logo \ stylesheet-coffee-plastique.png # This stuff is used by the new doc format. -scriptdirs = $QT_SOURCE_TREE/doc/src/template/scripts -styledirs = $QT_SOURCE_TREE/doc/src/template/style +scriptdirs = $MOBILITY_SRC_DIR/doc/src/template/scripts +styledirs = $MOBILITY_SRC_DIR/doc/src/template/style scripts.HTML = functions.js \ jquery.js diff --git a/doc/src/qt-html-templates.qdocconf b/doc/src/qt-html-templates.qdocconf index b72a1eb96e..01b0ea64e2 100644 --- a/doc/src/qt-html-templates.qdocconf +++ b/doc/src/qt-html-templates.qdocconf @@ -6,7 +6,7 @@ HTML.stylesheets = style/style_ie6.css \ HTML.postheader = " <div class=\"header\" id=\"qtdocheader\">\n" \ " <div id=\"nav-logo\">\n" \ " <a href=\"index.html\">Home</a></div>\n" \ - " <a href=\"index.html\" class=\"qtref\"><span>Qt Reference Documentation</span></a>\n" \ + " <a href=\"index.html\" class=\"qtref\"><span>Qt Mobility Reference Documentation</span></a>\n" \ " <div id=\"nav-topright\">\n" \ " <ul>\n" \ " <li class=\"nav-topright-home\"><a href=\"http://qt.nokia.com/\">Qt HOME</a></li>\n" \ @@ -20,7 +20,7 @@ HTML.postheader = " <div class=\"header\" id=\"qtdocheader\">\n" \ " </div>\n" \ " <div id=\"shortCut\">\n" \ " <ul>\n" \ - " <li class=\"shortCut-topleft-inactive\"><span><a href=\"index.html\">Qt 4.7</a></span></li>\n" \ + " <li class=\"shortCut-topleft-inactive\"><span><a href=\"index.html\">Mobility 1.1</a></span></li>\n" \ " <li class=\"shortCut-topleft-active\"><a href=\"http://qt.nokia.com/doc/\">ALL Qt VERSIONS" \ " </a></li>\n" \ " </ul>\n" \ diff --git a/doc/src/snippets/snippets.pro b/doc/src/snippets/snippets.pro index 1a49b97741..85c61a34cd 100644 --- a/doc/src/snippets/snippets.pro +++ b/doc/src/snippets/snippets.pro @@ -1,8 +1,10 @@ include(../../../staticconfig.pri) TEMPLATE = subdirs + contains(mobility_modules,contacts): SUBDIRS += qtcontactsdocsample -contains(mobility_modules,location): SUBDIRS += qtlandmarksdocsample contains(mobility_modules,versit): SUBDIRS += qtversitdocsample contains(mobility_modules,organizer): SUBDIRS += qtorganizerdocsample + +contains(mobility_modules,location): SUBDIRS += qtlandmarksdocsample contains(mobility_modules,sensors): SUBDIRS += sensors |