diff options
| author | Don Sanders <don.sanders@nokia.com> | 2009-12-09 16:34:56 +1000 |
|---|---|---|
| committer | Don Sanders <don.sanders@nokia.com> | 2009-12-09 16:34:56 +1000 |
| commit | 5dd76da9bfcc89d3a7ea1b8b00e208b57afa0ca0 (patch) | |
| tree | b80ee0e67af742ea004693832639b9de415a1585 | |
| parent | 1a13156e3ef221b196c351720df09ae6b36ef9da (diff) | |
Pulled from qtmobility.
739 files changed, 5891 insertions, 9452 deletions
diff --git a/common.pri b/common.pri index da1d1e9896..f215543720 100644 --- a/common.pri +++ b/common.pri @@ -5,9 +5,6 @@ ###################################################################### -# For symbian, we are not attempting to freeze APIs yet. -symbian:MMP_RULES += "EXPORTUNFROZEN" - CONFIG(debug, debug|release) { WAS_IN_DEBUG=debug } else { @@ -45,8 +42,6 @@ defineReplace(mobilityDeployFilename) { # Make sure this goes everywhere we need it symbian: load(data_caging_paths) -# For symbian, we are not attempting to freeze APIs yet. -symbian:MMP_RULES += "EXPORTUNFROZEN" # Figure out the root of where stuff should go (this could be done via configure) OUTPUT_DIR = $$QT_MOBILITY_BUILD_TREE @@ -135,6 +130,9 @@ mac:contains(QT_CONFIG,qt_framework) { } LIBS += -L$$OUTPUT_DIR/lib +# For symbian, we are not freezing yet +symbian:MMP_RULES += "EXPORTUNFROZEN" + DEPENDPATH += . $$SOURCE_DIR INCLUDEPATH += $$SOURCE_DIR/src/global diff --git a/config.tests/make/make.pro b/config.tests/make/make.pro index c534a6b916..77896d6f05 100644 --- a/config.tests/make/make.pro +++ b/config.tests/make/make.pro @@ -1,7 +1,7 @@ contains(MAKEFILE_GENERATOR, SYMBIAN_ABLD) { message(symbian-abld) -} else:|contains(MAKEFILE_GENERATOR, SYMBIAN_SBSV2) { +} else:contains(MAKEFILE_GENERATOR, SYMBIAN_SBSV2) { message(symbian-sbsv2) } else:contains(MAKEFILE_GENERATOR, MSVC)|contains(MAKEFILE_GENERATOR, MSVC.NET) { message(win32-nmake) diff --git a/dist/changes-1.0.0-tp2 b/dist/changes-1.0.0-tp2 new file mode 100644 index 0000000000..112038e7c8 --- /dev/null +++ b/dist/changes-1.0.0-tp2 @@ -0,0 +1,12 @@ +- Symbian packaging fixes + * DEF files added + * sis package fixes + * vendor information added +- Documentation fixes + * improved example documentation + * quickstart and installation docs updated +- Example changes + * various UI changes to adjust for smaller displays + * general bug fixes +- Compile fixes + * for unit test diff --git a/doc/html/3rdparty.html b/doc/html/3rdparty.html index af931171ec..fe4a3443fd 100644 --- a/doc/html/3rdparty.html +++ b/doc/html/3rdparty.html @@ -108,6 +108,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/annotated.html b/doc/html/annotated.html index 598bcbb695..f9503be9e8 100644 --- a/doc/html/annotated.html +++ b/doc/html/annotated.html @@ -175,6 +175,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/audiorecorder-audiorecorder-cpp.html b/doc/html/audiorecorder-audiorecorder-cpp.html index ad7853adea..d741e7bf72 100644 --- a/doc/html/audiorecorder-audiorecorder-cpp.html +++ b/doc/html/audiorecorder-audiorecorder-cpp.html @@ -222,6 +222,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/audiorecorder-audiorecorder-h.html b/doc/html/audiorecorder-audiorecorder-h.html index 1aa8ca4dfd..8cb82d4e59 100644 --- a/doc/html/audiorecorder-audiorecorder-h.html +++ b/doc/html/audiorecorder-audiorecorder-h.html @@ -107,6 +107,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/audiorecorder-audiorecorder-pro.html b/doc/html/audiorecorder-audiorecorder-pro.html index 83cad5459e..f07407da1c 100644 --- a/doc/html/audiorecorder-audiorecorder-pro.html +++ b/doc/html/audiorecorder-audiorecorder-pro.html @@ -21,7 +21,8 @@ INCLUDEPATH += ../../src/multimedia include(../examples.pri) - qtAddLibrary(QtMedia) + CONFIG += mobility + MOBILITY = multimedia QMAKE_RPATHDIR += $$DESTDIR @@ -35,6 +36,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/audiorecorder-main-cpp.html b/doc/html/audiorecorder-main-cpp.html index 268cf01b2c..3983c42205 100644 --- a/doc/html/audiorecorder-main-cpp.html +++ b/doc/html/audiorecorder-main-cpp.html @@ -71,6 +71,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/audiorecorder.html b/doc/html/audiorecorder.html index 9ffd10a522..6773d501f8 100644 --- a/doc/html/audiorecorder.html +++ b/doc/html/audiorecorder.html @@ -58,6 +58,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/battery-charge-battery-charge-pro.html b/doc/html/battery-charge-battery-charge-pro.html index 8ece390922..88264b3b63 100644 --- a/doc/html/battery-charge-battery-charge-pro.html +++ b/doc/html/battery-charge-battery-charge-pro.html @@ -19,6 +19,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/battery-charge-battery-publisher-battery-publisher-pro.html b/doc/html/battery-charge-battery-publisher-battery-publisher-pro.html index f583874d31..72bf8eab77 100644 --- a/doc/html/battery-charge-battery-publisher-battery-publisher-pro.html +++ b/doc/html/battery-charge-battery-publisher-battery-publisher-pro.html @@ -26,11 +26,12 @@ FORMS = batterypublisher.ui include(../../examples.pri) - qtAddLibrary(QtPublishSubscribe)</pre> + CONFIG += mobility + MOBILITY = publishsubscribe</pre> <p /><address><hr /><div align="center"> <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/battery-charge-battery-publisher-batterypublisher-cpp.html b/doc/html/battery-charge-battery-publisher-batterypublisher-cpp.html index e638181e99..78ffe978de 100644 --- a/doc/html/battery-charge-battery-publisher-batterypublisher-cpp.html +++ b/doc/html/battery-charge-battery-publisher-batterypublisher-cpp.html @@ -122,6 +122,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/battery-charge-battery-publisher-batterypublisher-h.html b/doc/html/battery-charge-battery-publisher-batterypublisher-h.html index 38d86759c1..cd7e0797b4 100644 --- a/doc/html/battery-charge-battery-publisher-batterypublisher-h.html +++ b/doc/html/battery-charge-battery-publisher-batterypublisher-h.html @@ -97,6 +97,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/battery-charge-battery-publisher-main-cpp.html b/doc/html/battery-charge-battery-publisher-main-cpp.html index 45c18cd85f..16005c692a 100644 --- a/doc/html/battery-charge-battery-publisher-main-cpp.html +++ b/doc/html/battery-charge-battery-publisher-main-cpp.html @@ -75,6 +75,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/battery-charge-battery-subscriber-battery-subscriber-pro.html b/doc/html/battery-charge-battery-subscriber-battery-subscriber-pro.html index d7c81aacd3..93249d6e80 100644 --- a/doc/html/battery-charge-battery-subscriber-battery-subscriber-pro.html +++ b/doc/html/battery-charge-battery-subscriber-battery-subscriber-pro.html @@ -19,7 +19,8 @@ INCLUDEPATH += ../../../src/publishsubscribe DEPENDPATH += ../../../src/publishsubscribe include(../../examples.pri) - qtAddLibrary(QtPublishSubscribe) + CONFIG += mobility + MOBILITY = publishsubscribe SOURCES = main.cpp RESOURCES = battery-subscriber.qrc OTHER_FILES += battery-meter.qml</pre> @@ -27,6 +28,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/battery-charge-battery-subscriber-battery-subscriber-qrc.html b/doc/html/battery-charge-battery-subscriber-battery-subscriber-qrc.html index 2d94629ce5..69fdaf181f 100644 --- a/doc/html/battery-charge-battery-subscriber-battery-subscriber-qrc.html +++ b/doc/html/battery-charge-battery-subscriber-battery-subscriber-qrc.html @@ -23,6 +23,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/battery-charge.html b/doc/html/battery-charge.html index b5789bd4d0..916b3a8722 100644 --- a/doc/html/battery-charge.html +++ b/doc/html/battery-charge.html @@ -78,6 +78,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/bearer-management.html b/doc/html/bearer-management.html index e562e85a09..043b2ce2ed 100644 --- a/doc/html/bearer-management.html +++ b/doc/html/bearer-management.html @@ -103,6 +103,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/bearer.html b/doc/html/bearer.html index 1640bfd775..8d70dbae68 100644 --- a/doc/html/bearer.html +++ b/doc/html/bearer.html @@ -24,6 +24,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/bearercloud-bearercloud-cpp.html b/doc/html/bearercloud-bearercloud-cpp.html index 47cde9b44c..29d47576e7 100644 --- a/doc/html/bearercloud-bearercloud-cpp.html +++ b/doc/html/bearercloud-bearercloud-cpp.html @@ -203,6 +203,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/bearercloud-bearercloud-h.html b/doc/html/bearercloud-bearercloud-h.html index b1e20e25c1..257b28b7a7 100644 --- a/doc/html/bearercloud-bearercloud-h.html +++ b/doc/html/bearercloud-bearercloud-h.html @@ -97,6 +97,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/bearercloud-bearercloud-pro.html b/doc/html/bearercloud-bearercloud-pro.html index 47a9a6f4f4..a61fc175ac 100644 --- a/doc/html/bearercloud-bearercloud-pro.html +++ b/doc/html/bearercloud-bearercloud-pro.html @@ -30,22 +30,16 @@ include(../examples.pri) - qtAddLibrary(QtBearer) + CONFIG += mobility + MOBILITY = bearer CONFIG += console - include(../examples.pri) - - macx: { - contains(QT_CONFIG,qt_framework):LIBS += -framework QtBearer - INCLUDEPATH += ../../ - contains(CONFIG, debug) { - } - }</pre> + symbian:TARGET.CAPABILITY = NetworkServices NetworkControl ReadUserData</pre> <p /><address><hr /><div align="center"> <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/bearercloud-cloud-cpp.html b/doc/html/bearercloud-cloud-cpp.html index 5b6a79c436..ce6d435e63 100644 --- a/doc/html/bearercloud-cloud-cpp.html +++ b/doc/html/bearercloud-cloud-cpp.html @@ -367,6 +367,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/bearercloud-cloud-h.html b/doc/html/bearercloud-cloud-h.html index 6a9bb10d9e..eba5706306 100644 --- a/doc/html/bearercloud-cloud-h.html +++ b/doc/html/bearercloud-cloud-h.html @@ -113,6 +113,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/bearercloud-icons-qrc.html b/doc/html/bearercloud-icons-qrc.html index 72cc912fa6..6f59d99748 100644 --- a/doc/html/bearercloud-icons-qrc.html +++ b/doc/html/bearercloud-icons-qrc.html @@ -24,6 +24,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/bearercloud-lan-svg.html b/doc/html/bearercloud-lan-svg.html index 654bdfa568..6684b83522 100644 --- a/doc/html/bearercloud-lan-svg.html +++ b/doc/html/bearercloud-lan-svg.html @@ -93,6 +93,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/bearercloud-main-cpp.html b/doc/html/bearercloud-main-cpp.html index cee7a986a8..86bb9d0f4a 100644 --- a/doc/html/bearercloud-main-cpp.html +++ b/doc/html/bearercloud-main-cpp.html @@ -105,6 +105,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/bearercloud-unknown-svg.html b/doc/html/bearercloud-unknown-svg.html index 06ac98d779..39344f0156 100644 --- a/doc/html/bearercloud-unknown-svg.html +++ b/doc/html/bearercloud-unknown-svg.html @@ -93,6 +93,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/bearercloud-wlan-svg.html b/doc/html/bearercloud-wlan-svg.html index 8096d1214b..37f6be14da 100644 --- a/doc/html/bearercloud-wlan-svg.html +++ b/doc/html/bearercloud-wlan-svg.html @@ -168,6 +168,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/bearercloud.html b/doc/html/bearercloud.html index ece02ccb30..3ff610cdcd 100644 --- a/doc/html/bearercloud.html +++ b/doc/html/bearercloud.html @@ -309,6 +309,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/bearermonitor-bearermonitor-cpp.html b/doc/html/bearermonitor-bearermonitor-cpp.html index ba66000b76..2831529b8c 100644 --- a/doc/html/bearermonitor-bearermonitor-cpp.html +++ b/doc/html/bearermonitor-bearermonitor-cpp.html @@ -412,6 +412,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/bearermonitor-bearermonitor-h.html b/doc/html/bearermonitor-bearermonitor-h.html index 7609b8a1eb..a2fd235772 100644 --- a/doc/html/bearermonitor-bearermonitor-h.html +++ b/doc/html/bearermonitor-bearermonitor-h.html @@ -109,6 +109,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/bearermonitor-bearermonitor-pro.html b/doc/html/bearermonitor-bearermonitor-pro.html index accdb7f457..ace739519e 100644 --- a/doc/html/bearermonitor-bearermonitor-pro.html +++ b/doc/html/bearermonitor-bearermonitor-pro.html @@ -32,23 +32,19 @@ include(../examples.pri) - qtAddLibrary(QtBearer) + CONFIG += mobility + MOBILITY = bearer + win32:!wince*:LIBS += -lWs2_32 wince*:LIBS += -lWs2 CONFIG += console - include(../examples.pri) - - macx: { - contains(QT_CONFIG,qt_framework):LIBS += -framework QtBearer - contains(CONFIG, debug) { - } - }</pre> + symbian:TARGET.CAPABILITY = NetworkServices NetworkControl ReadUserData</pre> <p /><address><hr /><div align="center"> <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/bearermonitor-main-cpp.html b/doc/html/bearermonitor-main-cpp.html index ab0d7cf7d8..0fad0156a4 100644 --- a/doc/html/bearermonitor-main-cpp.html +++ b/doc/html/bearermonitor-main-cpp.html @@ -71,6 +71,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/bearermonitor-sessionwidget-cpp.html b/doc/html/bearermonitor-sessionwidget-cpp.html index c2dce4d73f..d7b39a3f9c 100644 --- a/doc/html/bearermonitor-sessionwidget-cpp.html +++ b/doc/html/bearermonitor-sessionwidget-cpp.html @@ -172,6 +172,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/bearermonitor-sessionwidget-h.html b/doc/html/bearermonitor-sessionwidget-h.html index 409f9a4cb4..e4da505436 100644 --- a/doc/html/bearermonitor-sessionwidget-h.html +++ b/doc/html/bearermonitor-sessionwidget-h.html @@ -91,6 +91,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/bearermonitor.html b/doc/html/bearermonitor.html index ef6dc0456a..c146ae46da 100644 --- a/doc/html/bearermonitor.html +++ b/doc/html/bearermonitor.html @@ -28,6 +28,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/bluetoothtransferplugin-bluetoothtransfer-cpp.html b/doc/html/bluetoothtransferplugin-bluetoothtransfer-cpp.html index cf643916b8..a0912590a9 100644 --- a/doc/html/bluetoothtransferplugin-bluetoothtransfer-cpp.html +++ b/doc/html/bluetoothtransferplugin-bluetoothtransfer-cpp.html @@ -71,6 +71,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/bluetoothtransferplugin-bluetoothtransfer-h.html b/doc/html/bluetoothtransferplugin-bluetoothtransfer-h.html index e1ea4fbff8..f028502f1f 100644 --- a/doc/html/bluetoothtransferplugin-bluetoothtransfer-h.html +++ b/doc/html/bluetoothtransferplugin-bluetoothtransfer-h.html @@ -74,6 +74,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/bluetoothtransferplugin-bluetoothtransferplugin-cpp.html b/doc/html/bluetoothtransferplugin-bluetoothtransferplugin-cpp.html index 4cdbe364d4..5e2e1741e6 100644 --- a/doc/html/bluetoothtransferplugin-bluetoothtransferplugin-cpp.html +++ b/doc/html/bluetoothtransferplugin-bluetoothtransferplugin-cpp.html @@ -74,6 +74,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/bluetoothtransferplugin-bluetoothtransferplugin-h.html b/doc/html/bluetoothtransferplugin-bluetoothtransferplugin-h.html index fee738e6c6..9df95d1d58 100644 --- a/doc/html/bluetoothtransferplugin-bluetoothtransferplugin-h.html +++ b/doc/html/bluetoothtransferplugin-bluetoothtransferplugin-h.html @@ -79,6 +79,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/bluetoothtransferplugin-bluetoothtransferplugin-pro.html b/doc/html/bluetoothtransferplugin-bluetoothtransferplugin-pro.html index 23eaa49c01..edf4dfeead 100644 --- a/doc/html/bluetoothtransferplugin-bluetoothtransferplugin-pro.html +++ b/doc/html/bluetoothtransferplugin-bluetoothtransferplugin-pro.html @@ -24,7 +24,8 @@ DESTDIR = . include(../examples.pri) - qtAddLibrary(QtServiceFramework) + CONFIG += mobility + MOBILITY = serviceframework symbian { load(data_caging_paths) @@ -45,6 +46,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/bluetoothtransferplugin.html b/doc/html/bluetoothtransferplugin.html index 3f4dac0eb2..a8241aedf8 100644 --- a/doc/html/bluetoothtransferplugin.html +++ b/doc/html/bluetoothtransferplugin.html @@ -27,6 +27,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/cameracapture-cameracapture-cpp.html b/doc/html/cameracapture-cameracapture-cpp.html index 25a3ee2732..9efafbecee 100644 --- a/doc/html/cameracapture-cameracapture-cpp.html +++ b/doc/html/cameracapture-cameracapture-cpp.html @@ -302,6 +302,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/cameracapture-cameracapture-h.html b/doc/html/cameracapture-cameracapture-h.html index fb9dc3da80..dbd0b33dc7 100644 --- a/doc/html/cameracapture-cameracapture-h.html +++ b/doc/html/cameracapture-cameracapture-h.html @@ -116,6 +116,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/cameracapture-cameracapture-pro.html b/doc/html/cameracapture-cameracapture-pro.html index 3b54a073fc..804dcbe422 100644 --- a/doc/html/cameracapture-cameracapture-pro.html +++ b/doc/html/cameracapture-cameracapture-pro.html @@ -19,7 +19,8 @@ INCLUDEPATH+=../../src/multimedia include(../examples.pri) - qtAddLibrary(QtMedia) + CONFIG += mobility + MOBILITY = multimedia HEADERS = cameracapture.h \ settings.h @@ -32,6 +33,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/cameracapture-main-cpp.html b/doc/html/cameracapture-main-cpp.html index a83e6a877b..d6539c2780 100644 --- a/doc/html/cameracapture-main-cpp.html +++ b/doc/html/cameracapture-main-cpp.html @@ -71,6 +71,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/cameracapture-settings-cpp.html b/doc/html/cameracapture-settings-cpp.html index 3bee4ac44e..605d87ba12 100644 --- a/doc/html/cameracapture-settings-cpp.html +++ b/doc/html/cameracapture-settings-cpp.html @@ -204,6 +204,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/cameracapture-settings-h.html b/doc/html/cameracapture-settings-h.html index 3de355bb38..fe0ea9a08b 100644 --- a/doc/html/cameracapture-settings-h.html +++ b/doc/html/cameracapture-settings-h.html @@ -102,6 +102,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/cameracapture.html b/doc/html/cameracapture.html index faed91a93e..4480bcf9a4 100644 --- a/doc/html/cameracapture.html +++ b/doc/html/cameracapture.html @@ -27,6 +27,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/classes.html b/doc/html/classes.html index 26fc4790a5..f247e99621 100644 --- a/doc/html/classes.html +++ b/doc/html/classes.html @@ -411,6 +411,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/classlists.html b/doc/html/classlists.html index f05d797387..ad70c4417f 100644 --- a/doc/html/classlists.html +++ b/doc/html/classlists.html @@ -33,6 +33,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/contacts.html b/doc/html/contacts.html index 7b10427940..f6fe596091 100644 --- a/doc/html/contacts.html +++ b/doc/html/contacts.html @@ -362,11 +362,12 @@ <h4>Examples</h4> <ul> <li><a href="samplephonebook.html">Sample Phonebook</a></li> +<li><a href="incomingcalls.html">Incoming Call Simulator</a></li> </ul> <p /><address><hr /><div align="center"> <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/contactsschema.html b/doc/html/contactsschema.html index e59e4fda5c..5268b35093 100644 --- a/doc/html/contactsschema.html +++ b/doc/html/contactsschema.html @@ -88,6 +88,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/declarative-declarative-pro.html b/doc/html/declarative-declarative-pro.html index 75d5f5c6df..248c898832 100644 --- a/doc/html/declarative-declarative-pro.html +++ b/doc/html/declarative-declarative-pro.html @@ -22,6 +22,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/declarative-demo-demo-pro.html b/doc/html/declarative-demo-demo-pro.html index b4eb463006..f46dc828f4 100644 --- a/doc/html/declarative-demo-demo-pro.html +++ b/doc/html/declarative-demo-demo-pro.html @@ -26,7 +26,8 @@ SOURCES += ../sfwexample.cpp \ ../main.cpp - qtAddLibrary(QtServiceFramework) + CONFIG += mobility + MOBILITY = serviceframework symbian { TARGET.CAPABILITY = ALL -TCB @@ -35,6 +36,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/declarative-landlinedialer-landlinedialer-cpp.html b/doc/html/declarative-landlinedialer-landlinedialer-cpp.html index b295f8e6fc..4e164ce800 100644 --- a/doc/html/declarative-landlinedialer-landlinedialer-cpp.html +++ b/doc/html/declarative-landlinedialer-landlinedialer-cpp.html @@ -122,6 +122,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/declarative-landlinedialer-landlinedialer-h.html b/doc/html/declarative-landlinedialer-landlinedialer-h.html index c78150bcef..64cdc2a2d3 100644 --- a/doc/html/declarative-landlinedialer-landlinedialer-h.html +++ b/doc/html/declarative-landlinedialer-landlinedialer-h.html @@ -96,6 +96,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/declarative-landlinedialer-landlinedialer-pro.html b/doc/html/declarative-landlinedialer-landlinedialer-pro.html index 80b653b77b..0ecec37562 100644 --- a/doc/html/declarative-landlinedialer-landlinedialer-pro.html +++ b/doc/html/declarative-landlinedialer-landlinedialer-pro.html @@ -25,7 +25,8 @@ HEADERS += landlinedialer.h landlinedialerplugin.h SOURCES += landlinedialer.cpp landlinedialerplugin.cpp - qtAddLibrary(QtServiceFramework) + CONFIG += mobility + MOBILITY = serviceframework symbian { TARGET.CAPABILITY = ALL -TCB @@ -40,6 +41,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/declarative-landlinedialer-landlinedialerplugin-cpp.html b/doc/html/declarative-landlinedialer-landlinedialerplugin-cpp.html index 95f8dec544..fc47901a8b 100644 --- a/doc/html/declarative-landlinedialer-landlinedialerplugin-cpp.html +++ b/doc/html/declarative-landlinedialer-landlinedialerplugin-cpp.html @@ -77,6 +77,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/declarative-landlinedialer-landlinedialerplugin-h.html b/doc/html/declarative-landlinedialer-landlinedialerplugin-h.html index 045801f78a..2ace52980a 100644 --- a/doc/html/declarative-landlinedialer-landlinedialerplugin-h.html +++ b/doc/html/declarative-landlinedialer-landlinedialerplugin-h.html @@ -79,6 +79,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/declarative-main-cpp.html b/doc/html/declarative-main-cpp.html index 95cabd47e3..2c3664dcab 100644 --- a/doc/html/declarative-main-cpp.html +++ b/doc/html/declarative-main-cpp.html @@ -110,6 +110,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/declarative-sfwexample-cpp.html b/doc/html/declarative-sfwexample-cpp.html index 3c1bacb705..dbb7fff657 100644 --- a/doc/html/declarative-sfwexample-cpp.html +++ b/doc/html/declarative-sfwexample-cpp.html @@ -175,6 +175,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/declarative-sfwexample-h.html b/doc/html/declarative-sfwexample-h.html index 3ea3aac1ac..266cb16847 100644 --- a/doc/html/declarative-sfwexample-h.html +++ b/doc/html/declarative-sfwexample-h.html @@ -120,6 +120,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/declarative-voipdialer-voipdialer-cpp.html b/doc/html/declarative-voipdialer-voipdialer-cpp.html index 5eb62a74bf..999affe556 100644 --- a/doc/html/declarative-voipdialer-voipdialer-cpp.html +++ b/doc/html/declarative-voipdialer-voipdialer-cpp.html @@ -122,6 +122,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/declarative-voipdialer-voipdialer-h.html b/doc/html/declarative-voipdialer-voipdialer-h.html index abb31104ba..d38bba92ec 100644 --- a/doc/html/declarative-voipdialer-voipdialer-h.html +++ b/doc/html/declarative-voipdialer-voipdialer-h.html @@ -96,6 +96,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/declarative-voipdialer-voipdialer-pro.html b/doc/html/declarative-voipdialer-voipdialer-pro.html index f8744f2e8e..b5835816b0 100644 --- a/doc/html/declarative-voipdialer-voipdialer-pro.html +++ b/doc/html/declarative-voipdialer-voipdialer-pro.html @@ -25,7 +25,8 @@ HEADERS += voipdialer.h voipdialerplugin.h SOURCES += voipdialer.cpp voipdialerplugin.cpp - qtAddLibrary(QtServiceFramework) + CONFIG += mobility + MOBILITY = serviceframework symbian { TARGET.CAPABILITY = ALL -TCB @@ -40,6 +41,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/declarative-voipdialer-voipdialerplugin-cpp.html b/doc/html/declarative-voipdialer-voipdialerplugin-cpp.html index d48dd1e365..50e29aa73b 100644 --- a/doc/html/declarative-voipdialer-voipdialerplugin-cpp.html +++ b/doc/html/declarative-voipdialer-voipdialerplugin-cpp.html @@ -74,6 +74,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/declarative-voipdialer-voipdialerplugin-h.html b/doc/html/declarative-voipdialer-voipdialerplugin-h.html index fc4676040f..da8b2145b9 100644 --- a/doc/html/declarative-voipdialer-voipdialerplugin-h.html +++ b/doc/html/declarative-voipdialer-voipdialerplugin-h.html @@ -79,6 +79,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/declarative.html b/doc/html/declarative.html index c21e7c536f..10a36d4300 100644 --- a/doc/html/declarative.html +++ b/doc/html/declarative.html @@ -36,6 +36,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/editions.html b/doc/html/editions.html index e8c7b786b3..3b47ffb39e 100644 --- a/doc/html/editions.html +++ b/doc/html/editions.html @@ -25,6 +25,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/examples.html b/doc/html/examples.html index 345fb6f230..b8e8cfe0e0 100644 --- a/doc/html/examples.html +++ b/doc/html/examples.html @@ -14,7 +14,7 @@ <td width="1"> </td><td class="postheader" valign="center"><a href="index.html"><font color="#004faf">Home</font></a> · <a href="classes.html"><font color="#004faf">All Classes</font></a> · <a href="functions.html"><font color="#004faf">All Functions</font></a> ·</td> <td align="right" valign="top" width="230"><img src="images/codeless.png" border="0" /></td></tr></table><h1 class="title">Qt Mobility Examples<br /><span class="subtitle"></span> </h1> -<p>Qt Mobility comes with a variety of examples that cover the entire range of the Qt Mobility APIs.</p> +<p>Qt Mobility comes with a variety of examples that cover the entire range of the Qt Mobility APIs. Note that some examples require Qt declarative which can by obtain via <a href="http://qt.gitorious.org/qt">http://qt.gitorious.org/qt</a>.</p> <a name="bearer-management"></a> <h2>Bearer Management</h2> <ul> @@ -25,7 +25,7 @@ <h2>Contacts</h2> <ul> <li><a href="samplephonebook.html">Sample Phonebook</a></li> -<li><a href="incomingcalls.html">Incoming Calls</a></li> +<li><a href="incomingcalls.html">Incoming Call Simulator</a></li> </ul> <a name="location"></a> <h2>Location</h2> @@ -62,7 +62,7 @@ <h2>Service Framework</h2> <ul> <li><a href="bluetoothtransferplugin.html">Bluetooth Transfer Plugin</a></li> -<li><a href="declarative.html">Declarative</a></li> +<li><a href="declarative.html">Qt Declarative based service framework example</a></li> <li><a href="filemanagerplugin.html">File Manager Plugin</a></li> <li><a href="servicebrowser.html">Service Browser</a><sup>*</sup></li> </ul> @@ -75,6 +75,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/fetchgooglemaps-fetchgooglemaps-pro.html b/doc/html/fetchgooglemaps-fetchgooglemaps-pro.html index ace9bd4da3..aed220b523 100644 --- a/doc/html/fetchgooglemaps-fetchgooglemaps-pro.html +++ b/doc/html/fetchgooglemaps-fetchgooglemaps-pro.html @@ -23,17 +23,25 @@ main.cpp include(../examples.pri) - qtAddLibrary(QtLocation) + CONFIG += mobility + MOBILITY = location - logfile.path = $$DESTDIR - logfile.files = nmealog.txt - logfile.CONFIG = no_link no_dependencies explicit_dependencies no_build combine ignore_no_exist no_clean - INSTALLS += logfile - build_pass:ALL_DEPS+=install_logfile</pre> + symbian: { + addFiles.sources = nmealog.txt + DEPLOYMENT += addFiles + + TARGET.CAPABILITY = Location NetworkServices + } else { + logfile.path = $$DESTDIR + logfile.files = nmealog.txt + logfile.CONFIG = no_link no_dependencies explicit_dependencies no_build combine ignore_no_exist no_clean + INSTALLS += logfile + build_pass:ALL_DEPS+=install_logfile + }</pre> <p /><address><hr /><div align="center"> <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/fetchgooglemaps-main-cpp.html b/doc/html/fetchgooglemaps-main-cpp.html index a8a6aba2ea..e9d2578983 100644 --- a/doc/html/fetchgooglemaps-main-cpp.html +++ b/doc/html/fetchgooglemaps-main-cpp.html @@ -71,6 +71,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/fetchgooglemaps-mapwindow-cpp.html b/doc/html/fetchgooglemaps-mapwindow-cpp.html index c84ec62a4c..0c90c93178 100644 --- a/doc/html/fetchgooglemaps-mapwindow-cpp.html +++ b/doc/html/fetchgooglemaps-mapwindow-cpp.html @@ -140,6 +140,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/fetchgooglemaps-mapwindow-h.html b/doc/html/fetchgooglemaps-mapwindow-h.html index 43f9c34c1d..3656057838 100644 --- a/doc/html/fetchgooglemaps-mapwindow-h.html +++ b/doc/html/fetchgooglemaps-mapwindow-h.html @@ -95,6 +95,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/fetchgooglemaps.html b/doc/html/fetchgooglemaps.html index c7dc2153c2..a35a75496f 100644 --- a/doc/html/fetchgooglemaps.html +++ b/doc/html/fetchgooglemaps.html @@ -25,6 +25,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/filemanagerplugin-filemanagerplugin-cpp.html b/doc/html/filemanagerplugin-filemanagerplugin-cpp.html index 9c6a3eba13..deb6020255 100644 --- a/doc/html/filemanagerplugin-filemanagerplugin-cpp.html +++ b/doc/html/filemanagerplugin-filemanagerplugin-cpp.html @@ -80,6 +80,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/filemanagerplugin-filemanagerplugin-h.html b/doc/html/filemanagerplugin-filemanagerplugin-h.html index cc8fb77e54..b51609b2b8 100644 --- a/doc/html/filemanagerplugin-filemanagerplugin-h.html +++ b/doc/html/filemanagerplugin-filemanagerplugin-h.html @@ -79,6 +79,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/filemanagerplugin-filemanagerplugin-pro.html b/doc/html/filemanagerplugin-filemanagerplugin-pro.html index 11848baa49..7522c6723c 100644 --- a/doc/html/filemanagerplugin-filemanagerplugin-pro.html +++ b/doc/html/filemanagerplugin-filemanagerplugin-pro.html @@ -26,7 +26,8 @@ DESTDIR = . include(../examples.pri) - qtAddLibrary(QtServiceFramework) + CONFIG += mobility + MOBILITY = serviceframework symbian { load(data_caging_paths) @@ -47,6 +48,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/filemanagerplugin-filemanagerstorage-cpp.html b/doc/html/filemanagerplugin-filemanagerstorage-cpp.html index 383cf3725a..2385c854bf 100644 --- a/doc/html/filemanagerplugin-filemanagerstorage-cpp.html +++ b/doc/html/filemanagerplugin-filemanagerstorage-cpp.html @@ -83,6 +83,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/filemanagerplugin-filemanagerstorage-h.html b/doc/html/filemanagerplugin-filemanagerstorage-h.html index 1a70df5d1e..99310534c2 100644 --- a/doc/html/filemanagerplugin-filemanagerstorage-h.html +++ b/doc/html/filemanagerplugin-filemanagerstorage-h.html @@ -85,6 +85,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/filemanagerplugin-filemanagertransfer-cpp.html b/doc/html/filemanagerplugin-filemanagertransfer-cpp.html index 78ed67f759..a9520580ee 100644 --- a/doc/html/filemanagerplugin-filemanagertransfer-cpp.html +++ b/doc/html/filemanagerplugin-filemanagertransfer-cpp.html @@ -76,6 +76,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/filemanagerplugin-filemanagertransfer-h.html b/doc/html/filemanagerplugin-filemanagertransfer-h.html index 0453659c5a..02059250e9 100644 --- a/doc/html/filemanagerplugin-filemanagertransfer-h.html +++ b/doc/html/filemanagerplugin-filemanagertransfer-h.html @@ -76,6 +76,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/filemanagerplugin.html b/doc/html/filemanagerplugin.html index c5fd923507..de3e77da68 100644 --- a/doc/html/filemanagerplugin.html +++ b/doc/html/filemanagerplugin.html @@ -29,6 +29,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/functions.html b/doc/html/functions.html index 83e72c03b7..13aa9a2979 100644 --- a/doc/html/functions.html +++ b/doc/html/functions.html @@ -1315,6 +1315,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/future.html b/doc/html/future.html index 5e1e8172d7..0f399f54ba 100644 --- a/doc/html/future.html +++ b/doc/html/future.html @@ -39,6 +39,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/gpl.html b/doc/html/gpl.html index 800c081e3b..6668a0c49f 100644 --- a/doc/html/gpl.html +++ b/doc/html/gpl.html @@ -700,6 +700,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/hierarchy.html b/doc/html/hierarchy.html index 89655052a4..a471ac609f 100644 --- a/doc/html/hierarchy.html +++ b/doc/html/hierarchy.html @@ -103,6 +103,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/incomingcalls-filterdialog-cpp.html b/doc/html/incomingcalls-filterdialog-cpp.html index b8321890a3..9be6c2a215 100644 --- a/doc/html/incomingcalls-filterdialog-cpp.html +++ b/doc/html/incomingcalls-filterdialog-cpp.html @@ -280,6 +280,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/incomingcalls-filterdialog-h.html b/doc/html/incomingcalls-filterdialog-h.html index 23322dc436..ac62b28b87 100644 --- a/doc/html/incomingcalls-filterdialog-h.html +++ b/doc/html/incomingcalls-filterdialog-h.html @@ -129,6 +129,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/incomingcalls-incomingcalls-pro.html b/doc/html/incomingcalls-incomingcalls-pro.html index fe6a7ec530..5f43efbfc1 100644 --- a/doc/html/incomingcalls-incomingcalls-pro.html +++ b/doc/html/incomingcalls-incomingcalls-pro.html @@ -27,7 +27,8 @@ ../../src/contacts/requests \ ../../src/contacts/filters - qtAddLibrary(QtContacts) + CONFIG += mobility + MOBILITY = contacts # Input SOURCES += main.cpp \ @@ -40,12 +41,11 @@ qcontactlistmodel.h \ qcontactlistmodel_p.h - qtAddLibrary(QtContacts) include(../examples.pri)</pre> <p /><address><hr /><div align="center"> <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/incomingcalls-main-cpp.html b/doc/html/incomingcalls-main-cpp.html index c2ef440c9f..e7148be2ca 100644 --- a/doc/html/incomingcalls-main-cpp.html +++ b/doc/html/incomingcalls-main-cpp.html @@ -69,6 +69,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/incomingcalls-qcontactlistmodel-cpp.html b/doc/html/incomingcalls-qcontactlistmodel-cpp.html index 8d428d3273..34cfb9ae01 100644 --- a/doc/html/incomingcalls-qcontactlistmodel-cpp.html +++ b/doc/html/incomingcalls-qcontactlistmodel-cpp.html @@ -666,6 +666,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/incomingcalls-qcontactlistmodel-h.html b/doc/html/incomingcalls-qcontactlistmodel-h.html index e7f9ee57bd..ac47d3ea98 100644 --- a/doc/html/incomingcalls-qcontactlistmodel-h.html +++ b/doc/html/incomingcalls-qcontactlistmodel-h.html @@ -146,6 +146,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/incomingcalls-qcontactlistmodel-p-h.html b/doc/html/incomingcalls-qcontactlistmodel-p-h.html index a64f6a5b12..447291f032 100644 --- a/doc/html/incomingcalls-qcontactlistmodel-p-h.html +++ b/doc/html/incomingcalls-qcontactlistmodel-p-h.html @@ -153,6 +153,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/incomingcalls-testmodelui-cpp.html b/doc/html/incomingcalls-testmodelui-cpp.html index c553a9b130..2ec212497f 100644 --- a/doc/html/incomingcalls-testmodelui-cpp.html +++ b/doc/html/incomingcalls-testmodelui-cpp.html @@ -472,6 +472,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/incomingcalls-testmodelui-h.html b/doc/html/incomingcalls-testmodelui-h.html index 8c2ad119c5..fb953998cd 100644 --- a/doc/html/incomingcalls-testmodelui-h.html +++ b/doc/html/incomingcalls-testmodelui-h.html @@ -163,6 +163,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/incomingcalls.html b/doc/html/incomingcalls.html index d944786957..6f9f7a4ac5 100644 --- a/doc/html/incomingcalls.html +++ b/doc/html/incomingcalls.html @@ -2,9 +2,9 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> -<!-- undocumented.qdoc --> +<!-- incomingcalls.qdoc --> <head> - <title>Qt Mobility Project 1.0: Incoming Calls Example</title> + <title>Qt Mobility Project 1.0: Incoming Call Simulator</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -12,7 +12,7 @@ <tr> <td align="left" valign="top" width="32"><a href="http://qt.nokia.com/"><img src="images/qtlogo.png" align="left" border="0" /></a></td> <td width="1"> </td><td class="postheader" valign="center"><a href="index.html"><font color="#004faf">Home</font></a> · <a href="classes.html"><font color="#004faf">All Classes</font></a> · <a href="functions.html"><font color="#004faf">All Functions</font></a> ·</td> -<td align="right" valign="top" width="230"><img src="images/codeless.png" border="0" /></td></tr></table><h1 class="title">Incoming Calls Example<br /><span class="subtitle"></span> +<td align="right" valign="top" width="230"><img src="images/codeless.png" border="0" /></td></tr></table><h1 class="title">Incoming Call Simulator<br /><span class="subtitle"></span> </h1> <p>Files:</p> <ul> @@ -26,10 +26,32 @@ <li><a href="incomingcalls-main-cpp.html">incomingcalls/main.cpp</a></li> <li><a href="incomingcalls-incomingcalls-pro.html">incomingcalls/incomingcalls.pro</a></li> </ul> +<ul><li><a href="#incoming-calls">Incoming Calls</a></li> +<ul><li><a href="#motivation">Motivation</a></li> +<li><a href="#use-case">Use Case</a></li> +<li><a href="#interface">Interface</a></li> +<li><a href="#known-issues">Known Issues</a></li> +</ul> +</ul> +<a name="incoming-calls"></a> +<h2>Incoming Calls</h2> +<p>This example shows how to access contact information asynchronously using the <a href="contacts.html">Contacts API</a>. It generates a large number of contacts automatically, saves them to an in-memory, anonymous contacts store, and allows the user to view them in a model view. It then simulates incoming calls from random phone numbers, and displays information about the contact calling if the random phone number matches a phone number of a generated contact.</p> +<a name="motivation"></a> +<h3>Motivation</h3> +<p>This application was written to provide an example to developers of how to use the Qt Contacts API. It uses an asynchronous method to retrieve details of contacts on demand, and displays them in a model view. It also provides an example of simple string matching on contact phone numbers to perform identification.</p> +<a name="use-case"></a> +<h3>Use Case</h3> +<p>A real address book may contain hundreds or even thousands of contacts. Being able to load a small portion of those contacts on-demand as required (for example, those visible in the UI currently, plus some cached), as opposed to the entire dataset, is a vital requirement.</p> +<a name="interface"></a> +<h3>Interface</h3> +<p>The application is not very interactive. The only allowable user interaction is the ability to scroll around the list of contacts, and to view the details of contacts from which a simulated phone call is coming.</p> +<a name="known-issues"></a> +<h3>Known Issues</h3> +<p>The example is not intended to be feature complete. Also, the example model view and result caching engine performs superfluous asynchronous requests (i.e., for data already contained in the contact cache).</p> <p /><address><hr /><div align="center"> <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/index.html b/doc/html/index.html index 584e3a7cb3..c2b875155c 100644 --- a/doc/html/index.html +++ b/doc/html/index.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- index.qdoc --> <head> - <title>Qt Mobility Project 1.0: Qt Mobility Project APIs (Technical Preview) Overview</title> + <title>Qt Mobility Project 1.0: Qt Mobility Project APIs Overview</title> <link rel="start" href="index.html" /> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> @@ -15,7 +15,7 @@ <td width="1"> </td><td class="postheader" valign="center"><a href="index.html"><font color="#004faf">Home</font></a> · <a href="classes.html"><font color="#004faf">All Classes</font></a> · <a href="functions.html"><font color="#004faf">All Functions</font></a> ·</td> <td align="right" valign="top" width="230"><img src="images/codeless.png" border="0" /></td></tr></table><p> </p> -<h1 class="title">Qt Mobility Project APIs (Technical Preview) Overview<br /><span class="subtitle"></span> +<h1 class="title">Qt Mobility Project APIs Overview<br /><span class="subtitle"></span> </h1> <p>Qt Mobility Project delivers a set of new APIs to Qt with features that are well known from the mobile device world, in particular phones. However, these APIs allow the developer to use these features with ease from one framework and apply them to phones, netbooks and non-mobile personal computers. The framework not only improves many aspects of a mobile experience, because it improves the use of these technologies, but has applicability beyond the mobile device arena.</p> <ul><li><a href="#overview">Overview</a></li> @@ -33,7 +33,7 @@ <li><a href="#service-framework">Service Framework</a></li> <li><a href="#system-information">System Information</a></li> </ul> -<li><a href="#future-additions">Future Additions</a></li> +<li><a href="#future-additions-and-considerations">Future Additions and Considerations</a></li> <li><a href="#platform-compatability">Platform Compatability</a></li> <li><a href="#feedback-and-bug-reports">Feedback and bug reports</a></li> </ul> @@ -72,7 +72,7 @@ <p>For users on the supported Symbian platforms, shown at the bottom of this page, see the instructions at the <a href="http://library.forum.nokia.com/topic/Qt_for_Symbian_Developers_Library/GUID-7E53D0F7-72CB-41C4-8807-FE7A772B0DB4.html">Qt For Symbian Developer's Library</a></p> <a name="known-issues"></a> <h4>Known Issues</h4> -<p>For a list of known issues and an additional details on feature supported see <a href="qtmobility-known-issues.html">Release Notes of the QtMobility Project (Technology Preview)</a>.</p> +<p>For a list of known issues and an additional details on feature supported see <a href="qtmobility-known-issues.html">Release Notes of the QtMobility Project</a>.</p> <p>For a overview of Platform Compatability see <a href="#platform-compatability">Platform Compatability</a>.</p> <a name="the-new-qt-apis"></a> <h3>The New Qt APIs</h3> @@ -121,12 +121,13 @@ <h4>System Information</h4> <p>An API to discover system related information and capabilities. Information available will cover software version numbers, hardware features, network connection types and status, display, data storage devices, device information and the screensaver.</p> <p>For more details see the <a href="systeminfo.html">System Information API overview</a>.</p> -<a name="future-additions"></a> -<h3>Future Additions</h3> +<a name="future-additions-and-considerations"></a> +<h3>Future Additions and Considerations</h3> <p>Two additional APIs are included which show future additional APIs. These are pre-release versions and the API will likely change before they are officially released. You may use these APIs in accordance with the terms and conditions contained in the Technology Preview License Agreement accompanying this package.</p> <p>We are making these available so that developers can see that future updates will not only refine the API but add important features. We are proud of the work we have done on this project and want to show not only what we are delivering now but what is around the corner.</p> <p><a href="future.html#management-of-versit-documents">Versit</a> is an API for managing Versit documents, such as vCards.</p> <p><a href="future.html#camera-support">Camera</a> will be a part of the Multimedia API.</p> +<p>The QtMobility API's are placed into the QtMobility namespace. This is done to facilitate the future migration of Mobility API's into Qt. See the <a href="quickstart.html">Quickstart guide</a> for an example on how the namespace impacts on application development.</p> <a name="platform-compatability"></a> <h3>Platform Compatability</h3> <table border="0"> @@ -312,6 +313,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/installation.html b/doc/html/installation.html index 1c9306bffa..ea195b3223 100644 --- a/doc/html/installation.html +++ b/doc/html/installation.html @@ -20,6 +20,7 @@ <li><a href="#building">Building</a></li> <ul><li><a href="#building-on-unix">Building On Unix</a></li> <li><a href="#building-on-windows">Building On Windows</a></li> +<li><a href="#building-for-symbian-on-windows">Building For Symbian On Windows</a></li> <li><a href="#building-individual-qt-mobility-domains">Building Individual Qt Mobility Domains</a></li> </ul> <li><a href="#environment-variables">Environment Variables</a></li> @@ -87,6 +88,21 @@ <p>The actual commands needed to build and install Qt Mobility depends on your development system. For Microsoft Visual Studio to create and install the libraries and tools type:</p> <pre> nmake nmake install</pre> +<a name="building-for-symbian-on-windows"></a> +<h3>Building For Symbian On Windows</h3> +<p>To configure the Qt Mobility libraries, run configure in the package directory. (-prefix cannot be used since the libraries are installed into the SDK directory)</p> +<pre> cd c:\QtMobility\%DISTNAME% + configure</pre> +<p>Type <tt>configure -help</tt> to get a list of all available options.</p> +<p>To create and install all the libraries and tools, type:</p> +<pre> make</pre> +<p>(Note: no make install step is necessary) The libraries will be deployed into the SDK and will be ready to use for applications running within the emulator.</p> +<p>Rather than building the libraries it is also possible to deploy a prebuilt set of libraries. Under the <tt>c:\QtMobility\%DISTNAME%\symbian</tt> directory there contains <tt>Mobility_tech_preview_libraries.zip</tt>. Extract this into the SDK root directory to add the necessary libraries. If you have multiple SDKs then repeat this step for each of them.</p> +<p>To build an SIS package for a particular library such as bearer management run the following commands</p> +<pre> cd src/bearer + make release-gcce + createpackage bearer_template.pkg release-gcce</pre> +<p>There is also a set of prebuilt SIS file for all the libraries under <tt>c:\QtMobility\%DISTNAME%\symbian\Mobility_tech_preview.sis</tt> which can be deployed on your device.</p> <a name="building-individual-qt-mobility-domains"></a> <h3>Building Individual Qt Mobility Domains</h3> <p>Qt Mobility is comprised of several domains but all of these may not need to be built. To build a single domain, perform the configure step as outlined above, and then perform the make step in the appropriate directory to create the desired library.</p> @@ -120,6 +136,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/keepintouch-addressfinder-cpp.html b/doc/html/keepintouch-addressfinder-cpp.html index 17cdf63084..d8f7af8025 100644 --- a/doc/html/keepintouch-addressfinder-cpp.html +++ b/doc/html/keepintouch-addressfinder-cpp.html @@ -501,6 +501,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/keepintouch-addressfinder-h.html b/doc/html/keepintouch-addressfinder-h.html index 90aeedf360..51e42c3c58 100644 --- a/doc/html/keepintouch-addressfinder-h.html +++ b/doc/html/keepintouch-addressfinder-h.html @@ -134,6 +134,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/keepintouch-keepintouch-pro.html b/doc/html/keepintouch-keepintouch-pro.html index 4e9a919439..baae28ea46 100644 --- a/doc/html/keepintouch-keepintouch-pro.html +++ b/doc/html/keepintouch-keepintouch-pro.html @@ -20,8 +20,10 @@ include(../examples.pri) - qtAddLibrary(QtMessaging) + CONFIG += mobility + MOBILITY = messaging contacts INCLUDEPATH += ../../src/messaging + INCLUDEPATH += ../../src/contacts ../../src/contacts/details ../../src/contacts/filters ../../src/contacts/requests qtAddLibrary(QtContacts) INCLUDEPATH += ../../src/contacts ../../src/contacts/details ../../src/contacts/filters ../../src/contacts/requests @@ -50,6 +52,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/keepintouch-main-cpp.html b/doc/html/keepintouch-main-cpp.html index 09953f34ed..7cae5b8efa 100644 --- a/doc/html/keepintouch-main-cpp.html +++ b/doc/html/keepintouch-main-cpp.html @@ -79,6 +79,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/keepintouch.html b/doc/html/keepintouch.html index 368cae8260..ea9627b8c2 100644 --- a/doc/html/keepintouch.html +++ b/doc/html/keepintouch.html @@ -227,6 +227,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/lgpl.html b/doc/html/lgpl.html index 65e9732a0c..757f0bc84f 100644 --- a/doc/html/lgpl.html +++ b/doc/html/lgpl.html @@ -528,6 +528,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/licenses-fonts.html b/doc/html/licenses-fonts.html index ee6281be53..773132a443 100644 --- a/doc/html/licenses-fonts.html +++ b/doc/html/licenses-fonts.html @@ -199,6 +199,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/licenses.html b/doc/html/licenses.html index 67a39ad899..984e48567b 100644 --- a/doc/html/licenses.html +++ b/doc/html/licenses.html @@ -72,6 +72,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/licensing.html b/doc/html/licensing.html index 9c91e474dd..f913c640eb 100644 --- a/doc/html/licensing.html +++ b/doc/html/licensing.html @@ -31,6 +31,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/location-overview.html b/doc/html/location-overview.html index c7df4fa6c0..62e16facfb 100644 --- a/doc/html/location-overview.html +++ b/doc/html/location-overview.html @@ -187,6 +187,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/location.html b/doc/html/location.html index 47cb283429..f4fdf185bc 100644 --- a/doc/html/location.html +++ b/doc/html/location.html @@ -26,6 +26,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/logfilepositionsource-clientapplication-cpp.html b/doc/html/logfilepositionsource-clientapplication-cpp.html index f4a0714335..31d7f303c5 100644 --- a/doc/html/logfilepositionsource-clientapplication-cpp.html +++ b/doc/html/logfilepositionsource-clientapplication-cpp.html @@ -77,6 +77,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/logfilepositionsource-clientapplication-h.html b/doc/html/logfilepositionsource-clientapplication-h.html index 7449ad86dc..362368ae17 100644 --- a/doc/html/logfilepositionsource-clientapplication-h.html +++ b/doc/html/logfilepositionsource-clientapplication-h.html @@ -79,6 +79,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/logfilepositionsource-logfilepositionsource-cpp.html b/doc/html/logfilepositionsource-logfilepositionsource-cpp.html index 9419db0f8f..aac088d83a 100644 --- a/doc/html/logfilepositionsource-logfilepositionsource-cpp.html +++ b/doc/html/logfilepositionsource-logfilepositionsource-cpp.html @@ -136,6 +136,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/logfilepositionsource-logfilepositionsource-h.html b/doc/html/logfilepositionsource-logfilepositionsource-h.html index a2defee95b..882fc2c00f 100644 --- a/doc/html/logfilepositionsource-logfilepositionsource-h.html +++ b/doc/html/logfilepositionsource-logfilepositionsource-h.html @@ -94,6 +94,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/logfilepositionsource-logfilepositionsource-pro.html b/doc/html/logfilepositionsource-logfilepositionsource-pro.html index 8933c8d987..510fc6a6ed 100644 --- a/doc/html/logfilepositionsource-logfilepositionsource-pro.html +++ b/doc/html/logfilepositionsource-logfilepositionsource-pro.html @@ -25,17 +25,25 @@ CONFIG += console include(../examples.pri) - qtAddLibrary(QtLocation) + CONFIG += mobility + MOBILITY = location - logfileexample.path = $$DESTDIR - logfileexample.files = simplelog.txt - logfileexample.CONFIG = no_link no_dependencies explicit_dependencies no_build combine ignore_no_exist no_clean - INSTALLS += logfileexample - build_pass:ALL_DEPS+=install_logfileexample</pre> + symbian: { + addFiles.sources = simplelog.txt + DEPLOYMENT += addFiles + + TARGET.CAPABILITY = Location + } else { + logfileexample.path = $$DESTDIR + logfileexample.files = simplelog.txt + logfileexample.CONFIG = no_link no_dependencies explicit_dependencies no_build combine ignore_no_exist no_clean + INSTALLS += logfileexample + build_pass:ALL_DEPS+=install_logfileexample + }</pre> <p /><address><hr /><div align="center"> <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/logfilepositionsource-main-cpp.html b/doc/html/logfilepositionsource-main-cpp.html index 2abee57c34..4e42c89b35 100644 --- a/doc/html/logfilepositionsource-main-cpp.html +++ b/doc/html/logfilepositionsource-main-cpp.html @@ -69,6 +69,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/logfilepositionsource.html b/doc/html/logfilepositionsource.html index d7ec9a58ed..a4092add84 100644 --- a/doc/html/logfilepositionsource.html +++ b/doc/html/logfilepositionsource.html @@ -27,6 +27,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/messaging.html b/doc/html/messaging.html index 34be76ec4a..25a1188f32 100644 --- a/doc/html/messaging.html +++ b/doc/html/messaging.html @@ -136,6 +136,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/mobility.html b/doc/html/mobility.html index 75cf4dccda..cccfa18235 100644 --- a/doc/html/mobility.html +++ b/doc/html/mobility.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- index.qdoc --> <head> - <title>Qt Mobility Project 1.0: Qt Mobility Project APIs (Technical Preview)</title> + <title>Qt Mobility Project 1.0: Qt Mobility Project APIs</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -12,7 +12,7 @@ <tr> <td align="left" valign="top" width="32"><a href="http://qt.nokia.com/"><img src="images/qtlogo.png" align="left" border="0" /></a></td> <td width="1"> </td><td class="postheader" valign="center"><a href="index.html"><font color="#004faf">Home</font></a> · <a href="classes.html"><font color="#004faf">All Classes</font></a> · <a href="functions.html"><font color="#004faf">All Functions</font></a> ·</td> -<td align="right" valign="top" width="230"><img src="images/codeless.png" border="0" /></td></tr></table><h1 class="title">Qt Mobility Project APIs (Technical Preview)<br /><span class="subtitle"></span> +<td align="right" valign="top" width="230"><img src="images/codeless.png" border="0" /></td></tr></table><h1 class="title">Qt Mobility Project APIs<br /><span class="subtitle"></span> </h1> <p>Qt Mobility Project supplies a set of new APIs for Qt enabling a range of mobile-centric technologies and features on mobile and non-mobile platforms.</p> <p><table width="100%" class="annotated" cellpadding="2" cellspacing="1" border="0"> @@ -21,6 +21,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/multimedia.html b/doc/html/multimedia.html index 83012ad909..33ddec5cd1 100644 --- a/doc/html/multimedia.html +++ b/doc/html/multimedia.html @@ -114,6 +114,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/opensourceedition.html b/doc/html/opensourceedition.html index aac12c0915..a1823995f2 100644 --- a/doc/html/opensourceedition.html +++ b/doc/html/opensourceedition.html @@ -31,6 +31,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/player-main-cpp.html b/doc/html/player-main-cpp.html index 5b98fdfaf8..cfb2677eed 100644 --- a/doc/html/player-main-cpp.html +++ b/doc/html/player-main-cpp.html @@ -71,6 +71,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/player-player-cpp.html b/doc/html/player-player-cpp.html index 4fbd33888f..c8f89557eb 100644 --- a/doc/html/player-player-cpp.html +++ b/doc/html/player-player-cpp.html @@ -332,6 +332,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/player-player-h.html b/doc/html/player-player-h.html index a5a926ad11..abe35017b5 100644 --- a/doc/html/player-player-h.html +++ b/doc/html/player-player-h.html @@ -123,6 +123,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/player-player-pro.html b/doc/html/player-player-pro.html index fe80ec5e1d..bc16483e22 100644 --- a/doc/html/player-player-pro.html +++ b/doc/html/player-player-pro.html @@ -19,7 +19,8 @@ INCLUDEPATH += ../../src/multimedia include(../examples.pri) - qtAddLibrary(QtMedia) + CONFIG += mobility + MOBILITY = multimedia HEADERS = \ player.h \ @@ -35,6 +36,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/player-playercontrols-cpp.html b/doc/html/player-playercontrols-cpp.html index 5831072767..8153e7f9ea 100644 --- a/doc/html/player-playercontrols-cpp.html +++ b/doc/html/player-playercontrols-cpp.html @@ -222,6 +222,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/player-playercontrols-h.html b/doc/html/player-playercontrols-h.html index 4d38d41bb8..099d6246bc 100644 --- a/doc/html/player-playercontrols-h.html +++ b/doc/html/player-playercontrols-h.html @@ -117,6 +117,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/player-playlistmodel-cpp.html b/doc/html/player-playlistmodel-cpp.html index 747912dd7f..1cb575cedb 100644 --- a/doc/html/player-playlistmodel-cpp.html +++ b/doc/html/player-playlistmodel-cpp.html @@ -174,6 +174,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/player-playlistmodel-h.html b/doc/html/player-playlistmodel-h.html index af468ab703..1a814e6c96 100644 --- a/doc/html/player-playlistmodel-h.html +++ b/doc/html/player-playlistmodel-h.html @@ -108,6 +108,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/player-videowidget-cpp.html b/doc/html/player-videowidget-cpp.html index 1f9395e4df..85539447bd 100644 --- a/doc/html/player-videowidget-cpp.html +++ b/doc/html/player-videowidget-cpp.html @@ -89,6 +89,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/player-videowidget-h.html b/doc/html/player-videowidget-h.html index 98cea88ed2..70af93e52c 100644 --- a/doc/html/player-videowidget-h.html +++ b/doc/html/player-videowidget-h.html @@ -76,6 +76,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/player.html b/doc/html/player.html index 2df1693059..0e8720c16f 100644 --- a/doc/html/player.html +++ b/doc/html/player.html @@ -61,6 +61,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/preview.html b/doc/html/preview.html index 2292d8a95d..b373beddb3 100644 --- a/doc/html/preview.html +++ b/doc/html/preview.html @@ -39,6 +39,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/publ-subs.html b/doc/html/publ-subs.html index b704db0102..a650616e8c 100644 --- a/doc/html/publ-subs.html +++ b/doc/html/publ-subs.html @@ -119,6 +119,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/publish-subscribe-main-cpp.html b/doc/html/publish-subscribe-main-cpp.html index fa4c8af41a..7eda9bc6e7 100644 --- a/doc/html/publish-subscribe-main-cpp.html +++ b/doc/html/publish-subscribe-main-cpp.html @@ -123,6 +123,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/publish-subscribe-publish-subscribe-pro.html b/doc/html/publish-subscribe-publish-subscribe-pro.html index 9088b13a03..df267a2c11 100644 --- a/doc/html/publish-subscribe-publish-subscribe-pro.html +++ b/doc/html/publish-subscribe-publish-subscribe-pro.html @@ -24,6 +24,7 @@ crmlFiles.path = c:/resource/qt/crml DEPLOYMENT += crmlFiles + #This is Symbian Signed UID3. Needs to match with uidValue in example.qcrml. TARGET.UID3 = 0x2002AC79 } @@ -38,11 +39,13 @@ subscriberdialog.ui include(../examples.pri) - qtAddLibrary(QtPublishSubscribe)</pre> + + CONFIG += mobility + MOBILITY = publishsubscribe</pre> <p /><address><hr /><div align="center"> <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/publish-subscribe-publisherdialog-cpp.html b/doc/html/publish-subscribe-publisherdialog-cpp.html index 66c8bac8dd..9e19960aa9 100644 --- a/doc/html/publish-subscribe-publisherdialog-cpp.html +++ b/doc/html/publish-subscribe-publisherdialog-cpp.html @@ -138,6 +138,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/publish-subscribe-publisherdialog-h.html b/doc/html/publish-subscribe-publisherdialog-h.html index bb10a35b7b..e9583c53af 100644 --- a/doc/html/publish-subscribe-publisherdialog-h.html +++ b/doc/html/publish-subscribe-publisherdialog-h.html @@ -102,6 +102,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/publish-subscribe-subscriberdialog-cpp.html b/doc/html/publish-subscribe-subscriberdialog-cpp.html index 44d66d6f91..2f0112cfee 100644 --- a/doc/html/publish-subscribe-subscriberdialog-cpp.html +++ b/doc/html/publish-subscribe-subscriberdialog-cpp.html @@ -138,6 +138,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/publish-subscribe-subscriberdialog-h.html b/doc/html/publish-subscribe-subscriberdialog-h.html index a23f1b87fc..6295b225d5 100644 --- a/doc/html/publish-subscribe-subscriberdialog-h.html +++ b/doc/html/publish-subscribe-subscriberdialog-h.html @@ -100,6 +100,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/publish-subscribe.html b/doc/html/publish-subscribe.html index bc134b1879..4411cb1a34 100644 --- a/doc/html/publish-subscribe.html +++ b/doc/html/publish-subscribe.html @@ -118,6 +118,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qabstractsecuritysession-members.html b/doc/html/qabstractsecuritysession-members.html index 78de837e6b..848f964f40 100644 --- a/doc/html/qabstractsecuritysession-members.html +++ b/doc/html/qabstractsecuritysession-members.html @@ -72,6 +72,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qabstractsecuritysession.html b/doc/html/qabstractsecuritysession.html index d9711e486d..20bc39766f 100644 --- a/doc/html/qabstractsecuritysession.html +++ b/doc/html/qabstractsecuritysession.html @@ -65,6 +65,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qabstractvaluespacelayer-members.html b/doc/html/qabstractvaluespacelayer-members.html index f723a7a91f..88e30e0b96 100644 --- a/doc/html/qabstractvaluespacelayer-members.html +++ b/doc/html/qabstractvaluespacelayer-members.html @@ -91,6 +91,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qabstractvaluespacelayer.html b/doc/html/qabstractvaluespacelayer.html index bfd12cac6a..cbd81e8a0b 100644 --- a/doc/html/qabstractvaluespacelayer.html +++ b/doc/html/qabstractvaluespacelayer.html @@ -205,6 +205,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qaudiocapturesource-members.html b/doc/html/qaudiocapturesource-members.html index 5da04b34e5..04f2cde087 100644 --- a/doc/html/qaudiocapturesource-members.html +++ b/doc/html/qaudiocapturesource-members.html @@ -98,6 +98,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qaudiocapturesource.html b/doc/html/qaudiocapturesource.html index 0dae52c78e..28b5c50795 100644 --- a/doc/html/qaudiocapturesource.html +++ b/doc/html/qaudiocapturesource.html @@ -127,6 +127,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qaudiodevicecontrol-members.html b/doc/html/qaudiodevicecontrol-members.html index c20139159b..f543fb5d62 100644 --- a/doc/html/qaudiodevicecontrol-members.html +++ b/doc/html/qaudiodevicecontrol-members.html @@ -81,6 +81,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qaudiodevicecontrol.html b/doc/html/qaudiodevicecontrol.html index 5a30b9c1a7..495993fa04 100644 --- a/doc/html/qaudiodevicecontrol.html +++ b/doc/html/qaudiodevicecontrol.html @@ -133,6 +133,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qaudioencodercontrol-members.html b/doc/html/qaudioencodercontrol-members.html index ef06080702..d2a92cf464 100644 --- a/doc/html/qaudioencodercontrol-members.html +++ b/doc/html/qaudioencodercontrol-members.html @@ -79,6 +79,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qaudioencodercontrol.html b/doc/html/qaudioencodercontrol.html index 93be61eb55..c9dd6aaa72 100644 --- a/doc/html/qaudioencodercontrol.html +++ b/doc/html/qaudioencodercontrol.html @@ -118,6 +118,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qaudioencodersettings-members.html b/doc/html/qaudioencodersettings-members.html index 6b0326fec2..d5150e42f6 100644 --- a/doc/html/qaudioencodersettings-members.html +++ b/doc/html/qaudioencodersettings-members.html @@ -43,6 +43,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qaudioencodersettings.html b/doc/html/qaudioencodersettings.html index aefa282099..8202747037 100644 --- a/doc/html/qaudioencodersettings.html +++ b/doc/html/qaudioencodersettings.html @@ -133,6 +133,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qaudioformat-members.html b/doc/html/qaudioformat-members.html index fc3246708f..925311c1e7 100644 --- a/doc/html/qaudioformat-members.html +++ b/doc/html/qaudioformat-members.html @@ -45,6 +45,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qaudioformat.html b/doc/html/qaudioformat.html index bd6891f7d1..1188b9490c 100644 --- a/doc/html/qaudioformat.html +++ b/doc/html/qaudioformat.html @@ -175,6 +175,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcamera-members.html b/doc/html/qcamera-members.html index 0ba3d2c7d1..feb6b457e3 100644 --- a/doc/html/qcamera-members.html +++ b/doc/html/qcamera-members.html @@ -178,6 +178,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcamera.html b/doc/html/qcamera.html index fb762669cf..659c7173f3 100644 --- a/doc/html/qcamera.html +++ b/doc/html/qcamera.html @@ -651,6 +651,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcameracontrol-members.html b/doc/html/qcameracontrol-members.html index 737b24978c..21f3ae81bf 100644 --- a/doc/html/qcameracontrol-members.html +++ b/doc/html/qcameracontrol-members.html @@ -76,6 +76,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcameracontrol.html b/doc/html/qcameracontrol.html index d91b6e86da..891800c8b7 100644 --- a/doc/html/qcameracontrol.html +++ b/doc/html/qcameracontrol.html @@ -108,6 +108,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcameraexposurecontrol-members.html b/doc/html/qcameraexposurecontrol-members.html index 44ad6d1e8a..ef7eb4f407 100644 --- a/doc/html/qcameraexposurecontrol-members.html +++ b/doc/html/qcameraexposurecontrol-members.html @@ -110,6 +110,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcameraexposurecontrol.html b/doc/html/qcameraexposurecontrol.html index e696fd2e60..2df48ffc47 100644 --- a/doc/html/qcameraexposurecontrol.html +++ b/doc/html/qcameraexposurecontrol.html @@ -257,6 +257,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcamerafocuscontrol-members.html b/doc/html/qcamerafocuscontrol-members.html index 0d66f33645..284c455c43 100644 --- a/doc/html/qcamerafocuscontrol-members.html +++ b/doc/html/qcamerafocuscontrol-members.html @@ -88,6 +88,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcamerafocuscontrol.html b/doc/html/qcamerafocuscontrol.html index fb30e80044..afd437db77 100644 --- a/doc/html/qcamerafocuscontrol.html +++ b/doc/html/qcamerafocuscontrol.html @@ -165,6 +165,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontact-members.html b/doc/html/qcontact-members.html index 85d13778a8..f3cce10ded 100644 --- a/doc/html/qcontact-members.html +++ b/doc/html/qcontact-members.html @@ -57,6 +57,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontact.html b/doc/html/qcontact.html index 9d70dbb137..7080f97f7b 100644 --- a/doc/html/qcontact.html +++ b/doc/html/qcontact.html @@ -181,6 +181,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactabstractrequest-members.html b/doc/html/qcontactabstractrequest-members.html index bdaaa776b8..fd1172198f 100644 --- a/doc/html/qcontactabstractrequest-members.html +++ b/doc/html/qcontactabstractrequest-members.html @@ -86,6 +86,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactabstractrequest.html b/doc/html/qcontactabstractrequest.html index 2f633d5533..3267ab518e 100644 --- a/doc/html/qcontactabstractrequest.html +++ b/doc/html/qcontactabstractrequest.html @@ -180,6 +180,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactaction-members.html b/doc/html/qcontactaction-members.html index 01064928c5..89ddf0001d 100644 --- a/doc/html/qcontactaction-members.html +++ b/doc/html/qcontactaction-members.html @@ -82,6 +82,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactaction.html b/doc/html/qcontactaction.html index 8317fce9f3..250c3730ef 100644 --- a/doc/html/qcontactaction.html +++ b/doc/html/qcontactaction.html @@ -141,6 +141,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactactiondescriptor-members.html b/doc/html/qcontactactiondescriptor-members.html index a6cab722b5..e1e89cf674 100644 --- a/doc/html/qcontactactiondescriptor-members.html +++ b/doc/html/qcontactactiondescriptor-members.html @@ -33,6 +33,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactactiondescriptor.html b/doc/html/qcontactactiondescriptor.html index 86f4ceae6c..9a0764959b 100644 --- a/doc/html/qcontactactiondescriptor.html +++ b/doc/html/qcontactactiondescriptor.html @@ -90,6 +90,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactactionfactory-members.html b/doc/html/qcontactactionfactory-members.html index d4be24207e..2f9020ad21 100644 --- a/doc/html/qcontactactionfactory-members.html +++ b/doc/html/qcontactactionfactory-members.html @@ -74,6 +74,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactactionfactory.html b/doc/html/qcontactactionfactory.html index 0f3697aa01..3b368e9a50 100644 --- a/doc/html/qcontactactionfactory.html +++ b/doc/html/qcontactactionfactory.html @@ -67,6 +67,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactactionfilter-members.html b/doc/html/qcontactactionfilter-members.html index 8cbff7fa6c..7e97a38f66 100644 --- a/doc/html/qcontactactionfilter-members.html +++ b/doc/html/qcontactactionfilter-members.html @@ -41,6 +41,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactactionfilter.html b/doc/html/qcontactactionfilter.html index 2a6982a9c0..d93509db0b 100644 --- a/doc/html/qcontactactionfilter.html +++ b/doc/html/qcontactactionfilter.html @@ -80,6 +80,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactaddress-members.html b/doc/html/qcontactaddress-members.html index 1c63a11432..b28608a267 100644 --- a/doc/html/qcontactaddress-members.html +++ b/doc/html/qcontactaddress-members.html @@ -73,6 +73,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactaddress.html b/doc/html/qcontactaddress.html index 7955462edf..ccf060f25b 100644 --- a/doc/html/qcontactaddress.html +++ b/doc/html/qcontactaddress.html @@ -169,6 +169,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactanniversary-members.html b/doc/html/qcontactanniversary-members.html index 225526f1af..05a865d155 100644 --- a/doc/html/qcontactanniversary-members.html +++ b/doc/html/qcontactanniversary-members.html @@ -64,6 +64,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactanniversary.html b/doc/html/qcontactanniversary.html index 8b9889221c..54154c564b 100644 --- a/doc/html/qcontactanniversary.html +++ b/doc/html/qcontactanniversary.html @@ -128,6 +128,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactavatar-members.html b/doc/html/qcontactavatar-members.html index da80542be3..bb12f9705f 100644 --- a/doc/html/qcontactavatar-members.html +++ b/doc/html/qcontactavatar-members.html @@ -58,6 +58,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactavatar.html b/doc/html/qcontactavatar.html index 6a03210c23..1a83e05391 100644 --- a/doc/html/qcontactavatar.html +++ b/doc/html/qcontactavatar.html @@ -100,6 +100,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactbirthday-members.html b/doc/html/qcontactbirthday-members.html index e62bccff4d..247cdc248a 100644 --- a/doc/html/qcontactbirthday-members.html +++ b/doc/html/qcontactbirthday-members.html @@ -50,6 +50,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactbirthday.html b/doc/html/qcontactbirthday.html index ed3e9aeba5..04c79f6c92 100644 --- a/doc/html/qcontactbirthday.html +++ b/doc/html/qcontactbirthday.html @@ -66,6 +66,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactchangelogfilter-members.html b/doc/html/qcontactchangelogfilter-members.html index 5aa09bb693..7971749712 100644 --- a/doc/html/qcontactchangelogfilter-members.html +++ b/doc/html/qcontactchangelogfilter-members.html @@ -35,6 +35,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactchangelogfilter.html b/doc/html/qcontactchangelogfilter.html index 216ea62e0f..b96d6cd834 100644 --- a/doc/html/qcontactchangelogfilter.html +++ b/doc/html/qcontactchangelogfilter.html @@ -85,6 +85,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactchangeset-members.html b/doc/html/qcontactchangeset-members.html index 908a3ee119..a523782384 100644 --- a/doc/html/qcontactchangeset-members.html +++ b/doc/html/qcontactchangeset-members.html @@ -34,6 +34,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactchangeset.html b/doc/html/qcontactchangeset.html index 84a3b1bbce..82eb68e782 100644 --- a/doc/html/qcontactchangeset.html +++ b/doc/html/qcontactchangeset.html @@ -92,6 +92,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactdetail-members.html b/doc/html/qcontactdetail-members.html index 476660e8ae..16d3a14f14 100644 --- a/doc/html/qcontactdetail-members.html +++ b/doc/html/qcontactdetail-members.html @@ -51,6 +51,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactdetail.html b/doc/html/qcontactdetail.html index a6c0d67702..0f2f944c2e 100644 --- a/doc/html/qcontactdetail.html +++ b/doc/html/qcontactdetail.html @@ -228,6 +228,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactdetaildefinition-members.html b/doc/html/qcontactdetaildefinition-members.html index 473ddea09c..25f66952d2 100644 --- a/doc/html/qcontactdetaildefinition-members.html +++ b/doc/html/qcontactdetaildefinition-members.html @@ -41,6 +41,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactdetaildefinition.html b/doc/html/qcontactdetaildefinition.html index e9be8f39e1..6389fb967f 100644 --- a/doc/html/qcontactdetaildefinition.html +++ b/doc/html/qcontactdetaildefinition.html @@ -122,6 +122,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactdetaildefinitionfetchrequest-members.html b/doc/html/qcontactdetaildefinitionfetchrequest-members.html index 19c4213cf8..7d571db213 100644 --- a/doc/html/qcontactdetaildefinitionfetchrequest-members.html +++ b/doc/html/qcontactdetaildefinitionfetchrequest-members.html @@ -91,6 +91,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactdetaildefinitionfetchrequest.html b/doc/html/qcontactdetaildefinitionfetchrequest.html index d6d27fc3b2..52350ec451 100644 --- a/doc/html/qcontactdetaildefinitionfetchrequest.html +++ b/doc/html/qcontactdetaildefinitionfetchrequest.html @@ -92,6 +92,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactdetaildefinitionfield-members.html b/doc/html/qcontactdetaildefinitionfield-members.html index b42867c7ec..48d67c5c53 100644 --- a/doc/html/qcontactdetaildefinitionfield-members.html +++ b/doc/html/qcontactdetaildefinitionfield-members.html @@ -33,6 +33,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactdetaildefinitionfield.html b/doc/html/qcontactdetaildefinitionfield.html index 40304d6321..697200acc0 100644 --- a/doc/html/qcontactdetaildefinitionfield.html +++ b/doc/html/qcontactdetaildefinitionfield.html @@ -105,6 +105,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactdetaildefinitionremoverequest-members.html b/doc/html/qcontactdetaildefinitionremoverequest-members.html index 91c0ea1991..b950c3e35b 100644 --- a/doc/html/qcontactdetaildefinitionremoverequest-members.html +++ b/doc/html/qcontactdetaildefinitionremoverequest-members.html @@ -90,6 +90,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactdetaildefinitionremoverequest.html b/doc/html/qcontactdetaildefinitionremoverequest.html index 1c59f2c544..33ba5f99b4 100644 --- a/doc/html/qcontactdetaildefinitionremoverequest.html +++ b/doc/html/qcontactdetaildefinitionremoverequest.html @@ -88,6 +88,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactdetaildefinitionsaverequest-members.html b/doc/html/qcontactdetaildefinitionsaverequest-members.html index 990f57f99c..5042b1d2ae 100644 --- a/doc/html/qcontactdetaildefinitionsaverequest-members.html +++ b/doc/html/qcontactdetaildefinitionsaverequest-members.html @@ -90,6 +90,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactdetaildefinitionsaverequest.html b/doc/html/qcontactdetaildefinitionsaverequest.html index 1c869211a5..a87b840343 100644 --- a/doc/html/qcontactdetaildefinitionsaverequest.html +++ b/doc/html/qcontactdetaildefinitionsaverequest.html @@ -88,6 +88,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactdetailfilter-members.html b/doc/html/qcontactdetailfilter-members.html index 9967e176c6..f058c7cc64 100644 --- a/doc/html/qcontactdetailfilter-members.html +++ b/doc/html/qcontactdetailfilter-members.html @@ -41,6 +41,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactdetailfilter.html b/doc/html/qcontactdetailfilter.html index e953305645..19bd60fda1 100644 --- a/doc/html/qcontactdetailfilter.html +++ b/doc/html/qcontactdetailfilter.html @@ -80,6 +80,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactdetailrangefilter-members.html b/doc/html/qcontactdetailrangefilter-members.html index 17f9cff0a8..c3d12dac41 100644 --- a/doc/html/qcontactdetailrangefilter-members.html +++ b/doc/html/qcontactdetailrangefilter-members.html @@ -45,6 +45,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactdetailrangefilter.html b/doc/html/qcontactdetailrangefilter.html index 05ce6d09f5..a544ed0032 100644 --- a/doc/html/qcontactdetailrangefilter.html +++ b/doc/html/qcontactdetailrangefilter.html @@ -115,6 +115,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactdisplaylabel-members.html b/doc/html/qcontactdisplaylabel-members.html index 1abc62affc..d21279b1e9 100644 --- a/doc/html/qcontactdisplaylabel-members.html +++ b/doc/html/qcontactdisplaylabel-members.html @@ -49,6 +49,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactdisplaylabel.html b/doc/html/qcontactdisplaylabel.html index 34cc9641f8..3248cd1760 100644 --- a/doc/html/qcontactdisplaylabel.html +++ b/doc/html/qcontactdisplaylabel.html @@ -60,6 +60,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactemailaddress-members.html b/doc/html/qcontactemailaddress-members.html index d28365488b..5607a98d85 100644 --- a/doc/html/qcontactemailaddress-members.html +++ b/doc/html/qcontactemailaddress-members.html @@ -50,6 +50,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactemailaddress.html b/doc/html/qcontactemailaddress.html index 8b577edd02..966d3157df 100644 --- a/doc/html/qcontactemailaddress.html +++ b/doc/html/qcontactemailaddress.html @@ -66,6 +66,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactfamily-members.html b/doc/html/qcontactfamily-members.html index 26024bc1fa..2f5fe7a591 100644 --- a/doc/html/qcontactfamily-members.html +++ b/doc/html/qcontactfamily-members.html @@ -53,6 +53,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactfamily.html b/doc/html/qcontactfamily.html index fdbe55854a..ac6118c067 100644 --- a/doc/html/qcontactfamily.html +++ b/doc/html/qcontactfamily.html @@ -80,6 +80,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactfetchrequest-members.html b/doc/html/qcontactfetchrequest-members.html index 29289e7aa8..cefd5661f9 100644 --- a/doc/html/qcontactfetchrequest-members.html +++ b/doc/html/qcontactfetchrequest-members.html @@ -93,6 +93,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactfetchrequest.html b/doc/html/qcontactfetchrequest.html index 6ea426216a..028361884b 100644 --- a/doc/html/qcontactfetchrequest.html +++ b/doc/html/qcontactfetchrequest.html @@ -102,6 +102,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactfilter-members.html b/doc/html/qcontactfilter-members.html index ed78e0913c..5d37458bad 100644 --- a/doc/html/qcontactfilter-members.html +++ b/doc/html/qcontactfilter-members.html @@ -32,6 +32,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactfilter.html b/doc/html/qcontactfilter.html index 0391c1bfb3..516168ac08 100644 --- a/doc/html/qcontactfilter.html +++ b/doc/html/qcontactfilter.html @@ -129,6 +129,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactgender-members.html b/doc/html/qcontactgender-members.html index 37c26905fe..af0e73ef96 100644 --- a/doc/html/qcontactgender-members.html +++ b/doc/html/qcontactgender-members.html @@ -53,6 +53,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactgender.html b/doc/html/qcontactgender.html index 469b7178f3..76845a8af7 100644 --- a/doc/html/qcontactgender.html +++ b/doc/html/qcontactgender.html @@ -78,6 +78,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactgeolocation-members.html b/doc/html/qcontactgeolocation-members.html index 0dfc218086..80bc896182 100644 --- a/doc/html/qcontactgeolocation-members.html +++ b/doc/html/qcontactgeolocation-members.html @@ -74,6 +74,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactgeolocation.html b/doc/html/qcontactgeolocation.html index 52a99f90a5..3162424feb 100644 --- a/doc/html/qcontactgeolocation.html +++ b/doc/html/qcontactgeolocation.html @@ -178,6 +178,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactguid-members.html b/doc/html/qcontactguid-members.html index e77f884a19..b8c5b16437 100644 --- a/doc/html/qcontactguid-members.html +++ b/doc/html/qcontactguid-members.html @@ -50,6 +50,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactguid.html b/doc/html/qcontactguid.html index 1b0516b018..ca0efe4d52 100644 --- a/doc/html/qcontactguid.html +++ b/doc/html/qcontactguid.html @@ -66,6 +66,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactid-members.html b/doc/html/qcontactid-members.html index efa66c9665..f3002ebbd8 100644 --- a/doc/html/qcontactid-members.html +++ b/doc/html/qcontactid-members.html @@ -30,6 +30,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactid.html b/doc/html/qcontactid.html index b50228f8aa..eba66468bb 100644 --- a/doc/html/qcontactid.html +++ b/doc/html/qcontactid.html @@ -77,6 +77,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactintersectionfilter-members.html b/doc/html/qcontactintersectionfilter-members.html index 6f87b6a125..df46645cc8 100644 --- a/doc/html/qcontactintersectionfilter-members.html +++ b/doc/html/qcontactintersectionfilter-members.html @@ -40,6 +40,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactintersectionfilter.html b/doc/html/qcontactintersectionfilter.html index 4c4e538686..8b426f223e 100644 --- a/doc/html/qcontactintersectionfilter.html +++ b/doc/html/qcontactintersectionfilter.html @@ -75,6 +75,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactinvalidengine-members.html b/doc/html/qcontactinvalidengine-members.html index 69edeb11ff..67784dafa3 100644 --- a/doc/html/qcontactinvalidengine-members.html +++ b/doc/html/qcontactinvalidengine-members.html @@ -129,6 +129,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactinvalidengine.html b/doc/html/qcontactinvalidengine.html index 5edc754db0..eedd8b115e 100644 --- a/doc/html/qcontactinvalidengine.html +++ b/doc/html/qcontactinvalidengine.html @@ -72,6 +72,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactinvalidfilter-members.html b/doc/html/qcontactinvalidfilter-members.html index 01f6c04205..f12e6f24fc 100644 --- a/doc/html/qcontactinvalidfilter-members.html +++ b/doc/html/qcontactinvalidfilter-members.html @@ -30,6 +30,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactinvalidfilter.html b/doc/html/qcontactinvalidfilter.html index 4a08da29dc..5006a54952 100644 --- a/doc/html/qcontactinvalidfilter.html +++ b/doc/html/qcontactinvalidfilter.html @@ -45,6 +45,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactlocalidfetchrequest-members.html b/doc/html/qcontactlocalidfetchrequest-members.html index a799021033..93bab6440d 100644 --- a/doc/html/qcontactlocalidfetchrequest-members.html +++ b/doc/html/qcontactlocalidfetchrequest-members.html @@ -91,6 +91,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactlocalidfetchrequest.html b/doc/html/qcontactlocalidfetchrequest.html index 9fc9e92b04..00fb950b9a 100644 --- a/doc/html/qcontactlocalidfetchrequest.html +++ b/doc/html/qcontactlocalidfetchrequest.html @@ -92,6 +92,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactlocalidfilter-members.html b/doc/html/qcontactlocalidfilter-members.html index 94e82641a4..2ab72c8ca5 100644 --- a/doc/html/qcontactlocalidfilter-members.html +++ b/doc/html/qcontactlocalidfilter-members.html @@ -32,6 +32,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactlocalidfilter.html b/doc/html/qcontactlocalidfilter.html index d4630fbea5..c4b4a3bbb3 100644 --- a/doc/html/qcontactlocalidfilter.html +++ b/doc/html/qcontactlocalidfilter.html @@ -55,6 +55,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactmanager-members.html b/doc/html/qcontactmanager-members.html index 54fa341c2b..9c66fce163 100644 --- a/doc/html/qcontactmanager-members.html +++ b/doc/html/qcontactmanager-members.html @@ -116,6 +116,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactmanager.html b/doc/html/qcontactmanager.html index 5af9e2518e..9c62b05abf 100644 --- a/doc/html/qcontactmanager.html +++ b/doc/html/qcontactmanager.html @@ -326,6 +326,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactmanagerengine-members.html b/doc/html/qcontactmanagerengine-members.html index 67d779f209..6c2292cff2 100644 --- a/doc/html/qcontactmanagerengine-members.html +++ b/doc/html/qcontactmanagerengine-members.html @@ -129,6 +129,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactmanagerengine.html b/doc/html/qcontactmanagerengine.html index 1e6908e53a..e256079983 100644 --- a/doc/html/qcontactmanagerengine.html +++ b/doc/html/qcontactmanagerengine.html @@ -368,6 +368,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactmanagerenginefactory-members.html b/doc/html/qcontactmanagerenginefactory-members.html index 291d1e1822..2cdf197584 100644 --- a/doc/html/qcontactmanagerenginefactory-members.html +++ b/doc/html/qcontactmanagerenginefactory-members.html @@ -25,6 +25,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactmanagerenginefactory.html b/doc/html/qcontactmanagerenginefactory.html index 3e291115c6..0baf0af643 100644 --- a/doc/html/qcontactmanagerenginefactory.html +++ b/doc/html/qcontactmanagerenginefactory.html @@ -60,6 +60,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactmemoryengine-members.html b/doc/html/qcontactmemoryengine-members.html index 456b993fdb..a08b208b4b 100644 --- a/doc/html/qcontactmemoryengine-members.html +++ b/doc/html/qcontactmemoryengine-members.html @@ -131,6 +131,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactmemoryengine.html b/doc/html/qcontactmemoryengine.html index 2b665a93e9..10ed0be46c 100644 --- a/doc/html/qcontactmemoryengine.html +++ b/doc/html/qcontactmemoryengine.html @@ -194,6 +194,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactname-members.html b/doc/html/qcontactname-members.html index 519dd89ef3..02777cbd26 100644 --- a/doc/html/qcontactname-members.html +++ b/doc/html/qcontactname-members.html @@ -65,6 +65,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactname.html b/doc/html/qcontactname.html index 948dd00770..b5e5b08477 100644 --- a/doc/html/qcontactname.html +++ b/doc/html/qcontactname.html @@ -136,6 +136,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactnickname-members.html b/doc/html/qcontactnickname-members.html index fe566599cf..665cc43063 100644 --- a/doc/html/qcontactnickname-members.html +++ b/doc/html/qcontactnickname-members.html @@ -50,6 +50,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactnickname.html b/doc/html/qcontactnickname.html index 5c814ed1f4..44ec6c18f4 100644 --- a/doc/html/qcontactnickname.html +++ b/doc/html/qcontactnickname.html @@ -66,6 +66,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactnote-members.html b/doc/html/qcontactnote-members.html index bdbeb8a21e..fc6bb598de 100644 --- a/doc/html/qcontactnote-members.html +++ b/doc/html/qcontactnote-members.html @@ -50,6 +50,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactnote.html b/doc/html/qcontactnote.html index c4c770b91d..a4ff810027 100644 --- a/doc/html/qcontactnote.html +++ b/doc/html/qcontactnote.html @@ -66,6 +66,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactonlineaccount-members.html b/doc/html/qcontactonlineaccount-members.html index f5d6bdb264..5af49a26f0 100644 --- a/doc/html/qcontactonlineaccount-members.html +++ b/doc/html/qcontactonlineaccount-members.html @@ -77,6 +77,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactonlineaccount.html b/doc/html/qcontactonlineaccount.html index 827f3fe4b3..c51dc87778 100644 --- a/doc/html/qcontactonlineaccount.html +++ b/doc/html/qcontactonlineaccount.html @@ -183,6 +183,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactorganization-members.html b/doc/html/qcontactorganization-members.html index 64d860868e..139b5cb815 100644 --- a/doc/html/qcontactorganization-members.html +++ b/doc/html/qcontactorganization-members.html @@ -68,6 +68,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactorganization.html b/doc/html/qcontactorganization.html index 7f62bc136b..e7f436931e 100644 --- a/doc/html/qcontactorganization.html +++ b/doc/html/qcontactorganization.html @@ -150,6 +150,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactphonenumber-members.html b/doc/html/qcontactphonenumber-members.html index b5d19e165b..7edd6538e1 100644 --- a/doc/html/qcontactphonenumber-members.html +++ b/doc/html/qcontactphonenumber-members.html @@ -66,6 +66,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactphonenumber.html b/doc/html/qcontactphonenumber.html index e672370798..15af7808e8 100644 --- a/doc/html/qcontactphonenumber.html +++ b/doc/html/qcontactphonenumber.html @@ -131,6 +131,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactrelationship-members.html b/doc/html/qcontactrelationship-members.html index b9ea904650..3f0cc8dc26 100644 --- a/doc/html/qcontactrelationship-members.html +++ b/doc/html/qcontactrelationship-members.html @@ -42,6 +42,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactrelationship.html b/doc/html/qcontactrelationship.html index ea7c72a530..f18fd625dc 100644 --- a/doc/html/qcontactrelationship.html +++ b/doc/html/qcontactrelationship.html @@ -120,6 +120,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactrelationshipfetchrequest-members.html b/doc/html/qcontactrelationshipfetchrequest-members.html index 728335f99a..9fcf5edea6 100644 --- a/doc/html/qcontactrelationshipfetchrequest-members.html +++ b/doc/html/qcontactrelationshipfetchrequest-members.html @@ -94,6 +94,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactrelationshipfetchrequest.html b/doc/html/qcontactrelationshipfetchrequest.html index 187227504d..b8c1f64ab2 100644 --- a/doc/html/qcontactrelationshipfetchrequest.html +++ b/doc/html/qcontactrelationshipfetchrequest.html @@ -107,6 +107,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactrelationshipfilter-members.html b/doc/html/qcontactrelationshipfilter-members.html index c183a8194a..2a2a7ac3a2 100644 --- a/doc/html/qcontactrelationshipfilter-members.html +++ b/doc/html/qcontactrelationshipfilter-members.html @@ -41,6 +41,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactrelationshipfilter.html b/doc/html/qcontactrelationshipfilter.html index 52630cb760..851a3a3283 100644 --- a/doc/html/qcontactrelationshipfilter.html +++ b/doc/html/qcontactrelationshipfilter.html @@ -95,6 +95,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactrelationshipremoverequest-members.html b/doc/html/qcontactrelationshipremoverequest-members.html index 6a17cd9a15..834fe66dc0 100644 --- a/doc/html/qcontactrelationshipremoverequest-members.html +++ b/doc/html/qcontactrelationshipremoverequest-members.html @@ -92,6 +92,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactrelationshipremoverequest.html b/doc/html/qcontactrelationshipremoverequest.html index d18c62e0d1..24a9e127ab 100644 --- a/doc/html/qcontactrelationshipremoverequest.html +++ b/doc/html/qcontactrelationshipremoverequest.html @@ -98,6 +98,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactrelationshipsaverequest-members.html b/doc/html/qcontactrelationshipsaverequest-members.html index 9ee6989b35..1bb08d68de 100644 --- a/doc/html/qcontactrelationshipsaverequest-members.html +++ b/doc/html/qcontactrelationshipsaverequest-members.html @@ -88,6 +88,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactrelationshipsaverequest.html b/doc/html/qcontactrelationshipsaverequest.html index c7347d41b9..e7fed71982 100644 --- a/doc/html/qcontactrelationshipsaverequest.html +++ b/doc/html/qcontactrelationshipsaverequest.html @@ -78,6 +78,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactremoverequest-members.html b/doc/html/qcontactremoverequest-members.html index fbed7b1bc8..9b95b9c408 100644 --- a/doc/html/qcontactremoverequest-members.html +++ b/doc/html/qcontactremoverequest-members.html @@ -88,6 +88,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactremoverequest.html b/doc/html/qcontactremoverequest.html index 240939fa84..fec45cd8d9 100644 --- a/doc/html/qcontactremoverequest.html +++ b/doc/html/qcontactremoverequest.html @@ -78,6 +78,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactsaverequest-members.html b/doc/html/qcontactsaverequest-members.html index 9d91aaf9d6..ed610a937c 100644 --- a/doc/html/qcontactsaverequest-members.html +++ b/doc/html/qcontactsaverequest-members.html @@ -88,6 +88,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactsaverequest.html b/doc/html/qcontactsaverequest.html index e7c55575cd..033192bd5c 100644 --- a/doc/html/qcontactsaverequest.html +++ b/doc/html/qcontactsaverequest.html @@ -78,6 +78,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactsortorder-members.html b/doc/html/qcontactsortorder-members.html index 5ec1c0cf48..6d368b087b 100644 --- a/doc/html/qcontactsortorder-members.html +++ b/doc/html/qcontactsortorder-members.html @@ -42,6 +42,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactsortorder.html b/doc/html/qcontactsortorder.html index 4ada5cda02..fea2918224 100644 --- a/doc/html/qcontactsortorder.html +++ b/doc/html/qcontactsortorder.html @@ -129,6 +129,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactsynctarget-members.html b/doc/html/qcontactsynctarget-members.html index 6f27aa9c9e..796a0a1779 100644 --- a/doc/html/qcontactsynctarget-members.html +++ b/doc/html/qcontactsynctarget-members.html @@ -50,6 +50,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactsynctarget.html b/doc/html/qcontactsynctarget.html index 2ad7c9590d..5c00673640 100644 --- a/doc/html/qcontactsynctarget.html +++ b/doc/html/qcontactsynctarget.html @@ -66,6 +66,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontacttimestamp-members.html b/doc/html/qcontacttimestamp-members.html index a275d9bdd8..876adda633 100644 --- a/doc/html/qcontacttimestamp-members.html +++ b/doc/html/qcontacttimestamp-members.html @@ -53,6 +53,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontacttimestamp.html b/doc/html/qcontacttimestamp.html index f2e1b3a730..82173e7687 100644 --- a/doc/html/qcontacttimestamp.html +++ b/doc/html/qcontacttimestamp.html @@ -80,6 +80,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontacttype-members.html b/doc/html/qcontacttype-members.html index b49b3cdebf..8b69ff67d2 100644 --- a/doc/html/qcontacttype-members.html +++ b/doc/html/qcontacttype-members.html @@ -52,6 +52,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontacttype.html b/doc/html/qcontacttype.html index d825e28f4b..9c2692125e 100644 --- a/doc/html/qcontacttype.html +++ b/doc/html/qcontacttype.html @@ -74,6 +74,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactunionfilter-members.html b/doc/html/qcontactunionfilter-members.html index 0a0aad446e..1adea5ffd8 100644 --- a/doc/html/qcontactunionfilter-members.html +++ b/doc/html/qcontactunionfilter-members.html @@ -40,6 +40,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactunionfilter.html b/doc/html/qcontactunionfilter.html index 007a346603..f886fb2b03 100644 --- a/doc/html/qcontactunionfilter.html +++ b/doc/html/qcontactunionfilter.html @@ -75,6 +75,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontacturl-members.html b/doc/html/qcontacturl-members.html index fea24b4c26..93a287960b 100644 --- a/doc/html/qcontacturl-members.html +++ b/doc/html/qcontacturl-members.html @@ -56,6 +56,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontacturl.html b/doc/html/qcontacturl.html index dd5efc24c4..fc9b9553b1 100644 --- a/doc/html/qcontacturl.html +++ b/doc/html/qcontacturl.html @@ -88,6 +88,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qgeoareamonitor-members.html b/doc/html/qgeoareamonitor-members.html new file mode 100644 index 0000000000..52da971fb5 --- /dev/null +++ b/doc/html/qgeoareamonitor-members.html @@ -0,0 +1,83 @@ +<?xml version="1.0" encoding="iso-8859-1"?> +<!DOCTYPE html + PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<!-- qgeoareamonitor.cpp --> +<head> + <title>Qt Mobility Project 1.0: List of All Members for QGeoAreaMonitor</title> + <link href="classic.css" rel="stylesheet" type="text/css" /> +</head> +<body> +<table border="0" cellpadding="0" cellspacing="0" width="100%"> +<tr> +<td align="left" valign="top" width="32"><a href="http://qt.nokia.com/"><img src="images/qtlogo.png" align="left" border="0" /></a></td> +<td width="1"> </td><td class="postheader" valign="center"><a href="index.html"><font color="#004faf">Home</font></a> · <a href="classes.html"><font color="#004faf">All Classes</font></a> · <a href="functions.html"><font color="#004faf">All Functions</font></a> ·</td> +<td align="right" valign="top" width="230"><img src="images/codeless.png" border="0" /></td></tr></table><h1 class="title">List of All Members for QGeoAreaMonitor</h1> +<p>This is the complete list of members for <a href="qgeoareamonitor.html">QGeoAreaMonitor</a>, including inherited members.</p> +<p><table class="propsummary" width="100%" border="0" cellpadding="0" cellspacing="0"> +<tr><td width="45%" valign="top"><ul> +<li><div class="fn"><b><a href="qgeoareamonitor.html#QGeoAreaMonitor">QGeoAreaMonitor</a></b> ( QObject * )</div></li> +<li><div class="fn"><b><a href="qgeoareamonitor.html#dtor.QGeoAreaMonitor">~QGeoAreaMonitor</a></b> ()</div></li> +<li><div class="fn"><b><a href="qgeoareamonitor.html#areaEntered">areaEntered</a></b> ( const QGeoPositionInfo & )</div></li> +<li><div class="fn"><b><a href="qgeoareamonitor.html#areaExited">areaExited</a></b> ( const QGeoPositionInfo & )</div></li> +<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.5/qobject.html#blockSignals">blockSignals</a></b> ( bool )</div></li> +<li><div class="fn"><b><a href="qgeoareamonitor.html#center-prop">center</a></b> () const : QGeoCoordinate</div></li> +<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.5/qobject.html#childEvent">childEvent</a></b> ( QChildEvent * )</div></li> +<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.5/qobject.html#children">children</a></b> () const</div></li> +<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.5/qobject.html#connect">connect</a></b> ( const QObject *, const char *, const QObject *, const char *, Qt::ConnectionType )</div></li> +<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.5/qobject.html#connect-2">connect</a></b> ( const QObject *, const char *, const char *, Qt::ConnectionType ) const</div></li> +<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.5/qobject.html#connectNotify">connectNotify</a></b> ( const char * )</div></li> +<li><div class="fn"><b><a href="qgeoareamonitor.html#createDefaultMonitor">createDefaultMonitor</a></b> ( QObject * ) : QGeoAreaMonitor *</div></li> +<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.5/qobject.html#customEvent">customEvent</a></b> ( QEvent * )</div></li> +<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.5/qobject.html#d_ptr-var">d_ptr</a></b> : </div></li> +<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.5/qobject.html#deleteLater">deleteLater</a></b> ()</div></li> +<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.5/qobject.html#destroyed">destroyed</a></b> ( QObject * )</div></li> +<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.5/qobject.html#disconnect">disconnect</a></b> ( const QObject *, const char *, const QObject *, const char * )</div></li> +<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.5/qobject.html#disconnect-2">disconnect</a></b> ( const char *, const QObject *, const char * )</div></li> +<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.5/qobject.html#disconnect-3">disconnect</a></b> ( const QObject *, const char * )</div></li> +<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.5/qobject.html#disconnectNotify">disconnectNotify</a></b> ( const char * )</div></li> +<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.5/qobject.html#dumpObjectInfo">dumpObjectInfo</a></b> ()</div></li> +<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.5/qobject.html#dumpObjectTree">dumpObjectTree</a></b> ()</div></li> +<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.5/qobject.html#dynamicPropertyNames">dynamicPropertyNames</a></b> () const</div></li> +<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.5/qobject.html#event">event</a></b> ( QEvent * )</div></li> +<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.5/qobject.html#eventFilter">eventFilter</a></b> ( QObject *, QEvent * )</div></li> +<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.5/qobject.html#findChild">findChild</a></b> ( const QString & ) const</div></li> +<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.5/qobject.html#findChildren">findChildren</a></b> ( const QString & ) const</div></li> +</ul></td><td valign="top"><ul> +<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.5/qobject.html#findChildren-2">findChildren</a></b> ( const QRegExp & ) const</div></li> +<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.5/qobject.html#inherits">inherits</a></b> ( const char * ) const</div></li> +<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.5/qobject.html#installEventFilter">installEventFilter</a></b> ( QObject * )</div></li> +<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.5/qobject.html#isWidgetType">isWidgetType</a></b> () const</div></li> +<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.5/qobject.html#killTimer">killTimer</a></b> ( int )</div></li> +<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.5/qobject.html#metaObject">metaObject</a></b> () const</div></li> +<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.5/qobject.html#moveToThread">moveToThread</a></b> ( QThread * )</div></li> +<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.5/qobject.html#objectName-prop">objectName</a></b> () const</div></li> +<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.5/qobject.html#parent">parent</a></b> () const</div></li> +<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.5/qobject.html#property">property</a></b> ( const char * ) const</div></li> +<li><div class="fn"><b><a href="qgeoareamonitor.html#radius-prop">radius</a></b> () const : qreal</div></li> +<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.5/qobject.html#receivers">receivers</a></b> ( const char * ) const</div></li> +<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.5/qobject.html#removeEventFilter">removeEventFilter</a></b> ( QObject * )</div></li> +<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.5/qobject.html#sender">sender</a></b> () const</div></li> +<li><div class="fn"><b><a href="qgeoareamonitor.html#center-prop">setCenter</a></b> ( const QGeoCoordinate & )</div></li> +<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.5/qobject.html#objectName-prop">setObjectName</a></b> ( const QString & )</div></li> +<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.5/qobject.html#setParent">setParent</a></b> ( QObject * )</div></li> +<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.5/qobject.html#setProperty">setProperty</a></b> ( const char *, const QVariant & )</div></li> +<li><div class="fn"><b><a href="qgeoareamonitor.html#radius-prop">setRadius</a></b> ( qreal )</div></li> +<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.5/qobject.html#signalsBlocked">signalsBlocked</a></b> () const</div></li> +<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.5/qobject.html#startTimer">startTimer</a></b> ( int )</div></li> +<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.5/qobject.html#staticMetaObject-var">staticMetaObject</a></b> : </div></li> +<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.5/qobject.html#staticQtMetaObject-var">staticQtMetaObject</a></b> : </div></li> +<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.5/qobject.html#thread">thread</a></b> () const</div></li> +<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.5/qobject.html#timerEvent">timerEvent</a></b> ( QTimerEvent * )</div></li> +<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.5/qobject.html#tr">tr</a></b> ( const char *, const char *, int )</div></li> +<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.5/qobject.html#trUtf8">trUtf8</a></b> ( const char *, const char *, int )</div></li> +</ul> +</td></tr> +</table></p> +<p /><address><hr /><div align="center"> +<table width="100%" cellspacing="0" border="0"><tr class="address"> +<td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> +<td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> +</tr></table></div></address></body> +</html> diff --git a/doc/html/qgeoareamonitor.html b/doc/html/qgeoareamonitor.html new file mode 100644 index 0000000000..1b4a8bfc69 --- /dev/null +++ b/doc/html/qgeoareamonitor.html @@ -0,0 +1,155 @@ +<?xml version="1.0" encoding="iso-8859-1"?> +<!DOCTYPE html + PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<!-- qgeoareamonitor.cpp --> +<head> + <title>Qt Mobility Project 1.0: QGeoAreaMonitor Class Reference</title> + <link href="classic.css" rel="stylesheet" type="text/css" /> +</head> +<body> +<a name="//apple_ref/cpp/cl//QGeoAreaMonitor"></a> +<table border="0" cellpadding="0" cellspacing="0" width="100%"> +<tr> +<td align="left" valign="top" width="32"><a href="http://qt.nokia.com/"><img src="images/qtlogo.png" align="left" border="0" /></a></td> +<td width="1"> </td><td class="postheader" valign="center"><a href="index.html"><font color="#004faf">Home</font></a> · <a href="classes.html"><font color="#004faf">All Classes</font></a> · <a href="functions.html"><font color="#004faf">All Functions</font></a> ·</td> +<td align="right" valign="top" width="230"><img src="images/codeless.png" border="0" /></td></tr></table><h1 class="title">QGeoAreaMonitor Class Reference</h1> +<p>The QGeoAreaMonitor class enables the detection of proximity changes for a specified set of coordinates. <a href="#details">More...</a></p> +<pre> #include <QGeoAreaMonitor></pre><p>Inherits <a href="http://qt.nokia.com/doc/4.5/qobject.html">QObject</a>.</p> +<ul> +<li><a href="qgeoareamonitor-members.html">List of all members, including inherited members</a></li> +</ul> +<hr /> +<a name="properties"></a> +<h2>Properties</h2> +<ul> +<li><div class="fn"><b><a href="qgeoareamonitor.html#center-prop">center</a></b> : QGeoCoordinate</div></li> +<li><div class="fn"><b><a href="qgeoareamonitor.html#radius-prop">radius</a></b> : qreal</div></li> +</ul> +<ul> +<li><div bar="2" class="fn"></div>1 property inherited from <a href="http://qt.nokia.com/doc/4.5/qobject.html#properties">QObject</a></li> +</ul> +<hr /> +<a name="public-functions"></a> +<h2>Public Functions</h2> +<table class="alignedsummary" border="0" cellpadding="0" cellspacing="0" width="100%"> +<tr><td class="memItemLeft" align="right" valign="top"></td><td class="memItemRight" valign="bottom"><b><a href="qgeoareamonitor.html#QGeoAreaMonitor">QGeoAreaMonitor</a></b> ( QObject * <i>parent</i> )</td></tr> +<tr><td class="memItemLeft" align="right" valign="top">virtual </td><td class="memItemRight" valign="bottom"><b><a href="qgeoareamonitor.html#dtor.QGeoAreaMonitor">~QGeoAreaMonitor</a></b> () = 0</td></tr> +<tr><td class="memItemLeft" align="right" valign="top">QGeoCoordinate </td><td class="memItemRight" valign="bottom"><b><a href="qgeoareamonitor.html#center-prop">center</a></b> () const</td></tr> +<tr><td class="memItemLeft" align="right" valign="top">qreal </td><td class="memItemRight" valign="bottom"><b><a href="qgeoareamonitor.html#radius-prop">radius</a></b> () const</td></tr> +<tr><td class="memItemLeft" align="right" valign="top">virtual void </td><td class="memItemRight" valign="bottom"><b><a href="qgeoareamonitor.html#center-prop">setCenter</a></b> ( const QGeoCoordinate & <i>coordinate</i> )</td></tr> +<tr><td class="memItemLeft" align="right" valign="top">virtual void </td><td class="memItemRight" valign="bottom"><b><a href="qgeoareamonitor.html#radius-prop">setRadius</a></b> ( qreal <i>radius</i> )</td></tr> +</table> +<ul> +<li><div bar="2" class="fn"></div>29 public functions inherited from <a href="http://qt.nokia.com/doc/4.5/qobject.html#public-functions">QObject</a></li> +</ul> +<hr /> +<a name="signals"></a> +<h2>Signals</h2> +<table class="alignedsummary" border="0" cellpadding="0" cellspacing="0" width="100%"> +<tr><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><b><a href="qgeoareamonitor.html#areaEntered">areaEntered</a></b> ( const QGeoPositionInfo & <i>update</i> )</td></tr> +<tr><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><b><a href="qgeoareamonitor.html#areaExited">areaExited</a></b> ( const QGeoPositionInfo & <i>update</i> )</td></tr> +</table> +<ul> +<li><div bar="2" class="fn"></div>1 signal inherited from <a href="http://qt.nokia.com/doc/4.5/qobject.html#signals">QObject</a></li> +</ul> +<hr /> +<a name="static-public-members"></a> +<h2>Static Public Members</h2> +<table class="alignedsummary" border="0" cellpadding="0" cellspacing="0" width="100%"> +<tr><td class="memItemLeft" align="right" valign="top">QGeoAreaMonitor * </td><td class="memItemRight" valign="bottom"><b><a href="qgeoareamonitor.html#createDefaultMonitor">createDefaultMonitor</a></b> ( QObject * <i>parent</i> )</td></tr> +</table> +<ul> +<li><div bar="2" class="fn"></div>4 static public members inherited from <a href="http://qt.nokia.com/doc/4.5/qobject.html#static-public-members">QObject</a></li> +</ul> +<h3>Additional Inherited Members</h3> +<ul> +<li><div class="fn"></div>1 public slot inherited from <a href="http://qt.nokia.com/doc/4.5/qobject.html#public-slots">QObject</a></li> +<li><div class="fn"></div>1 public type inherited from <a href="http://qt.nokia.com/doc/4.5/qobject.html#public-variables">QObject</a></li> +<li><div class="fn"></div>7 protected functions inherited from <a href="http://qt.nokia.com/doc/4.5/qobject.html#protected-functions">QObject</a></li> +<li><div class="fn"></div>2 protected variables inherited from <a href="http://qt.nokia.com/doc/4.5/qobject.html#protected-variables">QObject</a></li> +</ul> +<a name="details"></a> +<hr /> +<h2>Detailed Description</h2> +<p>The QGeoAreaMonitor class enables the detection of proximity changes for a specified set of coordinates.</p> +<p>A QGeoAreaMonitor emits signals when the current position is in range, or has moved out of range, of a specified circular area. The area is specified by a coordinate (the center point) and a radius (in meters).</p> +<p>For example:</p> +<pre> public: + MyClass::MyClass() + { + QGeoAreaMonitor *monitor = QGeoAreaMonitor::createDefaultMonitor(); + connect(monitor, SIGNAL(areaEntered(QGeoPositionInfo)), + this, SLOT(areaEntered(QGeoPositionInfo))); + connect(monitor, SIGNAL(areaExited(QGeoPositionInfo)), + this, SLOT(areaExited(QGeoPositionInfo))); + + QGeoCoordinate bigBenLocation(51.50104, -0.124632); + monitor->setCenter(bigBenLocation); + monitor->setRadius(100); + } + + public slots: + void areaEntered(const QGeoPositionInfo &update) + { + qDebug() << "Now within 100 meters, current position is" << update.coordinate(); + } + + void areaExited(const QGeoPositionInfo &update) + { + qDebug() << "No longer within 100 meters, current position is" << update.coordinate(); + }</pre> +<hr /> +<h2>Property Documentation</h2> +<a name="//apple_ref/cpp/instm/QGeoAreaMonitor/center"></a> +<a name="//apple_ref/cpp/instm/QGeoAreaMonitor/setCenter"></a> +<h3 class="fn"><a name="center-prop"></a>center : <a href="qgeocoordinate.html">QGeoCoordinate</a></h3> +<p>This property holds this property holds the center of the area to be monitored.</p> +<p>When the center is set, if the radius has already been set and the current position is within the monitored area, <a href="qgeoareamonitor.html#areaEntered">areaEntered</a>() is emitted immediately.</p> +<p>By default, contains an invalid coordinate.</p> +<p>Note: Subclass implementations must call the base implementation of setCenter() so that center() returns the correct value.</p> +<p><b>Access functions:</b></p> +<table class="alignedsummary" border="0" cellpadding="0" cellspacing="0" width="100%"> +<tr><td class="memItemLeft" align="right" valign="top">QGeoCoordinate </td><td class="memItemRight" valign="bottom"><b>center</b> () const</td></tr> +<tr><td class="memItemLeft" align="right" valign="top">virtual void </td><td class="memItemRight" valign="bottom"><b>setCenter</b> ( const QGeoCoordinate & <i>coordinate</i> )</td></tr> +</table> +<a name="//apple_ref/cpp/instm/QGeoAreaMonitor/radius"></a> +<a name="//apple_ref/cpp/instm/QGeoAreaMonitor/setRadius"></a> +<h3 class="fn"><a name="radius-prop"></a>radius : <a href="http://qt.nokia.com/doc/4.5/qtglobal.html#qreal-typedef">qreal</a></h3> +<p>This property holds this property holds the radius of the area to be monitored, in meters.</p> +<p>If the specified radius is less than the minimum supported radius, the radius is set to the minimum radius.</p> +<p>When this property is set, if the center coordinate has already been set and the current position is within the monitored area, <a href="qgeoareamonitor.html#areaEntered">areaEntered</a>() is emitted immediately.</p> +<p>By default, this property is 0.</p> +<p>Note: Subclass implementations must call the base implementation of setRadius() so that radius() returns the correct value.</p> +<p><b>Access functions:</b></p> +<table class="alignedsummary" border="0" cellpadding="0" cellspacing="0" width="100%"> +<tr><td class="memItemLeft" align="right" valign="top">qreal </td><td class="memItemRight" valign="bottom"><b>radius</b> () const</td></tr> +<tr><td class="memItemLeft" align="right" valign="top">virtual void </td><td class="memItemRight" valign="bottom"><b>setRadius</b> ( qreal <i>radius</i> )</td></tr> +</table> +<hr /> +<h2>Member Function Documentation</h2> +<a name="//apple_ref/cpp/instm/QGeoAreaMonitor/QGeoAreaMonitor"></a> +<h3 class="fn"><a name="QGeoAreaMonitor"></a>QGeoAreaMonitor::QGeoAreaMonitor ( <a href="http://qt.nokia.com/doc/4.5/qobject.html">QObject</a> * <i>parent</i> )</h3> +<p>Creates a monitor with the given <i>parent</i>.</p> +<a name="//apple_ref/cpp/instm/QGeoAreaMonitor/~QGeoAreaMonitor"></a> +<h3 class="fn"><a name="dtor.QGeoAreaMonitor"></a>QGeoAreaMonitor::~QGeoAreaMonitor () <tt> [pure virtual]</tt></h3> +<p>Destroys the monitor.</p> +<a name="//apple_ref/cpp/instm/QGeoAreaMonitor/areaEntered"></a> +<h3 class="fn"><a name="areaEntered"></a>void QGeoAreaMonitor::areaEntered ( const <a href="qgeopositioninfo.html">QGeoPositionInfo</a> & <i>update</i> ) <tt> [signal]</tt></h3> +<p>Emitted when the current position has moved from a position outside the monitored area to a position within the monitored area.</p> +<p>The <i>update</i> holds the new position.</p> +<a name="//apple_ref/cpp/instm/QGeoAreaMonitor/areaExited"></a> +<h3 class="fn"><a name="areaExited"></a>void QGeoAreaMonitor::areaExited ( const <a href="qgeopositioninfo.html">QGeoPositionInfo</a> & <i>update</i> ) <tt> [signal]</tt></h3> +<p>Emitted when the current position has moved from a position within the monitored area to a position outside the monitored area.</p> +<p>The <i>update</i> holds the new position.</p> +<a name="//apple_ref/cpp/clm/QGeoAreaMonitor/createDefaultMonitor"></a> +<h3 class="fn"><a name="createDefaultMonitor"></a>QGeoAreaMonitor * QGeoAreaMonitor::createDefaultMonitor ( <a href="http://qt.nokia.com/doc/4.5/qobject.html">QObject</a> * <i>parent</i> ) <tt> [static]</tt></h3> +<p>Creates and returns a monitor with the given <i>parent</i> that monitors areas using resources on the underlying system.</p> +<p>Returns 0 if the system has no support for position monitoring.</p> +<p /><address><hr /><div align="center"> +<table width="100%" cellspacing="0" border="0"><tr class="address"> +<td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> +<td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> +</tr></table></div></address></body> +</html> diff --git a/doc/html/qgeocoordinate-members.html b/doc/html/qgeocoordinate-members.html index 4916cb7a76..3488b090f8 100644 --- a/doc/html/qgeocoordinate-members.html +++ b/doc/html/qgeocoordinate-members.html @@ -45,6 +45,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qgeocoordinate.html b/doc/html/qgeocoordinate.html index 047001204a..75bbcb0efd 100644 --- a/doc/html/qgeocoordinate.html +++ b/doc/html/qgeocoordinate.html @@ -195,6 +195,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qgeopositioninfo-members.html b/doc/html/qgeopositioninfo-members.html index 00915e5c7f..7f069f7002 100644 --- a/doc/html/qgeopositioninfo-members.html +++ b/doc/html/qgeopositioninfo-members.html @@ -41,6 +41,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qgeopositioninfo.html b/doc/html/qgeopositioninfo.html index 96d6791de2..92be9743d8 100644 --- a/doc/html/qgeopositioninfo.html +++ b/doc/html/qgeopositioninfo.html @@ -150,6 +150,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qgeopositioninfosource-members.html b/doc/html/qgeopositioninfosource-members.html index 231fb66552..9ea680ff80 100644 --- a/doc/html/qgeopositioninfosource-members.html +++ b/doc/html/qgeopositioninfosource-members.html @@ -86,6 +86,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qgeopositioninfosource.html b/doc/html/qgeopositioninfosource.html index e00509eece..3b2416c080 100644 --- a/doc/html/qgeopositioninfosource.html +++ b/doc/html/qgeopositioninfosource.html @@ -196,6 +196,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qgeosatelliteinfo-members.html b/doc/html/qgeosatelliteinfo-members.html index 1eb7bae731..586a37ca75 100644 --- a/doc/html/qgeosatelliteinfo-members.html +++ b/doc/html/qgeosatelliteinfo-members.html @@ -35,6 +35,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qgeosatelliteinfo.html b/doc/html/qgeosatelliteinfo.html index c110696f11..22e2d1b208 100644 --- a/doc/html/qgeosatelliteinfo.html +++ b/doc/html/qgeosatelliteinfo.html @@ -115,6 +115,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qgeosatelliteinfosource-members.html b/doc/html/qgeosatelliteinfosource-members.html index 86a8947598..ebe6ac2e9d 100644 --- a/doc/html/qgeosatelliteinfosource-members.html +++ b/doc/html/qgeosatelliteinfosource-members.html @@ -77,6 +77,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qgeosatelliteinfosource.html b/doc/html/qgeosatelliteinfosource.html index 1e856ded44..a816754182 100644 --- a/doc/html/qgeosatelliteinfosource.html +++ b/doc/html/qgeosatelliteinfosource.html @@ -110,6 +110,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qgraphicsvideoitem-members.html b/doc/html/qgraphicsvideoitem-members.html index 9b13ca1f2e..f45b97ba0e 100644 --- a/doc/html/qgraphicsvideoitem-members.html +++ b/doc/html/qgraphicsvideoitem-members.html @@ -267,6 +267,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qgraphicsvideoitem.html b/doc/html/qgraphicsvideoitem.html index cc658da241..aaca3e8110 100644 --- a/doc/html/qgraphicsvideoitem.html +++ b/doc/html/qgraphicsvideoitem.html @@ -83,6 +83,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qimagecapturecontrol-members.html b/doc/html/qimagecapturecontrol-members.html index 7f5d8ab652..d68eee720b 100644 --- a/doc/html/qimagecapturecontrol-members.html +++ b/doc/html/qimagecapturecontrol-members.html @@ -76,6 +76,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qimagecapturecontrol.html b/doc/html/qimagecapturecontrol.html index bbc1b73284..79aefd178d 100644 --- a/doc/html/qimagecapturecontrol.html +++ b/doc/html/qimagecapturecontrol.html @@ -107,6 +107,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qimageencodercontrol-members.html b/doc/html/qimageencodercontrol-members.html index 029df19ea7..881a07053f 100644 --- a/doc/html/qimageencodercontrol-members.html +++ b/doc/html/qimageencodercontrol-members.html @@ -76,6 +76,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qimageencodercontrol.html b/doc/html/qimageencodercontrol.html index 2b83743650..dbea8e6403 100644 --- a/doc/html/qimageencodercontrol.html +++ b/doc/html/qimageencodercontrol.html @@ -102,6 +102,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qimageencodersettings-members.html b/doc/html/qimageencodersettings-members.html index 6c0fec8651..1405b5ce17 100644 --- a/doc/html/qimageencodersettings-members.html +++ b/doc/html/qimageencodersettings-members.html @@ -34,6 +34,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qimageencodersettings.html b/doc/html/qimageencodersettings.html index 036a6ab9d2..1020099b67 100644 --- a/doc/html/qimageencodersettings.html +++ b/doc/html/qimageencodersettings.html @@ -106,6 +106,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qimageprocessingcontrol-members.html b/doc/html/qimageprocessingcontrol-members.html index 28b43a3d4c..1a8110a554 100644 --- a/doc/html/qimageprocessingcontrol-members.html +++ b/doc/html/qimageprocessingcontrol-members.html @@ -86,6 +86,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qimageprocessingcontrol.html b/doc/html/qimageprocessingcontrol.html index e76c1c8106..0b8a666a53 100644 --- a/doc/html/qimageprocessingcontrol.html +++ b/doc/html/qimageprocessingcontrol.html @@ -152,6 +152,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediacontent-members.html b/doc/html/qmediacontent-members.html index 41128036f6..fe1a245ed9 100644 --- a/doc/html/qmediacontent-members.html +++ b/doc/html/qmediacontent-members.html @@ -47,6 +47,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediacontent.html b/doc/html/qmediacontent.html index b9ad384541..8e84d8547a 100644 --- a/doc/html/qmediacontent.html +++ b/doc/html/qmediacontent.html @@ -134,6 +134,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediacontrol-members.html b/doc/html/qmediacontrol-members.html index 525b95b809..2f19fc82b3 100644 --- a/doc/html/qmediacontrol-members.html +++ b/doc/html/qmediacontrol-members.html @@ -71,6 +71,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediacontrol.html b/doc/html/qmediacontrol.html index 6ae7f87e98..2ca6fba7e9 100644 --- a/doc/html/qmediacontrol.html +++ b/doc/html/qmediacontrol.html @@ -86,6 +86,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediaformatcontrol-members.html b/doc/html/qmediaformatcontrol-members.html index cf69d37bd7..c8d88c119a 100644 --- a/doc/html/qmediaformatcontrol-members.html +++ b/doc/html/qmediaformatcontrol-members.html @@ -75,6 +75,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediaformatcontrol.html b/doc/html/qmediaformatcontrol.html index 56ebb79f70..dad1ab586d 100644 --- a/doc/html/qmediaformatcontrol.html +++ b/doc/html/qmediaformatcontrol.html @@ -97,6 +97,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediaimageviewer-members.html b/doc/html/qmediaimageviewer-members.html index 6f99e3c83c..18fac61637 100644 --- a/doc/html/qmediaimageviewer-members.html +++ b/doc/html/qmediaimageviewer-members.html @@ -104,6 +104,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediaimageviewer.html b/doc/html/qmediaimageviewer.html index 1c01f3fad3..5c2f4481e8 100644 --- a/doc/html/qmediaimageviewer.html +++ b/doc/html/qmediaimageviewer.html @@ -245,6 +245,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediaobject-members.html b/doc/html/qmediaobject-members.html index 9d4165ff35..ed94867e34 100644 --- a/doc/html/qmediaobject-members.html +++ b/doc/html/qmediaobject-members.html @@ -88,6 +88,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediaobject.html b/doc/html/qmediaobject.html index bae95eef91..5545a5171e 100644 --- a/doc/html/qmediaobject.html +++ b/doc/html/qmediaobject.html @@ -194,6 +194,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediaplayer-members.html b/doc/html/qmediaplayer-members.html index 84ea21914b..2348106c73 100644 --- a/doc/html/qmediaplayer-members.html +++ b/doc/html/qmediaplayer-members.html @@ -128,6 +128,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediaplayer.html b/doc/html/qmediaplayer.html index 225e48a74e..92c9572e81 100644 --- a/doc/html/qmediaplayer.html +++ b/doc/html/qmediaplayer.html @@ -463,6 +463,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediaplayercontrol-members.html b/doc/html/qmediaplayercontrol-members.html index c225672719..89cfc0f30d 100644 --- a/doc/html/qmediaplayercontrol-members.html +++ b/doc/html/qmediaplayercontrol-members.html @@ -105,6 +105,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediaplayercontrol.html b/doc/html/qmediaplayercontrol.html index 47e0b14b0b..03412d4781 100644 --- a/doc/html/qmediaplayercontrol.html +++ b/doc/html/qmediaplayercontrol.html @@ -250,6 +250,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediaplaylist-members.html b/doc/html/qmediaplaylist-members.html index 0b4c14ec09..35cfe54006 100644 --- a/doc/html/qmediaplaylist-members.html +++ b/doc/html/qmediaplaylist-members.html @@ -110,6 +110,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediaplaylist.html b/doc/html/qmediaplaylist.html index 0494551743..b077474573 100644 --- a/doc/html/qmediaplaylist.html +++ b/doc/html/qmediaplaylist.html @@ -327,6 +327,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediaplaylistcontrol-members.html b/doc/html/qmediaplaylistcontrol-members.html index 5904cd926d..0b1f415e24 100644 --- a/doc/html/qmediaplaylistcontrol-members.html +++ b/doc/html/qmediaplaylistcontrol-members.html @@ -85,6 +85,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediaplaylistcontrol.html b/doc/html/qmediaplaylistcontrol.html index 9cb1e8f711..b73c2694f2 100644 --- a/doc/html/qmediaplaylistcontrol.html +++ b/doc/html/qmediaplaylistcontrol.html @@ -153,6 +153,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediaplaylistioplugin-members.html b/doc/html/qmediaplaylistioplugin-members.html index 084e149279..2c48de2f0f 100644 --- a/doc/html/qmediaplaylistioplugin-members.html +++ b/doc/html/qmediaplaylistioplugin-members.html @@ -78,6 +78,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediaplaylistioplugin.html b/doc/html/qmediaplaylistioplugin.html index ff6f6ad03a..89a928efc4 100644 --- a/doc/html/qmediaplaylistioplugin.html +++ b/doc/html/qmediaplaylistioplugin.html @@ -92,6 +92,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediaplaylistnavigator-members.html b/doc/html/qmediaplaylistnavigator-members.html index e827a5cc9b..47b48dcbd2 100644 --- a/doc/html/qmediaplaylistnavigator-members.html +++ b/doc/html/qmediaplaylistnavigator-members.html @@ -89,6 +89,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediaplaylistnavigator.html b/doc/html/qmediaplaylistnavigator.html index e23077380a..54701c36ae 100644 --- a/doc/html/qmediaplaylistnavigator.html +++ b/doc/html/qmediaplaylistnavigator.html @@ -189,6 +189,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediaplaylistprovider-members.html b/doc/html/qmediaplaylistprovider-members.html index 68bf486380..4107832e66 100644 --- a/doc/html/qmediaplaylistprovider-members.html +++ b/doc/html/qmediaplaylistprovider-members.html @@ -93,6 +93,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediaplaylistprovider.html b/doc/html/qmediaplaylistprovider.html index 0a07dac656..51616b1a01 100644 --- a/doc/html/qmediaplaylistprovider.html +++ b/doc/html/qmediaplaylistprovider.html @@ -171,6 +171,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediaplaylistreader-members.html b/doc/html/qmediaplaylistreader-members.html index 8630924073..2b407dc9a4 100644 --- a/doc/html/qmediaplaylistreader-members.html +++ b/doc/html/qmediaplaylistreader-members.html @@ -24,6 +24,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediaplaylistreader.html b/doc/html/qmediaplaylistreader.html index 67e8b88185..bd03f2c7be 100644 --- a/doc/html/qmediaplaylistreader.html +++ b/doc/html/qmediaplaylistreader.html @@ -53,6 +53,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediaplaylistwriter-members.html b/doc/html/qmediaplaylistwriter-members.html index 78f1b5efd0..56a28860bc 100644 --- a/doc/html/qmediaplaylistwriter-members.html +++ b/doc/html/qmediaplaylistwriter-members.html @@ -23,6 +23,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediaplaylistwriter.html b/doc/html/qmediaplaylistwriter.html index 8aa8a160c6..3d2efc433e 100644 --- a/doc/html/qmediaplaylistwriter.html +++ b/doc/html/qmediaplaylistwriter.html @@ -48,6 +48,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediarecorder-members.html b/doc/html/qmediarecorder-members.html index 0ecfeace14..ee17feea6f 100644 --- a/doc/html/qmediarecorder-members.html +++ b/doc/html/qmediarecorder-members.html @@ -115,6 +115,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediarecorder.html b/doc/html/qmediarecorder.html index a7f0468b76..cf1cfd597b 100644 --- a/doc/html/qmediarecorder.html +++ b/doc/html/qmediarecorder.html @@ -262,6 +262,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediarecordercontrol-members.html b/doc/html/qmediarecordercontrol-members.html index c95e14af16..8afab70ceb 100644 --- a/doc/html/qmediarecordercontrol-members.html +++ b/doc/html/qmediarecordercontrol-members.html @@ -82,6 +82,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediarecordercontrol.html b/doc/html/qmediarecordercontrol.html index 01e73cdcd8..b7401975ad 100644 --- a/doc/html/qmediarecordercontrol.html +++ b/doc/html/qmediarecordercontrol.html @@ -140,6 +140,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediaresource-members.html b/doc/html/qmediaresource-members.html index 0c9a6c1d04..6f1d8fd8fc 100644 --- a/doc/html/qmediaresource-members.html +++ b/doc/html/qmediaresource-members.html @@ -57,6 +57,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediaresource.html b/doc/html/qmediaresource.html index b1e882ae5d..7f80322948 100644 --- a/doc/html/qmediaresource.html +++ b/doc/html/qmediaresource.html @@ -204,6 +204,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediaservice-members.html b/doc/html/qmediaservice-members.html index bb126a1d35..31301d6653 100644 --- a/doc/html/qmediaservice-members.html +++ b/doc/html/qmediaservice-members.html @@ -81,6 +81,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediaservice.html b/doc/html/qmediaservice.html index 421c0a510a..f7f217993c 100644 --- a/doc/html/qmediaservice.html +++ b/doc/html/qmediaservice.html @@ -132,6 +132,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediaservicefeaturesinterface-members.html b/doc/html/qmediaservicefeaturesinterface-members.html index 92e1de76a3..9244316265 100644 --- a/doc/html/qmediaservicefeaturesinterface-members.html +++ b/doc/html/qmediaservicefeaturesinterface-members.html @@ -22,6 +22,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediaservicefeaturesinterface.html b/doc/html/qmediaservicefeaturesinterface.html index f42e8ceed4..c2aa386f96 100644 --- a/doc/html/qmediaservicefeaturesinterface.html +++ b/doc/html/qmediaservicefeaturesinterface.html @@ -42,6 +42,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediaserviceprovider-members.html b/doc/html/qmediaserviceprovider-members.html index e4292f873a..8f820d53d9 100644 --- a/doc/html/qmediaserviceprovider-members.html +++ b/doc/html/qmediaserviceprovider-members.html @@ -75,6 +75,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediaserviceprovider.html b/doc/html/qmediaserviceprovider.html index 9a5a13abe1..da9d8590ef 100644 --- a/doc/html/qmediaserviceprovider.html +++ b/doc/html/qmediaserviceprovider.html @@ -81,6 +81,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediaserviceproviderhint-members.html b/doc/html/qmediaserviceproviderhint-members.html index 424782dbab..a8f4345060 100644 --- a/doc/html/qmediaserviceproviderhint-members.html +++ b/doc/html/qmediaserviceproviderhint-members.html @@ -42,6 +42,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediaserviceproviderhint.html b/doc/html/qmediaserviceproviderhint.html index 1a24fed0e5..caf388c033 100644 --- a/doc/html/qmediaserviceproviderhint.html +++ b/doc/html/qmediaserviceproviderhint.html @@ -132,6 +132,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediaserviceproviderplugin-members.html b/doc/html/qmediaserviceproviderplugin-members.html index c23dc8a23e..6a7bd29750 100644 --- a/doc/html/qmediaserviceproviderplugin-members.html +++ b/doc/html/qmediaserviceproviderplugin-members.html @@ -72,6 +72,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediaserviceproviderplugin.html b/doc/html/qmediaserviceproviderplugin.html index 2b24555096..b6bd746602 100644 --- a/doc/html/qmediaserviceproviderplugin.html +++ b/doc/html/qmediaserviceproviderplugin.html @@ -67,6 +67,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediaservicesupporteddevicesinterface-members.html b/doc/html/qmediaservicesupporteddevicesinterface-members.html index 60033a77c0..7ecdc1e7e2 100644 --- a/doc/html/qmediaservicesupporteddevicesinterface-members.html +++ b/doc/html/qmediaservicesupporteddevicesinterface-members.html @@ -23,6 +23,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediaservicesupporteddevicesinterface.html b/doc/html/qmediaservicesupporteddevicesinterface.html index 20741aa8be..04f4fbeb22 100644 --- a/doc/html/qmediaservicesupporteddevicesinterface.html +++ b/doc/html/qmediaservicesupporteddevicesinterface.html @@ -46,6 +46,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediaservicesupportedformatsinterface-members.html b/doc/html/qmediaservicesupportedformatsinterface-members.html index 825b29fdd3..54f4c68d90 100644 --- a/doc/html/qmediaservicesupportedformatsinterface-members.html +++ b/doc/html/qmediaservicesupportedformatsinterface-members.html @@ -22,6 +22,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediaservicesupportedformatsinterface.html b/doc/html/qmediaservicesupportedformatsinterface.html index a2e6f2f812..ee48d92d5d 100644 --- a/doc/html/qmediaservicesupportedformatsinterface.html +++ b/doc/html/qmediaservicesupportedformatsinterface.html @@ -42,6 +42,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediastreamscontrol-members.html b/doc/html/qmediastreamscontrol-members.html index add16453db..17dff3c2fd 100644 --- a/doc/html/qmediastreamscontrol-members.html +++ b/doc/html/qmediastreamscontrol-members.html @@ -79,6 +79,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediastreamscontrol.html b/doc/html/qmediastreamscontrol.html index ac4bfd06e4..7deeb1ad80 100644 --- a/doc/html/qmediastreamscontrol.html +++ b/doc/html/qmediastreamscontrol.html @@ -140,6 +140,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmessage-members.html b/doc/html/qmessage-members.html index 2f35afbdfe..526ad58602 100644 --- a/doc/html/qmessage-members.html +++ b/doc/html/qmessage-members.html @@ -89,6 +89,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmessage.html b/doc/html/qmessage.html index ad4e28eeb8..95501e70bb 100644 --- a/doc/html/qmessage.html +++ b/doc/html/qmessage.html @@ -354,6 +354,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmessageaccount-members.html b/doc/html/qmessageaccount-members.html index 88490c6a70..c91a86f456 100644 --- a/doc/html/qmessageaccount-members.html +++ b/doc/html/qmessageaccount-members.html @@ -28,6 +28,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmessageaccount.html b/doc/html/qmessageaccount.html index 3afda3af54..2b57ed043d 100644 --- a/doc/html/qmessageaccount.html +++ b/doc/html/qmessageaccount.html @@ -73,6 +73,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmessageaccountfilter-members.html b/doc/html/qmessageaccountfilter-members.html index 78d3be3c95..5ac0f42385 100644 --- a/doc/html/qmessageaccountfilter-members.html +++ b/doc/html/qmessageaccountfilter-members.html @@ -41,6 +41,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmessageaccountfilter.html b/doc/html/qmessageaccountfilter.html index 1f482c91ee..a796b3a380 100644 --- a/doc/html/qmessageaccountfilter.html +++ b/doc/html/qmessageaccountfilter.html @@ -121,6 +121,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmessageaccountid-members.html b/doc/html/qmessageaccountid-members.html index a55873afb8..5672774621 100644 --- a/doc/html/qmessageaccountid-members.html +++ b/doc/html/qmessageaccountid-members.html @@ -28,6 +28,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmessageaccountid.html b/doc/html/qmessageaccountid.html index 58c1917815..8364d7dfec 100644 --- a/doc/html/qmessageaccountid.html +++ b/doc/html/qmessageaccountid.html @@ -71,6 +71,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmessageaccountordering-members.html b/doc/html/qmessageaccountordering-members.html index 2bb0600488..023a6b693b 100644 --- a/doc/html/qmessageaccountordering-members.html +++ b/doc/html/qmessageaccountordering-members.html @@ -26,6 +26,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmessageaccountordering.html b/doc/html/qmessageaccountordering.html index fc86d1c133..05419d894a 100644 --- a/doc/html/qmessageaccountordering.html +++ b/doc/html/qmessageaccountordering.html @@ -68,6 +68,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmessageaddress-members.html b/doc/html/qmessageaddress-members.html index aa73286b79..9bed33e67b 100644 --- a/doc/html/qmessageaddress-members.html +++ b/doc/html/qmessageaddress-members.html @@ -30,6 +30,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmessageaddress.html b/doc/html/qmessageaddress.html index 0fd87f70ae..005d68b70e 100644 --- a/doc/html/qmessageaddress.html +++ b/doc/html/qmessageaddress.html @@ -105,6 +105,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmessagecontentcontainer-members.html b/doc/html/qmessagecontentcontainer-members.html index 689169cdf8..8ec97548be 100644 --- a/doc/html/qmessagecontentcontainer-members.html +++ b/doc/html/qmessagecontentcontainer-members.html @@ -43,6 +43,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmessagecontentcontainer.html b/doc/html/qmessagecontentcontainer.html index db4a3d833c..85cb6d8f44 100644 --- a/doc/html/qmessagecontentcontainer.html +++ b/doc/html/qmessagecontentcontainer.html @@ -133,6 +133,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmessagecontentcontainerid-members.html b/doc/html/qmessagecontentcontainerid-members.html index dff53c2eeb..3dba263a6a 100644 --- a/doc/html/qmessagecontentcontainerid-members.html +++ b/doc/html/qmessagecontentcontainerid-members.html @@ -26,6 +26,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmessagecontentcontainerid.html b/doc/html/qmessagecontentcontainerid.html index c98d8b84db..480b5a3143 100644 --- a/doc/html/qmessagecontentcontainerid.html +++ b/doc/html/qmessagecontentcontainerid.html @@ -65,6 +65,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmessagedatacomparator.html b/doc/html/qmessagedatacomparator.html index 30d9e6ae8d..19a6ef72e9 100644 --- a/doc/html/qmessagedatacomparator.html +++ b/doc/html/qmessagedatacomparator.html @@ -82,6 +82,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmessagefilter-members.html b/doc/html/qmessagefilter-members.html index 408e71114a..389410568f 100644 --- a/doc/html/qmessagefilter-members.html +++ b/doc/html/qmessagefilter-members.html @@ -62,6 +62,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmessagefilter.html b/doc/html/qmessagefilter.html index 5a7c851289..c849d6abf2 100644 --- a/doc/html/qmessagefilter.html +++ b/doc/html/qmessagefilter.html @@ -222,6 +222,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmessagefolder-members.html b/doc/html/qmessagefolder-members.html index dababeb130..616bca366e 100644 --- a/doc/html/qmessagefolder-members.html +++ b/doc/html/qmessagefolder-members.html @@ -29,6 +29,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmessagefolder.html b/doc/html/qmessagefolder.html index f39c4facbc..c23988d335 100644 --- a/doc/html/qmessagefolder.html +++ b/doc/html/qmessagefolder.html @@ -70,6 +70,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmessagefolderfilter-members.html b/doc/html/qmessagefolderfilter-members.html index 45bd060e99..763765bfed 100644 --- a/doc/html/qmessagefolderfilter-members.html +++ b/doc/html/qmessagefolderfilter-members.html @@ -49,6 +49,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmessagefolderfilter.html b/doc/html/qmessagefolderfilter.html index 5ba4087b38..6172a7251a 100644 --- a/doc/html/qmessagefolderfilter.html +++ b/doc/html/qmessagefolderfilter.html @@ -157,6 +157,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmessagefolderid-members.html b/doc/html/qmessagefolderid-members.html index a5fb3eeb17..bc65daac94 100644 --- a/doc/html/qmessagefolderid-members.html +++ b/doc/html/qmessagefolderid-members.html @@ -27,6 +27,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmessagefolderid.html b/doc/html/qmessagefolderid.html index 59297f3b20..3743bbcffd 100644 --- a/doc/html/qmessagefolderid.html +++ b/doc/html/qmessagefolderid.html @@ -67,6 +67,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmessagefolderordering-members.html b/doc/html/qmessagefolderordering-members.html index 4a1fd6540b..4c526a8297 100644 --- a/doc/html/qmessagefolderordering-members.html +++ b/doc/html/qmessagefolderordering-members.html @@ -29,6 +29,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmessagefolderordering.html b/doc/html/qmessagefolderordering.html index 15c05b2cbd..46351cd0bf 100644 --- a/doc/html/qmessagefolderordering.html +++ b/doc/html/qmessagefolderordering.html @@ -83,6 +83,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmessageid-members.html b/doc/html/qmessageid-members.html index d5dc3ab494..9f5bc14d2a 100644 --- a/doc/html/qmessageid-members.html +++ b/doc/html/qmessageid-members.html @@ -26,6 +26,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmessageid.html b/doc/html/qmessageid.html index 3225738c1b..190d3570f1 100644 --- a/doc/html/qmessageid.html +++ b/doc/html/qmessageid.html @@ -64,6 +64,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmessageordering-members.html b/doc/html/qmessageordering-members.html index c52b603c3e..72844133c4 100644 --- a/doc/html/qmessageordering-members.html +++ b/doc/html/qmessageordering-members.html @@ -40,6 +40,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmessageordering.html b/doc/html/qmessageordering.html index ee95c4d08d..6db4b27674 100644 --- a/doc/html/qmessageordering.html +++ b/doc/html/qmessageordering.html @@ -128,6 +128,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmessageserviceaction-members.html b/doc/html/qmessageserviceaction-members.html index 31fb8b56ee..8729d9edc6 100644 --- a/doc/html/qmessageserviceaction-members.html +++ b/doc/html/qmessageserviceaction-members.html @@ -89,6 +89,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmessageserviceaction.html b/doc/html/qmessageserviceaction.html index 3498f2ad44..bbd682ba45 100644 --- a/doc/html/qmessageserviceaction.html +++ b/doc/html/qmessageserviceaction.html @@ -211,6 +211,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmessagestore-members.html b/doc/html/qmessagestore-members.html index 43705a0c6f..db6b80160b 100644 --- a/doc/html/qmessagestore-members.html +++ b/doc/html/qmessagestore-members.html @@ -94,6 +94,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmessagestore.html b/doc/html/qmessagestore.html index 42fb3a26b1..61ec39fcfb 100644 --- a/doc/html/qmessagestore.html +++ b/doc/html/qmessagestore.html @@ -238,6 +238,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmetadatacontrol-members.html b/doc/html/qmetadatacontrol-members.html index 2cfe57abff..1c287edc17 100644 --- a/doc/html/qmetadatacontrol-members.html +++ b/doc/html/qmetadatacontrol-members.html @@ -82,6 +82,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmetadatacontrol.html b/doc/html/qmetadatacontrol.html index 35e7aef327..103a0a2c34 100644 --- a/doc/html/qmetadatacontrol.html +++ b/doc/html/qmetadatacontrol.html @@ -138,6 +138,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qnetworkconfiguration-members.html b/doc/html/qnetworkconfiguration-members.html index 3740d92be3..f815bcdf3b 100644 --- a/doc/html/qnetworkconfiguration-members.html +++ b/doc/html/qnetworkconfiguration-members.html @@ -42,6 +42,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qnetworkconfiguration.html b/doc/html/qnetworkconfiguration.html index 68ed81883b..50f713b586 100644 --- a/doc/html/qnetworkconfiguration.html +++ b/doc/html/qnetworkconfiguration.html @@ -162,6 +162,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qnetworkconfigurationmanager-members.html b/doc/html/qnetworkconfigurationmanager-members.html index 0761d819ba..eb0da64ecb 100644 --- a/doc/html/qnetworkconfigurationmanager-members.html +++ b/doc/html/qnetworkconfigurationmanager-members.html @@ -84,6 +84,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qnetworkconfigurationmanager.html b/doc/html/qnetworkconfigurationmanager.html index bb12ef304d..532d940575 100644 --- a/doc/html/qnetworkconfigurationmanager.html +++ b/doc/html/qnetworkconfigurationmanager.html @@ -161,6 +161,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qnetworksession-members.html b/doc/html/qnetworksession-members.html index 70ea28028d..f1e355853e 100644 --- a/doc/html/qnetworksession-members.html +++ b/doc/html/qnetworksession-members.html @@ -99,6 +99,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qnetworksession.html b/doc/html/qnetworksession.html index 6cbafdb0e0..a6eea6a876 100644 --- a/doc/html/qnetworksession.html +++ b/doc/html/qnetworksession.html @@ -309,6 +309,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qnmeapositioninfosource-members.html b/doc/html/qnmeapositioninfosource-members.html index 3d402adb88..3d673581af 100644 --- a/doc/html/qnmeapositioninfosource-members.html +++ b/doc/html/qnmeapositioninfosource-members.html @@ -90,6 +90,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qnmeapositioninfosource.html b/doc/html/qnmeapositioninfosource.html index f9bb312e58..7d56cb0754 100644 --- a/doc/html/qnmeapositioninfosource.html +++ b/doc/html/qnmeapositioninfosource.html @@ -138,6 +138,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qradiotuner-members.html b/doc/html/qradiotuner-members.html index 5c56bc2cab..275c7f9fb0 100644 --- a/doc/html/qradiotuner-members.html +++ b/doc/html/qradiotuner-members.html @@ -125,6 +125,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qradiotuner.html b/doc/html/qradiotuner.html index 8684bd6fdd..1776d7a60e 100644 --- a/doc/html/qradiotuner.html +++ b/doc/html/qradiotuner.html @@ -379,6 +379,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qradiotunercontrol-members.html b/doc/html/qradiotunercontrol-members.html index 0ef404c299..807f44ce08 100644 --- a/doc/html/qradiotunercontrol-members.html +++ b/doc/html/qradiotunercontrol-members.html @@ -104,6 +104,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qradiotunercontrol.html b/doc/html/qradiotunercontrol.html index b438ba39ca..16eadd4bc7 100644 --- a/doc/html/qradiotunercontrol.html +++ b/doc/html/qradiotunercontrol.html @@ -231,6 +231,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qservicecontext-members.html b/doc/html/qservicecontext-members.html index 415c25dcfc..fe3c02192f 100644 --- a/doc/html/qservicecontext-members.html +++ b/doc/html/qservicecontext-members.html @@ -77,6 +77,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qservicecontext.html b/doc/html/qservicecontext.html index 2d1eeeddac..42a30cfba8 100644 --- a/doc/html/qservicecontext.html +++ b/doc/html/qservicecontext.html @@ -117,6 +117,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qservicefilter-members.html b/doc/html/qservicefilter-members.html index 1572443c3a..27b8da38ce 100644 --- a/doc/html/qservicefilter-members.html +++ b/doc/html/qservicefilter-members.html @@ -46,6 +46,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qservicefilter.html b/doc/html/qservicefilter.html index cb51499a94..2a6c11fd0e 100644 --- a/doc/html/qservicefilter.html +++ b/doc/html/qservicefilter.html @@ -172,6 +172,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qserviceinterfacedescriptor-members.html b/doc/html/qserviceinterfacedescriptor-members.html index f5176f04c6..9642bd9b10 100644 --- a/doc/html/qserviceinterfacedescriptor-members.html +++ b/doc/html/qserviceinterfacedescriptor-members.html @@ -40,6 +40,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qserviceinterfacedescriptor.html b/doc/html/qserviceinterfacedescriptor.html index d47b10ff85..dadf875ab4 100644 --- a/doc/html/qserviceinterfacedescriptor.html +++ b/doc/html/qserviceinterfacedescriptor.html @@ -137,6 +137,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qservicemanager-members.html b/doc/html/qservicemanager-members.html index 6fc5a8dbbf..6664f2b21f 100644 --- a/doc/html/qservicemanager-members.html +++ b/doc/html/qservicemanager-members.html @@ -91,6 +91,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qservicemanager.html b/doc/html/qservicemanager.html index fb569a0393..deb007d783 100644 --- a/doc/html/qservicemanager.html +++ b/doc/html/qservicemanager.html @@ -113,6 +113,7 @@ <a name="//apple_ref/cpp/econst/QServiceManager/UserScope"></a> <a name="//apple_ref/cpp/econst/QServiceManager/SystemScope"></a> <h3 class="fn"><a name="Scope-enum"></a>enum QServiceManager::Scope</h3> +<p>Defines the scope to be used when accessing services. Note that Symbian does not distinguish scopes and therefore UserScope and SystemScope may be used interchangeably.</p> <p><table class="valuelist" border="1" cellpadding="2" cellspacing="1" width="100%"> <tr><th width="25%">Constant</th><th width="15%">Value</th><th width="60%">Description</th></tr> <tr><td valign="top"><tt>QServiceManager::UserScope</tt></td><td align="center" valign="top"><tt>0</tt></td><td valign="top">When adding and removing services, uses a storage location specific to the current user. When searching for services and interface implementations, first searches in the user-specific location; if the service or interface implementation is not found, searches in the system-wide storage location (if the user has sufficient permissions to do so).</td></tr> @@ -216,6 +217,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qserviceplugininterface-members.html b/doc/html/qserviceplugininterface-members.html index 0594f02265..d0b0ba447b 100644 --- a/doc/html/qserviceplugininterface-members.html +++ b/doc/html/qserviceplugininterface-members.html @@ -23,6 +23,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qserviceplugininterface.html b/doc/html/qserviceplugininterface.html index af0f177d37..785007df06 100644 --- a/doc/html/qserviceplugininterface.html +++ b/doc/html/qserviceplugininterface.html @@ -50,6 +50,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qsystemdeviceinfo-members.html b/doc/html/qsystemdeviceinfo-members.html index 506840b9bd..ae6a39be11 100644 --- a/doc/html/qsystemdeviceinfo-members.html +++ b/doc/html/qsystemdeviceinfo-members.html @@ -94,6 +94,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qsystemdeviceinfo.html b/doc/html/qsystemdeviceinfo.html index 7092588c5e..27c70e2b04 100644 --- a/doc/html/qsystemdeviceinfo.html +++ b/doc/html/qsystemdeviceinfo.html @@ -319,6 +319,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qsystemdisplayinfo-members.html b/doc/html/qsystemdisplayinfo-members.html index d6a22a5a84..7b30ebe69b 100644 --- a/doc/html/qsystemdisplayinfo-members.html +++ b/doc/html/qsystemdisplayinfo-members.html @@ -73,6 +73,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qsystemdisplayinfo.html b/doc/html/qsystemdisplayinfo.html index 566b21ea80..09f04b2e36 100644 --- a/doc/html/qsystemdisplayinfo.html +++ b/doc/html/qsystemdisplayinfo.html @@ -71,6 +71,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qsysteminfo-members.html b/doc/html/qsysteminfo-members.html index 8656e85a95..caacb70a05 100644 --- a/doc/html/qsysteminfo-members.html +++ b/doc/html/qsysteminfo-members.html @@ -79,6 +79,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qsysteminfo.html b/doc/html/qsysteminfo.html index e0e25747ad..dc606f8c7c 100644 --- a/doc/html/qsysteminfo.html +++ b/doc/html/qsysteminfo.html @@ -186,6 +186,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qsystemnetworkinfo-members.html b/doc/html/qsystemnetworkinfo-members.html index fe739a633b..2968007bff 100644 --- a/doc/html/qsystemnetworkinfo-members.html +++ b/doc/html/qsystemnetworkinfo-members.html @@ -91,6 +91,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qsystemnetworkinfo.html b/doc/html/qsystemnetworkinfo.html index 96937872f8..00ee4667b7 100644 --- a/doc/html/qsystemnetworkinfo.html +++ b/doc/html/qsystemnetworkinfo.html @@ -244,6 +244,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qsystemscreensaver-members.html b/doc/html/qsystemscreensaver-members.html index e35e8c95c4..01367b6fa0 100644 --- a/doc/html/qsystemscreensaver-members.html +++ b/doc/html/qsystemscreensaver-members.html @@ -73,6 +73,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qsystemscreensaver.html b/doc/html/qsystemscreensaver.html index 2727be2015..91bdfe0c87 100644 --- a/doc/html/qsystemscreensaver.html +++ b/doc/html/qsystemscreensaver.html @@ -81,6 +81,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qsystemstorageinfo-members.html b/doc/html/qsystemstorageinfo-members.html index 81c3fb989e..8230f8be22 100644 --- a/doc/html/qsystemstorageinfo-members.html +++ b/doc/html/qsystemstorageinfo-members.html @@ -76,6 +76,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qsystemstorageinfo.html b/doc/html/qsystemstorageinfo.html index d8adec0387..73c2d58b7e 100644 --- a/doc/html/qsystemstorageinfo.html +++ b/doc/html/qsystemstorageinfo.html @@ -117,6 +117,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qt-mobility-project-library.dcf b/doc/html/qt-mobility-project-library.dcf index 72a6e4d401..c467c33338 100644 --- a/doc/html/qt-mobility-project-library.dcf +++ b/doc/html/qt-mobility-project-library.dcf @@ -3168,11 +3168,11 @@ <section ref="examples.html" title="Qt Mobility Examples"> <keyword ref="examples.html">Qt Mobility Examples</keyword> </section> - <section ref="mobility.html" title="Qt Mobility Project APIs (Technical Preview)"> - <keyword ref="mobility.html">Qt Mobility Project APIs (Technical Preview)</keyword> + <section ref="mobility.html" title="Qt Mobility Project APIs"> + <keyword ref="mobility.html">Qt Mobility Project APIs</keyword> </section> - <section ref="index.html" title="Qt Mobility Project APIs (Technical Preview) Overview"> - <keyword ref="index.html">Qt Mobility Project APIs (Technical Preview) Overview</keyword> + <section ref="index.html" title="Qt Mobility Project APIs Overview"> + <keyword ref="index.html">Qt Mobility Project APIs Overview</keyword> </section> <section ref="service-frameworks.html" title="Qt Service Framework"> <keyword ref="service-frameworks.html">Qt Service Framework</keyword> @@ -3180,8 +3180,8 @@ <section ref="service-framework-on-symbian.html" title="Qt Service Framework on Symbian"> <keyword ref="service-framework-on-symbian.html">Qt Service Framework on Symbian</keyword> </section> - <section ref="qtmobility-known-issues.html" title="Release Notes of the QtMobility Project (Technology Preview)"> - <keyword ref="qtmobility-known-issues.html">Release Notes of the QtMobility Project (Technology Preview)</keyword> + <section ref="qtmobility-known-issues.html" title="Release Notes of the QtMobility Project"> + <keyword ref="qtmobility-known-issues.html">Release Notes of the QtMobility Project</keyword> </section> <section ref="servicefw.html" title="Service Frameworks Classes"> <keyword ref="servicefw.html">Service Frameworks Classes</keyword> @@ -3239,8 +3239,8 @@ <section ref="filemanagerplugin.html" title="File Manager Plugin Example"> <keyword ref="filemanagerplugin.html">File Manager Plugin Example</keyword> </section> - <section ref="incomingcalls.html" title="Incoming Calls Example"> - <keyword ref="incomingcalls.html">Incoming Calls Example</keyword> + <section ref="incomingcalls.html" title="Incoming Call Simulator"> + <keyword ref="incomingcalls.html">Incoming Call Simulator</keyword> </section> <section ref="keepintouch.html" title="Keep in Touch Example"> <keyword ref="keepintouch.html">Keep in Touch Example</keyword> diff --git a/doc/html/qt-mobility-project-library.index b/doc/html/qt-mobility-project-library.index index e08ca38969..9f0e834f8f 100644 --- a/doc/html/qt-mobility-project-library.index +++ b/doc/html/qt-mobility-project-library.index @@ -6226,17 +6226,6 @@ <page access="public" status="commendable" name="fetchgooglemaps/main.cpp" href="fetchgooglemaps-main-cpp.html" subtype="file" title="" fulltitle="main.cpp Example File" subtitle="fetchgooglemaps/main.cpp" location=""/> <page access="public" status="commendable" name="fetchgooglemaps/fetchgooglemaps.pro" href="fetchgooglemaps-fetchgooglemaps-pro.html" subtype="file" title="" fulltitle="fetchgooglemaps.pro Example File" subtitle="fetchgooglemaps/fetchgooglemaps.pro" location=""/> </page> - <page access="public" status="commendable" name="incomingcalls" href="incomingcalls.html" subtype="example" title="Incoming Calls Example" fulltitle="Incoming Calls Example" subtitle="" location="undocumented.qdoc"> - <page access="public" status="commendable" name="incomingcalls/filterdialog.cpp" href="incomingcalls-filterdialog-cpp.html" subtype="file" title="" fulltitle="filterdialog.cpp Example File" subtitle="incomingcalls/filterdialog.cpp" location=""/> - <page access="public" status="commendable" name="incomingcalls/filterdialog.h" href="incomingcalls-filterdialog-h.html" subtype="file" title="" fulltitle="filterdialog.h Example File" subtitle="incomingcalls/filterdialog.h" location=""/> - <page access="public" status="commendable" name="incomingcalls/qcontactlistmodel.cpp" href="incomingcalls-qcontactlistmodel-cpp.html" subtype="file" title="" fulltitle="qcontactlistmodel.cpp Example File" subtitle="incomingcalls/qcontactlistmodel.cpp" location=""/> - <page access="public" status="commendable" name="incomingcalls/qcontactlistmodel.h" href="incomingcalls-qcontactlistmodel-h.html" subtype="file" title="" fulltitle="qcontactlistmodel.h Example File" subtitle="incomingcalls/qcontactlistmodel.h" location=""/> - <page access="public" status="commendable" name="incomingcalls/qcontactlistmodel_p.h" href="incomingcalls-qcontactlistmodel-p-h.html" subtype="file" title="" fulltitle="qcontactlistmodel_p.h Example File" subtitle="incomingcalls/qcontactlistmodel_p.h" location=""/> - <page access="public" status="commendable" name="incomingcalls/testmodelui.cpp" href="incomingcalls-testmodelui-cpp.html" subtype="file" title="" fulltitle="testmodelui.cpp Example File" subtitle="incomingcalls/testmodelui.cpp" location=""/> - <page access="public" status="commendable" name="incomingcalls/testmodelui.h" href="incomingcalls-testmodelui-h.html" subtype="file" title="" fulltitle="testmodelui.h Example File" subtitle="incomingcalls/testmodelui.h" location=""/> - <page access="public" status="commendable" name="incomingcalls/main.cpp" href="incomingcalls-main-cpp.html" subtype="file" title="" fulltitle="main.cpp Example File" subtitle="incomingcalls/main.cpp" location=""/> - <page access="public" status="commendable" name="incomingcalls/incomingcalls.pro" href="incomingcalls-incomingcalls-pro.html" subtype="file" title="" fulltitle="incomingcalls.pro Example File" subtitle="incomingcalls/incomingcalls.pro" location=""/> - </page> <page access="public" status="commendable" name="keepintouch" href="keepintouch.html" subtype="example" title="Keep in Touch Example" fulltitle="Keep in Touch Example" subtitle="" location="undocumented.qdoc"> <page access="public" status="commendable" name="keepintouch/addressfinder.cpp" href="keepintouch-addressfinder-cpp.html" subtype="file" title="" fulltitle="addressfinder.cpp Example File" subtitle="keepintouch/addressfinder.cpp" location=""/> <page access="public" status="commendable" name="keepintouch/addressfinder.h" href="keepintouch-addressfinder-h.html" subtype="file" title="" fulltitle="addressfinder.h Example File" subtitle="keepintouch/addressfinder.h" location=""/> @@ -6428,6 +6417,22 @@ <contents name="nokia-qt-lgpl-exception-version-1-0" title="Nokia Qt LGPL Exception version 1.0" level="1"/> </page> <function access="public" threadsafety="unspecified" status="commendable" name="QCameraExposureControl_iid" href="qcameraexposurecontrol.html#QCameraExposureControl_iid" location="qcameraexposurecontrol.cpp" virtual="non" meta="macrowithoutparams" const="false" static="false" overload="false" relates="QCameraExposureControl" type="" signature="QCameraExposureControl_iid()"/> + <page access="public" status="commendable" name="incomingcalls" href="incomingcalls.html" subtype="example" title="Incoming Call Simulator" fulltitle="Incoming Call Simulator" subtitle="" location="incomingcalls.qdoc"> + <contents name="incoming-calls" title="Incoming Calls" level="1"/> + <contents name="motivation" title="Motivation" level="2"/> + <contents name="use-case" title="Use Case" level="2"/> + <contents name="interface" title="Interface" level="2"/> + <contents name="known-issues" title="Known Issues" level="2"/> + <page access="public" status="commendable" name="incomingcalls/filterdialog.cpp" href="incomingcalls-filterdialog-cpp.html" subtype="file" title="" fulltitle="filterdialog.cpp Example File" subtitle="incomingcalls/filterdialog.cpp" location=""/> + <page access="public" status="commendable" name="incomingcalls/filterdialog.h" href="incomingcalls-filterdialog-h.html" subtype="file" title="" fulltitle="filterdialog.h Example File" subtitle="incomingcalls/filterdialog.h" location=""/> + <page access="public" status="commendable" name="incomingcalls/qcontactlistmodel.cpp" href="incomingcalls-qcontactlistmodel-cpp.html" subtype="file" title="" fulltitle="qcontactlistmodel.cpp Example File" subtitle="incomingcalls/qcontactlistmodel.cpp" location=""/> + <page access="public" status="commendable" name="incomingcalls/qcontactlistmodel.h" href="incomingcalls-qcontactlistmodel-h.html" subtype="file" title="" fulltitle="qcontactlistmodel.h Example File" subtitle="incomingcalls/qcontactlistmodel.h" location=""/> + <page access="public" status="commendable" name="incomingcalls/qcontactlistmodel_p.h" href="incomingcalls-qcontactlistmodel-p-h.html" subtype="file" title="" fulltitle="qcontactlistmodel_p.h Example File" subtitle="incomingcalls/qcontactlistmodel_p.h" location=""/> + <page access="public" status="commendable" name="incomingcalls/testmodelui.cpp" href="incomingcalls-testmodelui-cpp.html" subtype="file" title="" fulltitle="testmodelui.cpp Example File" subtitle="incomingcalls/testmodelui.cpp" location=""/> + <page access="public" status="commendable" name="incomingcalls/testmodelui.h" href="incomingcalls-testmodelui-h.html" subtype="file" title="" fulltitle="testmodelui.h Example File" subtitle="incomingcalls/testmodelui.h" location=""/> + <page access="public" status="commendable" name="incomingcalls/main.cpp" href="incomingcalls-main-cpp.html" subtype="file" title="" fulltitle="main.cpp Example File" subtitle="incomingcalls/main.cpp" location=""/> + <page access="public" status="commendable" name="incomingcalls/incomingcalls.pro" href="incomingcalls-incomingcalls-pro.html" subtype="file" title="" fulltitle="incomingcalls.pro Example File" subtitle="incomingcalls/incomingcalls.pro" location=""/> + </page> <function access="public" threadsafety="unspecified" status="commendable" name="QVideoWindowControl_iid" href="qvideowindowcontrol.html#QVideoWindowControl_iid" location="qvideowindowcontrol.cpp" virtual="non" meta="macrowithoutparams" const="false" static="false" overload="false" relates="QVideoWindowControl" type="" signature="QVideoWindowControl_iid()"/> <page access="public" status="commendable" name="keepintouch" href="keepintouch.html" subtype="example" title="'Keep in Touch' Example" fulltitle="'Keep in Touch' Example" subtitle="" location="keepintouch.qdoc"> <page access="public" status="commendable" name="keepintouch/addressfinder.cpp" href="keepintouch-addressfinder-cpp.html" subtype="file" title="" fulltitle="addressfinder.cpp Example File" subtitle="keepintouch/addressfinder.cpp" location=""/> @@ -6472,8 +6477,8 @@ <contents name="classes" title="Classes" level="1"/> </page> <function access="public" threadsafety="unspecified" status="commendable" name="QVideoOutputControl_iid" href="qvideooutputcontrol.html#QVideoOutputControl_iid" location="qvideooutputcontrol.cpp" virtual="non" meta="macrowithoutparams" const="false" static="false" overload="false" relates="QVideoOutputControl" type="" signature="QVideoOutputControl_iid()"/> - <page access="public" status="commendable" name="mobility" href="mobility.html" subtype="group" title="Qt Mobility Project APIs (Technical Preview)" fulltitle="Qt Mobility Project APIs (Technical Preview)" subtitle="" location="index.qdoc"/> - <page access="public" status="commendable" name="index.html" href="index.html" subtype="page" title="Qt Mobility Project APIs (Technical Preview) Overview" fulltitle="Qt Mobility Project APIs (Technical Preview) Overview" subtitle="" location="index.qdoc"> + <page access="public" status="commendable" name="mobility" href="mobility.html" subtype="group" title="Qt Mobility Project APIs" fulltitle="Qt Mobility Project APIs" subtitle="" location="index.qdoc"/> + <page access="public" status="commendable" name="index.html" href="index.html" subtype="page" title="Qt Mobility Project APIs Overview" fulltitle="Qt Mobility Project APIs Overview" subtitle="" location="index.qdoc"> <contents name="overview" title="Overview" level="1"/> <contents name="introducing-the-new-qt-apis" title="Introducing the New Qt APIs" level="2"/> <contents name="getting-started" title="Getting Started" level="2"/> @@ -6487,7 +6492,7 @@ <contents name="multimedia" title="Multimedia" level="2"/> <contents name="service-framework" title="Service Framework" level="2"/> <contents name="system-information" title="System Information" level="2"/> - <contents name="future-additions" title="Future Additions" level="1"/> + <contents name="future-additions-and-considerations" title="Future Additions and Considerations" level="1"/> <contents name="platform-compatability" title="Platform Compatability" level="1"/> <contents name="feedback-and-bug-reports" title="Feedback and bug reports" level="1"/> </page> @@ -6588,22 +6593,14 @@ <contents name="use-case" title="Use Case" level="2"/> <contents name="interface" title="Interface" level="2"/> <contents name="known-issues" title="Known Issues" level="2"/> - <page access="public" status="commendable" name="samplephonebook/contactdetailsform.cpp" href="samplephonebook-contactdetailsform-cpp.html" subtype="file" title="" fulltitle="contactdetailsform.cpp Example File" subtitle="samplephonebook/contactdetailsform.cpp" location=""/> - <page access="public" status="commendable" name="samplephonebook/contactdetailsform.h" href="samplephonebook-contactdetailsform-h.html" subtype="file" title="" fulltitle="contactdetailsform.h Example File" subtitle="samplephonebook/contactdetailsform.h" location=""/> - <page access="public" status="commendable" name="samplephonebook/finddialog.cpp" href="samplephonebook-finddialog-cpp.html" subtype="file" title="" fulltitle="finddialog.cpp Example File" subtitle="samplephonebook/finddialog.cpp" location=""/> - <page access="public" status="commendable" name="samplephonebook/finddialog.h" href="samplephonebook-finddialog-h.html" subtype="file" title="" fulltitle="finddialog.h Example File" subtitle="samplephonebook/finddialog.h" location=""/> - <page access="public" status="commendable" name="samplephonebook/groupdetailsdialog.cpp" href="samplephonebook-groupdetailsdialog-cpp.html" subtype="file" title="" fulltitle="groupdetailsdialog.cpp Example File" subtitle="samplephonebook/groupdetailsdialog.cpp" location=""/> - <page access="public" status="commendable" name="samplephonebook/groupdetailsdialog.h" href="samplephonebook-groupdetailsdialog-h.html" subtype="file" title="" fulltitle="groupdetailsdialog.h Example File" subtitle="samplephonebook/groupdetailsdialog.h" location=""/> - <page access="public" status="commendable" name="samplephonebook/groupeditdialog.cpp" href="samplephonebook-groupeditdialog-cpp.html" subtype="file" title="" fulltitle="groupeditdialog.cpp Example File" subtitle="samplephonebook/groupeditdialog.cpp" location=""/> - <page access="public" status="commendable" name="samplephonebook/groupeditdialog.h" href="samplephonebook-groupeditdialog-h.html" subtype="file" title="" fulltitle="groupeditdialog.h Example File" subtitle="samplephonebook/groupeditdialog.h" location=""/> - <page access="public" status="commendable" name="samplephonebook/maindialogform_240_320.cpp" href="samplephonebook-maindialogform-240-320-cpp.html" subtype="file" title="" fulltitle="maindialogform_240_320.cpp Example File" subtitle="samplephonebook/maindialogform_240_320.cpp" location=""/> - <page access="public" status="commendable" name="samplephonebook/maindialogform_240_320.h" href="samplephonebook-maindialogform-240-320-h.html" subtype="file" title="" fulltitle="maindialogform_240_320.h Example File" subtitle="samplephonebook/maindialogform_240_320.h" location=""/> - <page access="public" status="commendable" name="samplephonebook/maindialogform_640_480.cpp" href="samplephonebook-maindialogform-640-480-cpp.html" subtype="file" title="" fulltitle="maindialogform_640_480.cpp Example File" subtitle="samplephonebook/maindialogform_640_480.cpp" location=""/> - <page access="public" status="commendable" name="samplephonebook/maindialogform_640_480.h" href="samplephonebook-maindialogform-640-480-h.html" subtype="file" title="" fulltitle="maindialogform_640_480.h Example File" subtitle="samplephonebook/maindialogform_640_480.h" location=""/> + <page access="public" status="commendable" name="samplephonebook/contacteditor.cpp" href="samplephonebook-contacteditor-cpp.html" subtype="file" title="" fulltitle="contacteditor.cpp Example File" subtitle="samplephonebook/contacteditor.cpp" location=""/> + <page access="public" status="commendable" name="samplephonebook/contacteditor.h" href="samplephonebook-contacteditor-h.html" subtype="file" title="" fulltitle="contacteditor.h Example File" subtitle="samplephonebook/contacteditor.h" location=""/> + <page access="public" status="commendable" name="samplephonebook/contactlistpage.cpp" href="samplephonebook-contactlistpage-cpp.html" subtype="file" title="" fulltitle="contactlistpage.cpp Example File" subtitle="samplephonebook/contactlistpage.cpp" location=""/> + <page access="public" status="commendable" name="samplephonebook/contactlistpage.h" href="samplephonebook-contactlistpage-h.html" subtype="file" title="" fulltitle="contactlistpage.h Example File" subtitle="samplephonebook/contactlistpage.h" location=""/> + <page access="public" status="commendable" name="samplephonebook/filterpage.cpp" href="samplephonebook-filterpage-cpp.html" subtype="file" title="" fulltitle="filterpage.cpp Example File" subtitle="samplephonebook/filterpage.cpp" location=""/> + <page access="public" status="commendable" name="samplephonebook/filterpage.h" href="samplephonebook-filterpage-h.html" subtype="file" title="" fulltitle="filterpage.h Example File" subtitle="samplephonebook/filterpage.h" location=""/> <page access="public" status="commendable" name="samplephonebook/phonebook.cpp" href="samplephonebook-phonebook-cpp.html" subtype="file" title="" fulltitle="phonebook.cpp Example File" subtitle="samplephonebook/phonebook.cpp" location=""/> <page access="public" status="commendable" name="samplephonebook/phonebook.h" href="samplephonebook-phonebook-h.html" subtype="file" title="" fulltitle="phonebook.h Example File" subtitle="samplephonebook/phonebook.h" location=""/> - <page access="public" status="commendable" name="samplephonebook/serialiser.cpp" href="samplephonebook-serialiser-cpp.html" subtype="file" title="" fulltitle="serialiser.cpp Example File" subtitle="samplephonebook/serialiser.cpp" location=""/> - <page access="public" status="commendable" name="samplephonebook/serialiser.h" href="samplephonebook-serialiser-h.html" subtype="file" title="" fulltitle="serialiser.h Example File" subtitle="samplephonebook/serialiser.h" location=""/> <page access="public" status="commendable" name="samplephonebook/main.cpp" href="samplephonebook-main-cpp.html" subtype="file" title="" fulltitle="main.cpp Example File" subtitle="samplephonebook/main.cpp" location=""/> <page access="public" status="commendable" name="samplephonebook/samplephonebook.pro" href="samplephonebook-samplephonebook-pro.html" subtype="file" title="" fulltitle="samplephonebook.pro Example File" subtitle="samplephonebook/samplephonebook.pro" location=""/> </page> @@ -6682,13 +6679,14 @@ <contents name="building" title="Building" level="1"/> <contents name="building-on-unix" title="Building On Unix" level="2"/> <contents name="building-on-windows" title="Building On Windows" level="2"/> + <contents name="building-for-symbian-on-windows" title="Building For Symbian On Windows" level="2"/> <contents name="building-individual-qt-mobility-domains" title="Building Individual Qt Mobility Domains" level="2"/> <contents name="environment-variables" title="Environment Variables" level="1"/> </page> <function access="public" threadsafety="unspecified" status="commendable" name="QVideoWidgetControl_iid" href="qvideowidgetcontrol.html#QVideoWidgetControl_iid" location="qvideowidgetcontrol.cpp" virtual="non" meta="macrowithoutparams" const="false" static="false" overload="false" relates="QVideoWidgetControl" type="" signature="QVideoWidgetControl_iid()"/> <function access="public" threadsafety="unspecified" status="commendable" name="QAudioDeviceControl_iid" href="qaudiodevicecontrol.html#QAudioDeviceControl_iid" location="qaudiodevicecontrol.cpp" virtual="non" meta="macrowithoutparams" const="false" static="false" overload="false" relates="QAudioDeviceControl" type="" signature="QAudioDeviceControl_iid()"/> <page access="public" status="commendable" name="http://bugreports.qt.nokia.com" href="http-bugreports-qt-nokia-com.html" subtype="externalpage" title="QtMobility Project Bug Tracker" fulltitle="QtMobility Project Bug Tracker" subtitle="" location="qtmobility-known-issues.qdoc"/> - <page access="public" status="commendable" name="qtmobility-known-issues.html" href="qtmobility-known-issues.html" subtype="page" title="Release Notes of the QtMobility Project (Technology Preview)" fulltitle="Release Notes of the QtMobility Project (Technology Preview)" subtitle="" location="qtmobility-known-issues.qdoc"> + <page access="public" status="commendable" name="qtmobility-known-issues.html" href="qtmobility-known-issues.html" subtype="page" title="Release Notes of the QtMobility Project" fulltitle="Release Notes of the QtMobility Project" subtitle="" location="qtmobility-known-issues.qdoc"> <contents name="new-features" title="New Features" level="1"/> <contents name="detailed-feature-support-symbian-s60" title="Detailed Feature support - Symbian/S60" level="2"/> <contents name="bearer-management-api" title="Bearer Management API" level="3"/> diff --git a/doc/html/qtmedia.html b/doc/html/qtmedia.html index 3dfcf379f8..f89a658ea5 100644 --- a/doc/html/qtmedia.html +++ b/doc/html/qtmedia.html @@ -260,6 +260,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qtmobility-known-issues.html b/doc/html/qtmobility-known-issues.html index c203562686..6135be66eb 100644 --- a/doc/html/qtmobility-known-issues.html +++ b/doc/html/qtmobility-known-issues.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qtmobility-known-issues.qdoc --> <head> - <title>Qt Mobility Project 1.0: Release Notes of the QtMobility Project (Technology Preview)</title> + <title>Qt Mobility Project 1.0: Release Notes of the QtMobility Project</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -12,7 +12,7 @@ <tr> <td align="left" valign="top" width="32"><a href="http://qt.nokia.com/"><img src="images/qtlogo.png" align="left" border="0" /></a></td> <td width="1"> </td><td class="postheader" valign="center"><a href="index.html"><font color="#004faf">Home</font></a> · <a href="classes.html"><font color="#004faf">All Classes</font></a> · <a href="functions.html"><font color="#004faf">All Functions</font></a> ·</td> -<td align="right" valign="top" width="230"><img src="images/codeless.png" border="0" /></td></tr></table><h1 class="title">Release Notes of the QtMobility Project (Technology Preview)<br /><span class="subtitle"></span> +<td align="right" valign="top" width="230"><img src="images/codeless.png" border="0" /></td></tr></table><h1 class="title">Release Notes of the QtMobility Project<br /><span class="subtitle"></span> </h1> <p>An up-to-date list of known issues with the release can be found via the <a href="http://bugreports.qt.nokia.com">QtMobility Project Bug Tracker</a> on the Qt website which provides additional information about known issues and tasks related to Qt and the QtMobility Project.</p> <p>The new Qt APIs are typically supported by backends for each platform. For overall summary of the completeness/compatibility of support for a given API see <a href="index.html#platform-compatability">Platform Compatability</a>.</p> @@ -126,13 +126,16 @@ <a name="issues-affecting-all-platforms"></a> <h3>Issues Affecting All Platforms</h3> <ul> -<li>For this release all QtMobility library names have a <b>_tp</b> suffix</li> <li>Messaging filtering and Sorting functions are not fully optimized.</li> <li>Versit support for Contacts API is ALPHA, see <tt>src/versit/README</tt></li> <li>Not all example applications will display(fit) well on small screens.</li> </ul> <a name="symbian-s60-specific"></a> <h3>Symbian/S60 Specific</h3> +<p>Currently it is not possible to use Qt convenience header includes:</p> +<pre> #include <QSystemInfo> <span class="comment">//does not work on Symbian</span> +<span class="comment"> //use</span> + #include <qsysteminfo.h></pre> <a name="bearer-management"></a> <h4>Bearer Management</h4> <p>No specific issues to highlight.</p> @@ -236,6 +239,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qtmobility.qhp b/doc/html/qtmobility.qhp index 16e53c3834..a7d26425f5 100644 --- a/doc/html/qtmobility.qhp +++ b/doc/html/qtmobility.qhp @@ -484,7 +484,7 @@ <section ref="declarative.html" title="Declarative Example"/> <section ref="fetchgooglemaps.html" title="Fetch Google Maps Example"/> <section ref="filemanagerplugin.html" title="File Manager Plugin Example"/> - <section ref="incomingcalls.html" title="Incoming Calls Example"/> + <section ref="incomingcalls.html" title="Incoming Call Simulator"/> <section ref="keepintouch.html" title="Keep in Touch Example"/> <section ref="logfilepositionsource.html" title="Log File Position Source Example"/> <section ref="player.html" title="Media Player Example"/> @@ -529,11 +529,11 @@ <section ref="contactsschema.html" title="Qt Contacts Schema"/> <section ref="editions.html" title="Qt Editions"/> <section ref="examples.html" title="Qt Mobility Examples"/> - <section ref="mobility.html" title="Qt Mobility Project APIs (Technical Preview)"/> - <section ref="index.html" title="Qt Mobility Project APIs (Technical Preview) Overview"/> + <section ref="mobility.html" title="Qt Mobility Project APIs"/> + <section ref="index.html" title="Qt Mobility Project APIs Overview"/> <section ref="service-frameworks.html" title="Qt Service Framework"/> <section ref="service-framework-on-symbian.html" title="Qt Service Framework on Symbian"/> - <section ref="qtmobility-known-issues.html" title="Release Notes of the QtMobility Project (Technology Preview)"/> + <section ref="qtmobility-known-issues.html" title="Release Notes of the QtMobility Project"/> <section ref="servicefw.html" title="Service Frameworks Classes"/> <section ref="systeminfo.html" title="System Information"/> <section ref="systeminfo.html" title="System Information Classes"/> @@ -564,7 +564,7 @@ <keyword name="Future Additional APIs" id="Future Additional APIs" ref="future.html"/> <keyword name="GNU General Public License (GPL)" id="GNU General Public License (GPL)" ref="gpl.html"/> <keyword name="GNU Lesser General Public License (LGPL)" id="GNU Lesser General Public License (LGPL)" ref="lgpl.html"/> - <keyword name="Incoming Calls Example" id="Incoming Calls Example" ref="incomingcalls.html"/> + <keyword name="Incoming Call Simulator" id="Incoming Call Simulator" ref="incomingcalls.html"/> <keyword name="Inheritance Hierarchy" id="Inheritance Hierarchy" ref="hierarchy.html"/> <keyword name="Installation Guide" id="Installation Guide" ref="installation.html"/> <keyword name="Keep in Touch Example" id="Keep in Touch Example" ref="keepintouch.html"/> @@ -3109,8 +3109,8 @@ <keyword name="Qt Contacts Schema" id="Qt Contacts Schema" ref="contactsschema.html"/> <keyword name="Qt Editions" id="Qt Editions" ref="editions.html"/> <keyword name="Qt Mobility Examples" id="Qt Mobility Examples" ref="examples.html"/> - <keyword name="Qt Mobility Project APIs (Technical Preview)" id="Qt Mobility Project APIs (Technical Preview)" ref="mobility.html"/> - <keyword name="Qt Mobility Project APIs (Technical Preview) Overview" id="Qt Mobility Project APIs (Technical Preview) Overview" ref="index.html"/> + <keyword name="Qt Mobility Project APIs" id="Qt Mobility Project APIs" ref="mobility.html"/> + <keyword name="Qt Mobility Project APIs Overview" id="Qt Mobility Project APIs Overview" ref="index.html"/> <keyword name="Qt Service Framework" id="Qt Service Framework" ref="service-frameworks.html"/> <keyword name="Qt Service Framework on Symbian" id="Qt Service Framework on Symbian" ref="service-framework-on-symbian.html"/> <keyword name="QtMedia" id="QtMedia" ref="qtmedia.html"/> @@ -3208,7 +3208,7 @@ <keyword name="Quickstart Example" id="Quickstart Example" ref="quickstart.html"/> <keyword name="Radio Example" id="Radio Example" ref="radio.html"/> <keyword name="Recorder Example" id="Recorder Example" ref="recorder.html"/> - <keyword name="Release Notes of the QtMobility Project (Technology Preview)" id="Release Notes of the QtMobility Project (Technology Preview)" ref="qtmobility-known-issues.html"/> + <keyword name="Release Notes of the QtMobility Project" id="Release Notes of the QtMobility Project" ref="qtmobility-known-issues.html"/> <keyword name="Sample Phonebook Example" id="Sample Phonebook Example" ref="samplephonebook.html"/> <keyword name="Service Actions Example" id="Service Actions Example" ref="serviceactions.html"/> <keyword name="Service Browser Example" id="Service Browser Example" ref="servicebrowser.html"/> @@ -3231,7 +3231,6 @@ <file>qmessageaddress-members.html</file> <file>logfilepositionsource-clientapplication-cpp.html</file> <file>incomingcalls-filterdialog-h.html</file> - <file>samplephonebook-maindialogform-240-320-h.html</file> <file>qradiotunercontrol.html</file> <file>qvideoencodercontrol-members.html</file> <file>qcontactdetaildefinition.html</file> @@ -3300,7 +3299,6 @@ <file>images/servicebrowser-attributes.png</file> <file>writemessage-main-cpp.html</file> <file>qmessagefolderfilter-members.html</file> - <file>samplephonebook-contactdetailsform-h.html</file> <file>battery-charge-battery-charge-pro.html</file> <file>incomingcalls.html</file> <file>images/servicexmlgen.png</file> @@ -3344,6 +3342,7 @@ <file>logfilepositionsource.html</file> <file>qcontactfilter-members.html</file> <file>bearermonitor-sessionwidget-h.html</file> + <file>samplephonebook-contacteditor-h.html</file> <file>location-overview.html</file> <file>qcontactinvalidfilter.html</file> <file>qmediaplayercontrol-members.html</file> @@ -3358,7 +3357,6 @@ <file>qcontactanniversary.html</file> <file>qgeopositioninfosource-members.html</file> <file>qaudiocapturesource.html</file> - <file>samplephonebook-serialiser-cpp.html</file> <file>qmediaserviceproviderhint.html</file> <file>samplephonebook.html</file> <file>qmediaplaylistcontrol.html</file> @@ -3404,6 +3402,7 @@ <file>qcontactid.html</file> <file>qmessagefilter-members.html</file> <file>qmessagestore-members.html</file> + <file>samplephonebook-contacteditor-cpp.html</file> <file>qcontactnote.html</file> <file>qcontactonlineaccount-members.html</file> <file>incomingcalls-qcontactlistmodel-cpp.html</file> @@ -3414,7 +3413,7 @@ <file>qgraphicsvideoitem.html</file> <file>qimagecapturecontrol.html</file> <file>preview.html</file> - <file>samplephonebook-groupdetailsdialog-cpp.html</file> + <file>samplephonebook-contactlistpage-cpp.html</file> <file>filemanagerplugin-filemanagerplugin-pro.html</file> <file>qvideowidget-members.html</file> <file>qmessageaccountordering-members.html</file> @@ -3455,6 +3454,7 @@ <file>qcontactintersectionfilter-members.html</file> <file>qsystemdeviceinfo.html</file> <file>qcontactdetail-members.html</file> + <file>samplephonebook-filterpage-cpp.html</file> <file>qcontactfamily-members.html</file> <file>qcontactactiondescriptor-members.html</file> <file>qmediaplaylistioplugin-members.html</file> @@ -3468,6 +3468,7 @@ <file>qmessageordering-members.html</file> <file>qcontactlocalidfetchrequest-members.html</file> <file>qmessageid.html</file> + <file>samplephonebook-filterpage-h.html</file> <file>bearermonitor-bearermonitor-cpp.html</file> <file>qimageencodersettings-members.html</file> <file>qcontactbirthday.html</file> @@ -3549,10 +3550,8 @@ <file>publish-subscribe-publish-subscribe-pro.html</file> <file>examples.html</file> <file>cameracapture.html</file> - <file>samplephonebook-contactdetailsform-cpp.html</file> <file>qcontactaction-members.html</file> <file>battery-charge-battery-publisher-batterypublisher-h.html</file> - <file>samplephonebook-maindialogform-240-320-cpp.html</file> <file>qcontacttype.html</file> <file>declarative-sfwexample-h.html</file> <file>bluetoothtransferplugin.html</file> @@ -3605,20 +3604,17 @@ <file>qcontactdetailrangefilter-members.html</file> <file>qgeosatelliteinfosource.html</file> <file>qmediaserviceproviderplugin-members.html</file> - <file>samplephonebook-groupeditdialog-h.html</file> <file>qcontactanniversary-members.html</file> <file>licenses.html</file> <file>qmediaserviceproviderplugin.html</file> <file>qcontactinvalidengine.html</file> <file>qmediaplayer.html</file> <file>cameracapture-cameracapture-cpp.html</file> - <file>samplephonebook-finddialog-h.html</file> <file>qcontactphonenumber-members.html</file> <file>qmediaservicesupportedformatsinterface-members.html</file> <file>qvideooutputcontrol.html</file> <file>slideshow-main-cpp.html</file> <file>qmediaplaylistprovider.html</file> - <file>samplephonebook-serialiser-h.html</file> <file>declarative-voipdialer-voipdialerplugin-cpp.html</file> <file>qvaluespacesubscriber-members.html</file> <file>player.html</file> @@ -3665,11 +3661,9 @@ <file>recorder.html</file> <file>qmetadatacontrol-members.html</file> <file>radio-radio-cpp.html</file> - <file>samplephonebook-maindialogform-640-480-h.html</file> <file>qnetworkconfiguration-members.html</file> <file>qcontactgender-members.html</file> <file>player-playlistmodel-cpp.html</file> - <file>samplephonebook-groupdetailsdialog-h.html</file> <file>qmediaservicesupporteddevicesinterface-members.html</file> <file>qsystemscreensaver.html</file> <file>qcontactaddress-members.html</file> @@ -3695,9 +3689,9 @@ <file>qcontact.html</file> <file>gpl.html</file> <file>editions.html</file> + <file>samplephonebook-contactlistpage-h.html</file> <file>declarative-landlinedialer-landlinedialerplugin-cpp.html</file> <file>qaudioencodercontrol-members.html</file> - <file>samplephonebook-finddialog-cpp.html</file> <file>qmediaplaylistwriter.html</file> <file>qversitdocument-members.html</file> <file>qtmobility-known-issues.html</file> @@ -3707,7 +3701,6 @@ <file>qradiotunercontrol-members.html</file> <file>qcontactsynctarget.html</file> <file>qmediacontent-members.html</file> - <file>samplephonebook-groupeditdialog-cpp.html</file> <file>audiorecorder-audiorecorder-pro.html</file> <file>qmediaplaylist-members.html</file> <file>multimedia.html</file> @@ -3716,7 +3709,6 @@ <file>qmediaserviceprovider.html</file> <file>qcontactabstractrequest.html</file> <file>qgeopositioninfosource.html</file> - <file>samplephonebook-maindialogform-640-480-cpp.html</file> <file>publish-subscribe-subscriberdialog-cpp.html</file> <file>bearercloud-lan-svg.html</file> <file>qmediaservicefeaturesinterface-members.html</file> @@ -3731,8 +3723,8 @@ <file>classlists.html</file> <file>slideshow-slideshow-pro.html</file> <file>qcontactgender.html</file> - <file>qmessagecontentcontainerid-members.html</file> <file>qsystemstorageinfo-members.html</file> + <file>qmessagecontentcontainerid-members.html</file> <file>declarative-voipdialer-voipdialer-cpp.html</file> <file>qgeopositioninfo-members.html</file> <file>images/battery-subscriber.png</file> diff --git a/doc/html/querymessages-main-cpp.html b/doc/html/querymessages-main-cpp.html index b944ae6c54..b8516f2580 100644 --- a/doc/html/querymessages-main-cpp.html +++ b/doc/html/querymessages-main-cpp.html @@ -132,6 +132,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/querymessages-querymessages-pro.html b/doc/html/querymessages-querymessages-pro.html index b168a34f93..279f85b4ea 100644 --- a/doc/html/querymessages-querymessages-pro.html +++ b/doc/html/querymessages-querymessages-pro.html @@ -20,7 +20,8 @@ include(../examples.pri) - qtAddLibrary(QtMessaging) + CONFIG += mobility + MOBILITY = messaging INCLUDEPATH += ../../src/messaging symbian|win32 { @@ -43,6 +44,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/querymessages.html b/doc/html/querymessages.html index f22f406704..be87f822cc 100644 --- a/doc/html/querymessages.html +++ b/doc/html/querymessages.html @@ -48,6 +48,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/quickstart-main-cpp.html b/doc/html/quickstart-main-cpp.html index aca5697c67..3328a1d38d 100644 --- a/doc/html/quickstart-main-cpp.html +++ b/doc/html/quickstart-main-cpp.html @@ -57,7 +57,11 @@ #include <QApplication> #include <QLabel> + #ifdef Q_OS_SYMBIAN + #include <qsysteminfo.h> + #else #include <QSystemInfo> <span class="comment">//(1)</span> + #endif using namespace QtMobility; <span class="comment">//(2)</span> int main(int argc, char *argv[]) @@ -73,6 +77,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/quickstart-quickstart-pro.html b/doc/html/quickstart-quickstart-pro.html index fd20398db6..8d13cb5f50 100644 --- a/doc/html/quickstart-quickstart-pro.html +++ b/doc/html/quickstart-quickstart-pro.html @@ -28,6 +28,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/quickstart.html b/doc/html/quickstart.html index e27846ac83..06a3314123 100644 --- a/doc/html/quickstart.html +++ b/doc/html/quickstart.html @@ -30,7 +30,11 @@ <pre> #include <QApplication> #include <QLabel> + #ifdef Q_OS_SYMBIAN + #include <qsysteminfo.h> + #else #include <QSystemInfo> <span class="comment">//(1)</span> + #endif using namespace QtMobility; <span class="comment">//(2)</span> int main(int argc, char *argv[]) @@ -42,7 +46,7 @@ label->resize(100,30); return app.exec(); }</pre> -<p>Here we are using the <a href="qsysteminfo.html">QSystemInfo</a> headers to print out the system's current country code. All the domain APIs are wrapped within the <tt>QtMobility</tt> namespace and thus developers either need to declare <tt>using namespace QtMobility</tt> or qualify their symbols e.g. <tt>QtMobility::QSystemInfo s</tt>.</p> +<p>Here we are using the <a href="qsysteminfo.html">QSystemInfo</a> headers to print out the system's current country code. All the domain APIs are wrapped within the <tt>QtMobility</tt> namespace and thus developers either need to declare <tt>using namespace QtMobility</tt> or qualify their symbols e.g. <tt>QtMobility::QSystemInfo s</tt>. (<b>Note</b>: If you are on the Symbian platform you will need to define the actual header file, in this case <qsysteminfo.h> rather than using the standard header form <<a href="qsysteminfo.html">QSystemInfo</a>>, this is a known bug that is to be addressed in a future release)</p> <p>In step 3, to specify that our project is using System Information we declare in the project file:</p> <pre> CONFIG += mobility MOBILITY += systeminfo</pre> @@ -50,23 +54,31 @@ <p>The following table lists the domains and the corresponding values that can be assigned to <tt>MOBILITY</tt>.</p> <p><table class="generic" align="center" cellpadding="2" cellspacing="1" border="0"> <thead><tr valign="top" class="qt-style"><th>Domain</th><th>Value</th></tr></thead> -<tr valign="top" class="odd"><td>Bearer Mangement</td><td>bearer</td></tr> -<tr valign="top" class="even"><td>Contacts</td><td>contacts</td></tr> -<tr valign="top" class="odd"><td>Location</td><td>location</td></tr> -<tr valign="top" class="even"><td>Multimedia</td><td>multimedia</td></tr> -<tr valign="top" class="odd"><td>Messaging</td><td>messaging</td></tr> -<tr valign="top" class="even"><td>Publish And Subscribe</td><td>publishsubscribe</td></tr> -<tr valign="top" class="odd"><td>Service Framework</td><td>serviceframework</td></tr> -<tr valign="top" class="even"><td>System Information</td><td>systeminfo</td></tr> +<tr valign="top" class="odd"><td><a href="bearer-management.html">Bearer Management</a></td><td>bearer</td></tr> +<tr valign="top" class="even"><td><a href="contacts.html">Contacts</a></td><td>contacts</td></tr> +<tr valign="top" class="odd"><td><a href="location-overview.html">Location</a></td><td>location</td></tr> +<tr valign="top" class="even"><td><a href="multimedia.html">Multimedia</a></td><td>multimedia</td></tr> +<tr valign="top" class="odd"><td><a href="messaging.html">Messaging</a></td><td>messaging</td></tr> +<tr valign="top" class="even"><td><a href="publ-subs.html">Publish And Subscribe</a></td><td>publishsubscribe</td></tr> +<tr valign="top" class="odd"><td><a href="service-frameworks.html">Service Framework</a></td><td>serviceframework</td></tr> +<tr valign="top" class="even"><td><a href="systeminfo.html">System Information</a></td><td>systeminfo</td></tr> +<tr valign="top" class="odd"><td><a href="future.html">Versit</a></td><td>versit</td></tr> </table></p> <p>And we're done. If you are using the command line simply enter:</p> <pre> qmake make</pre> <p>to generate the executable which can then be run.</p> +<p>To build for the symbian emulator run:</p> +<pre> qmake + make</pre> +<p>To build a symbian sis package:</p> +<pre> qmake + make release-gcce + createpackage quickstart_template.pkg release-gcce</pre> <p /><address><hr /><div align="center"> <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qvaluespace.html b/doc/html/qvaluespace.html index 48138c9792..39235383ae 100644 --- a/doc/html/qvaluespace.html +++ b/doc/html/qvaluespace.html @@ -88,6 +88,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qvaluespacepublisher-members.html b/doc/html/qvaluespacepublisher-members.html index de6a294e08..6562340491 100644 --- a/doc/html/qvaluespacepublisher-members.html +++ b/doc/html/qvaluespacepublisher-members.html @@ -79,6 +79,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qvaluespacepublisher.html b/doc/html/qvaluespacepublisher.html index 724971e8e4..0c03aebbcf 100644 --- a/doc/html/qvaluespacepublisher.html +++ b/doc/html/qvaluespacepublisher.html @@ -160,6 +160,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qvaluespacesubscriber-members.html b/doc/html/qvaluespacesubscriber-members.html index aa65b5e4fb..144cc915c4 100644 --- a/doc/html/qvaluespacesubscriber-members.html +++ b/doc/html/qvaluespacesubscriber-members.html @@ -83,6 +83,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qvaluespacesubscriber.html b/doc/html/qvaluespacesubscriber.html index a4845dd60f..9440f5eab5 100644 --- a/doc/html/qvaluespacesubscriber.html +++ b/doc/html/qvaluespacesubscriber.html @@ -160,6 +160,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qversitcontactexporter-members.html b/doc/html/qversitcontactexporter-members.html index 0fa641c113..ba44f296b8 100644 --- a/doc/html/qversitcontactexporter-members.html +++ b/doc/html/qversitcontactexporter-members.html @@ -74,6 +74,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qversitcontactexporter.html b/doc/html/qversitcontactexporter.html index 74a20c7188..94ab3d40a0 100644 --- a/doc/html/qversitcontactexporter.html +++ b/doc/html/qversitcontactexporter.html @@ -108,6 +108,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qversitcontactimporter-members.html b/doc/html/qversitcontactimporter-members.html index 46107d19f5..d731affcc0 100644 --- a/doc/html/qversitcontactimporter-members.html +++ b/doc/html/qversitcontactimporter-members.html @@ -28,6 +28,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qversitcontactimporter.html b/doc/html/qversitcontactimporter.html index efd50bd7e0..0f924f66a9 100644 --- a/doc/html/qversitcontactimporter.html +++ b/doc/html/qversitcontactimporter.html @@ -91,6 +91,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qversitdocument-members.html b/doc/html/qversitdocument-members.html index b4726859ce..a592402e03 100644 --- a/doc/html/qversitdocument-members.html +++ b/doc/html/qversitdocument-members.html @@ -29,6 +29,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qversitdocument.html b/doc/html/qversitdocument.html index 8ca1a68fc8..c6955d7149 100644 --- a/doc/html/qversitdocument.html +++ b/doc/html/qversitdocument.html @@ -73,6 +73,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qversitproperty-members.html b/doc/html/qversitproperty-members.html index 5dcc94f571..9e61646a77 100644 --- a/doc/html/qversitproperty-members.html +++ b/doc/html/qversitproperty-members.html @@ -40,6 +40,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qversitproperty.html b/doc/html/qversitproperty.html index dd5a9aa632..658c22c5cd 100644 --- a/doc/html/qversitproperty.html +++ b/doc/html/qversitproperty.html @@ -109,6 +109,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qversitreader-members.html b/doc/html/qversitreader-members.html index 8da204142e..ddfd90b5d9 100644 --- a/doc/html/qversitreader-members.html +++ b/doc/html/qversitreader-members.html @@ -77,6 +77,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qversitreader.html b/doc/html/qversitreader.html index ddfc3bf5a1..a313c489f9 100644 --- a/doc/html/qversitreader.html +++ b/doc/html/qversitreader.html @@ -103,6 +103,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qversitwriter-members.html b/doc/html/qversitwriter-members.html index 05e6da8ca8..183a5127c7 100644 --- a/doc/html/qversitwriter-members.html +++ b/doc/html/qversitwriter-members.html @@ -78,6 +78,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qversitwriter.html b/doc/html/qversitwriter.html index 519f6959cc..8a4d2fda9a 100644 --- a/doc/html/qversitwriter.html +++ b/doc/html/qversitwriter.html @@ -110,6 +110,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qvideodevicecontrol-members.html b/doc/html/qvideodevicecontrol-members.html index a6efd2cf79..898661bba5 100644 --- a/doc/html/qvideodevicecontrol-members.html +++ b/doc/html/qvideodevicecontrol-members.html @@ -81,6 +81,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qvideodevicecontrol.html b/doc/html/qvideodevicecontrol.html index c929aecebd..6b34efd7ed 100644 --- a/doc/html/qvideodevicecontrol.html +++ b/doc/html/qvideodevicecontrol.html @@ -132,6 +132,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qvideoencodercontrol-members.html b/doc/html/qvideoencodercontrol-members.html index d6fd3ab39f..085862da0c 100644 --- a/doc/html/qvideoencodercontrol-members.html +++ b/doc/html/qvideoencodercontrol-members.html @@ -80,6 +80,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qvideoencodercontrol.html b/doc/html/qvideoencodercontrol.html index 7cf91c6ed0..1ebefb9d1e 100644 --- a/doc/html/qvideoencodercontrol.html +++ b/doc/html/qvideoencodercontrol.html @@ -126,6 +126,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qvideoencodersettings-members.html b/doc/html/qvideoencodersettings-members.html index f4f528c2a0..7b549ca521 100644 --- a/doc/html/qvideoencodersettings-members.html +++ b/doc/html/qvideoencodersettings-members.html @@ -44,6 +44,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qvideoencodersettings.html b/doc/html/qvideoencodersettings.html index fd4a51a4b6..df32c3ac6c 100644 --- a/doc/html/qvideoencodersettings.html +++ b/doc/html/qvideoencodersettings.html @@ -137,6 +137,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qvideooutputcontrol-members.html b/doc/html/qvideooutputcontrol-members.html index fdca235a39..e3af8f9c89 100644 --- a/doc/html/qvideooutputcontrol-members.html +++ b/doc/html/qvideooutputcontrol-members.html @@ -76,6 +76,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qvideooutputcontrol.html b/doc/html/qvideooutputcontrol.html index 8c16efbceb..45addf3f45 100644 --- a/doc/html/qvideooutputcontrol.html +++ b/doc/html/qvideooutputcontrol.html @@ -130,6 +130,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qvideorenderercontrol-members.html b/doc/html/qvideorenderercontrol-members.html index 1ef54a7cd4..57c3400349 100644 --- a/doc/html/qvideorenderercontrol-members.html +++ b/doc/html/qvideorenderercontrol-members.html @@ -73,6 +73,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qvideorenderercontrol.html b/doc/html/qvideorenderercontrol.html index 8c059cda59..164b5d18cf 100644 --- a/doc/html/qvideorenderercontrol.html +++ b/doc/html/qvideorenderercontrol.html @@ -93,6 +93,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qvideowidget-members.html b/doc/html/qvideowidget-members.html index ba114e9f80..036cc59c4b 100644 --- a/doc/html/qvideowidget-members.html +++ b/doc/html/qvideowidget-members.html @@ -369,6 +369,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qvideowidget.html b/doc/html/qvideowidget.html index 539949eb5f..f1e3fc6047 100644 --- a/doc/html/qvideowidget.html +++ b/doc/html/qvideowidget.html @@ -293,6 +293,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qvideowidgetcontrol-members.html b/doc/html/qvideowidgetcontrol-members.html index 0625a313cb..388e28935f 100644 --- a/doc/html/qvideowidgetcontrol-members.html +++ b/doc/html/qvideowidgetcontrol-members.html @@ -89,6 +89,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qvideowidgetcontrol.html b/doc/html/qvideowidgetcontrol.html index 5dd40336b4..ebbfcf4658 100644 --- a/doc/html/qvideowidgetcontrol.html +++ b/doc/html/qvideowidgetcontrol.html @@ -180,6 +180,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qvideowindowcontrol-members.html b/doc/html/qvideowindowcontrol-members.html index 22b6f1a041..5c01a35267 100644 --- a/doc/html/qvideowindowcontrol-members.html +++ b/doc/html/qvideowindowcontrol-members.html @@ -95,6 +95,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qvideowindowcontrol.html b/doc/html/qvideowindowcontrol.html index 29870e599f..55dc1bce8d 100644 --- a/doc/html/qvideowindowcontrol.html +++ b/doc/html/qvideowindowcontrol.html @@ -212,6 +212,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/radio-main-cpp.html b/doc/html/radio-main-cpp.html index 117e407397..9c06fe7f1a 100644 --- a/doc/html/radio-main-cpp.html +++ b/doc/html/radio-main-cpp.html @@ -71,6 +71,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/radio-radio-cpp.html b/doc/html/radio-radio-cpp.html index 0a388a6dab..1a05de9cce 100644 --- a/doc/html/radio-radio-cpp.html +++ b/doc/html/radio-radio-cpp.html @@ -171,6 +171,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/radio-radio-h.html b/doc/html/radio-radio-h.html index fd863041ce..0f2a26611d 100644 --- a/doc/html/radio-radio-h.html +++ b/doc/html/radio-radio-h.html @@ -97,6 +97,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/radio-radio-pro.html b/doc/html/radio-radio-pro.html index 2d8558f2c2..8dd54e1828 100644 --- a/doc/html/radio-radio-pro.html +++ b/doc/html/radio-radio-pro.html @@ -19,7 +19,8 @@ INCLUDEPATH += ../../src/multimedia include(../examples.pri) - qtAddLibrary(QtMedia) + CONFIG += mobility + MOBILITY = multimedia QMAKE_RPATHDIR += $$DESTDIR @@ -33,6 +34,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/radio.html b/doc/html/radio.html index 0c06f802d8..62d3db9e3e 100644 --- a/doc/html/radio.html +++ b/doc/html/radio.html @@ -25,6 +25,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/recorder-recorder-cpp.html b/doc/html/recorder-recorder-cpp.html index 61451b541d..04739efd21 100644 --- a/doc/html/recorder-recorder-cpp.html +++ b/doc/html/recorder-recorder-cpp.html @@ -217,6 +217,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/recorder-recorder-pro.html b/doc/html/recorder-recorder-pro.html index 6edbda3674..73a4014c1b 100644 --- a/doc/html/recorder-recorder-pro.html +++ b/doc/html/recorder-recorder-pro.html @@ -19,7 +19,8 @@ INCLUDEPATH+=../../src/multimedia include(../examples.pri) - qtAddLibrary(QtMedia) + CONFIG += mobility + MOBILITY = multimedia HEADERS = recorder.h @@ -32,6 +33,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/recorder.html b/doc/html/recorder.html index 35a48fbf5d..d145ae123b 100644 --- a/doc/html/recorder.html +++ b/doc/html/recorder.html @@ -23,6 +23,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/samplephonebook-contactdetailsform-cpp.html b/doc/html/samplephonebook-contactdetailsform-cpp.html deleted file mode 100644 index cb6cef4092..0000000000 --- a/doc/html/samplephonebook-contactdetailsform-cpp.html +++ /dev/null @@ -1,74 +0,0 @@ -<?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE html - PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> -<head> - <title>Qt Mobility Project 1.0: contactdetailsform.cpp Example File (samplephonebook/contactdetailsform.cpp)</title> - <link href="classic.css" rel="stylesheet" type="text/css" /> -</head> -<body> -<table border="0" cellpadding="0" cellspacing="0" width="100%"> -<tr> -<td align="left" valign="top" width="32"><a href="http://qt.nokia.com/"><img src="images/qtlogo.png" align="left" border="0" /></a></td> -<td width="1"> </td><td class="postheader" valign="center"><a href="index.html"><font color="#004faf">Home</font></a> · <a href="classes.html"><font color="#004faf">All Classes</font></a> · <a href="functions.html"><font color="#004faf">All Functions</font></a> ·</td> -<td align="right" valign="top" width="230"><img src="images/codeless.png" border="0" /></td></tr></table><h1 class="title">contactdetailsform.cpp Example File<br /><span class="small-subtitle">samplephonebook/contactdetailsform.cpp</span> -</h1> -<pre><span class="comment"> /**************************************************************************** - ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). - ** All rights reserved. - ** Contact: Nokia Corporation (qt-info@nokia.com) - ** - ** This file is part of the Qt Mobility Components. - ** - ** $QT_BEGIN_LICENSE:LGPL$ - ** No Commercial Usage - ** This file contains pre-release code and may not be distributed. - ** You may use this file in accordance with the terms and conditions - ** contained in the Technology Preview License Agreement accompanying - ** this package. - ** - ** GNU Lesser General Public License Usage - ** Alternatively, this file may be used under the terms of the GNU Lesser - ** General Public License version 2.1 as published by the Free Software - ** Foundation and appearing in the file LICENSE.LGPL included in the - ** packaging of this file. Please review the following information to - ** ensure the GNU Lesser General Public License version 2.1 requirements - ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. - ** - ** In addition, as a special exception, Nokia gives you certain additional - ** rights. These rights are described in the Nokia Qt LGPL Exception - ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. - ** - ** If you have questions regarding the use of this file, please contact - ** Nokia at qt-info@nokia.com. - ** - ** - ** - ** - ** - ** - ** - ** - ** $QT_END_LICENSE$ - ** - ****************************************************************************/</span> - - #include "contactdetailsform.h" - - ContactDetailsForm::ContactDetailsForm(QWidget *parent) - :QDialog(parent) - { - setupUi(this); - } - - ContactDetailsForm::~ContactDetailsForm() - { - }</pre> -<p /><address><hr /><div align="center"> -<table width="100%" cellspacing="0" border="0"><tr class="address"> -<td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> -<td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> -</tr></table></div></address></body> -</html> diff --git a/doc/html/samplephonebook-contactdetailsform-h.html b/doc/html/samplephonebook-contactdetailsform-h.html deleted file mode 100644 index c6ba877bec..0000000000 --- a/doc/html/samplephonebook-contactdetailsform-h.html +++ /dev/null @@ -1,75 +0,0 @@ -<?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE html - PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> -<head> - <title>Qt Mobility Project 1.0: contactdetailsform.h Example File (samplephonebook/contactdetailsform.h)</title> - <link href="classic.css" rel="stylesheet" type="text/css" /> -</head> -<body> -<table border="0" cellpadding="0" cellspacing="0" width="100%"> -<tr> -<td align="left" valign="top" width="32"><a href="http://qt.nokia.com/"><img src="images/qtlogo.png" align="left" border="0" /></a></td> -<td width="1"> </td><td class="postheader" valign="center"><a href="index.html"><font color="#004faf">Home</font></a> · <a href="classes.html"><font color="#004faf">All Classes</font></a> · <a href="functions.html"><font color="#004faf">All Functions</font></a> ·</td> -<td align="right" valign="top" width="230"><img src="images/codeless.png" border="0" /></td></tr></table><h1 class="title">contactdetailsform.h Example File<br /><span class="small-subtitle">samplephonebook/contactdetailsform.h</span> -</h1> -<pre><span class="comment"> /**************************************************************************** - ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). - ** All rights reserved. - ** Contact: Nokia Corporation (qt-info@nokia.com) - ** - ** This file is part of the Qt Mobility Components. - ** - ** $QT_BEGIN_LICENSE:LGPL$ - ** No Commercial Usage - ** This file contains pre-release code and may not be distributed. - ** You may use this file in accordance with the terms and conditions - ** contained in the Technology Preview License Agreement accompanying - ** this package. - ** - ** GNU Lesser General Public License Usage - ** Alternatively, this file may be used under the terms of the GNU Lesser - ** General Public License version 2.1 as published by the Free Software - ** Foundation and appearing in the file LICENSE.LGPL included in the - ** packaging of this file. Please review the following information to - ** ensure the GNU Lesser General Public License version 2.1 requirements - ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. - ** - ** In addition, as a special exception, Nokia gives you certain additional - ** rights. These rights are described in the Nokia Qt LGPL Exception - ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. - ** - ** If you have questions regarding the use of this file, please contact - ** Nokia at qt-info@nokia.com. - ** - ** - ** - ** - ** - ** - ** - ** - ** $QT_END_LICENSE$ - ** - ****************************************************************************/</span> - - #ifndef CONTACTDETAILSFORM_H - #define CONTACTDETAILSFORM_H - - #include "ui_contactdetails_240_320.h" - - class ContactDetailsForm : public QDialog, Ui::ContactDetails240By320 - { - public: - ContactDetailsForm(QWidget *parent); - ~ContactDetailsForm(); - }; - #endif <span class="comment">// CONTACTDETAILSFORM_H</span></pre> -<p /><address><hr /><div align="center"> -<table width="100%" cellspacing="0" border="0"><tr class="address"> -<td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> -<td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> -</tr></table></div></address></body> -</html> diff --git a/doc/html/samplephonebook-contacteditor-cpp.html b/doc/html/samplephonebook-contacteditor-cpp.html new file mode 100644 index 0000000000..f1863b8e23 --- /dev/null +++ b/doc/html/samplephonebook-contacteditor-cpp.html @@ -0,0 +1,247 @@ +<?xml version="1.0" encoding="iso-8859-1"?> +<!DOCTYPE html + PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head> + <title>Qt Mobility Project 1.0: contacteditor.cpp Example File (samplephonebook/contacteditor.cpp)</title> + <link href="classic.css" rel="stylesheet" type="text/css" /> +</head> +<body> +<table border="0" cellpadding="0" cellspacing="0" width="100%"> +<tr> +<td align="left" valign="top" width="32"><a href="http://qt.nokia.com/"><img src="images/qtlogo.png" align="left" border="0" /></a></td> +<td width="1"> </td><td class="postheader" valign="center"><a href="index.html"><font color="#004faf">Home</font></a> · <a href="classes.html"><font color="#004faf">All Classes</font></a> · <a href="functions.html"><font color="#004faf">All Functions</font></a> ·</td> +<td align="right" valign="top" width="230"><img src="images/codeless.png" border="0" /></td></tr></table><h1 class="title">contacteditor.cpp Example File<br /><span class="small-subtitle">samplephonebook/contacteditor.cpp</span> +</h1> +<pre><span class="comment"> /**************************************************************************** + ** + ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** All rights reserved. + ** Contact: Nokia Corporation (qt-info@nokia.com) + ** + ** This file is part of the Qt Mobility Components. + ** + ** $QT_BEGIN_LICENSE:LGPL$ + ** No Commercial Usage + ** This file contains pre-release code and may not be distributed. + ** You may use this file in accordance with the terms and conditions + ** contained in the Technology Preview License Agreement accompanying + ** this package. + ** + ** GNU Lesser General Public License Usage + ** Alternatively, this file may be used under the terms of the GNU Lesser + ** General Public License version 2.1 as published by the Free Software + ** Foundation and appearing in the file LICENSE.LGPL included in the + ** packaging of this file. Please review the following information to + ** ensure the GNU Lesser General Public License version 2.1 requirements + ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. + ** + ** In addition, as a special exception, Nokia gives you certain additional + ** rights. These rights are described in the Nokia Qt LGPL Exception + ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. + ** + ** If you have questions regarding the use of this file, please contact + ** Nokia at qt-info@nokia.com. + ** + ** + ** + ** + ** + ** + ** + ** + ** $QT_END_LICENSE$ + ** + ****************************************************************************/</span> + + #include "contacteditor.h" + + #include <QtGui> + + ContactEditor::ContactEditor(QWidget *parent) + : QWidget(parent) + { + m_manager = 0; + m_contactId = QContactLocalId(0); + + m_saveBtn = new QPushButton("Save", this); + connect(m_saveBtn, SIGNAL(clicked()), this, SLOT(saveClicked())); + m_deleteBtn = new QPushButton("Delete", this); + connect(m_deleteBtn, SIGNAL(clicked()), this, SLOT(deleteClicked())); + m_cancelBtn = new QPushButton("Cancel", this); + connect(m_cancelBtn, SIGNAL(clicked()), this, SLOT(cancelClicked())); + + m_nameEdit = new QLineEdit(this); + m_phoneEdit = new QLineEdit(this); + m_emailEdit = new QLineEdit(this); + m_addrEdit = new QLineEdit(this); + m_avatarBtn = new QPushButton(this); + m_avatarBtn->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); + connect(m_avatarBtn, SIGNAL(clicked()), this, SLOT(avatarClicked())); + + m_detailsArea = new QScrollArea(this); + m_detailsArea->setWidgetResizable(true); + QFormLayout *detailsLayout = new QFormLayout; + detailsLayout->addRow("Name", m_nameEdit); + detailsLayout->addRow("Phone", m_phoneEdit); + detailsLayout->addRow("Email", m_emailEdit); + detailsLayout->addRow("Address", m_addrEdit); + detailsLayout->addRow("Avatar", m_avatarBtn); + detailsLayout->setFieldGrowthPolicy(QFormLayout::ExpandingFieldsGrow); + detailsLayout->setSizeConstraint(QLayout::SetMinAndMaxSize); + m_detailsArea->setLayout(detailsLayout); + + QHBoxLayout *btnLayout = new QHBoxLayout; + btnLayout->addWidget(m_saveBtn); + btnLayout->addWidget(m_deleteBtn); + btnLayout->addWidget(m_cancelBtn); + + QVBoxLayout *editLayout = new QVBoxLayout; + editLayout->addWidget(m_detailsArea); + editLayout->addLayout(btnLayout); + + setLayout(editLayout); + } + + ContactEditor::~ContactEditor() + { + } + + void ContactEditor::setCurrentContact(QContactManager* manager, QContactLocalId currentId) + { + m_manager = manager; + m_contactId = currentId; + m_newAvatarPath = QString(); + + if (manager == 0 || currentId == 0) { + <span class="comment">// clear the UI and return.</span> + m_nameEdit->setText(""); + m_phoneEdit->setText(""); + m_emailEdit->setText(""); + m_addrEdit->setText(""); + m_avatarBtn->setIcon(QIcon()); + + if (manager == 0) + m_saveBtn->setEnabled(false); + m_deleteBtn->setEnabled(false); + + return; + } + + <span class="comment">// enable the UI.</span> + m_saveBtn->setEnabled(true); + m_deleteBtn->setEnabled(true); + + <span class="comment">// otherwise, build from the contact details.</span> + QContact curr = manager->contact(m_contactId); + QContactName nm = curr.detail(QContactName::DefinitionName); + QContactPhoneNumber phn = curr.detail(QContactPhoneNumber::DefinitionName); + QContactEmailAddress em = curr.detail(QContactEmailAddress::DefinitionName); + QContactAddress adr = curr.detail(QContactAddress::DefinitionName); + QContactAvatar av = curr.detail(QContactAvatar::DefinitionName); + + QString saveNameField = nameField(); + if (!saveNameField.isEmpty()) + m_nameEdit->setText(nm.value(saveNameField)); + else + m_nameEdit->setText(QString()); + m_phoneEdit->setText(phn.value(QContactPhoneNumber::FieldNumber)); + m_emailEdit->setText(em.value(QContactEmailAddress::FieldEmailAddress)); + m_addrEdit->setText(adr.value(QContactAddress::FieldStreet)); <span class="comment">// ugly hack.</span> + m_avatarBtn->setIcon(QIcon(av.value(QContactAvatar::FieldAvatar))); + } + + QString ContactEditor::nameField() + { + <span class="comment">// return the field which the name data should be saved in.</span> + if (!m_manager) + return QString(); + + QMap<QString, QContactDetailDefinition> defs = m_manager->detailDefinitions(QContactType::TypeContact); + QContactDetailDefinition nameDef = defs.value(QContactName::DefinitionName); + if (nameDef.fields().keys().contains(QContactName::FieldCustomLabel)) { + return QString(QLatin1String(QContactName::FieldCustomLabel)); + } else if (nameDef.fields().keys().contains(QContactName::FieldFirst)) { + return QString(QLatin1String(QContactName::FieldFirst)); + } else { + return QString(); + } + } + + void ContactEditor::avatarClicked() + { + <span class="comment">// put up a file dialog, and update the new avatar path.</span> + QString fileName = QFileDialog::getOpenFileName(this, + tr("Select Avatar Image"), ".", tr("Image Files (*.png *.jpg *.bmp)")); + + m_newAvatarPath = fileName; + m_avatarBtn->setIcon(QIcon(m_newAvatarPath)); + } + + void ContactEditor::saveClicked() + { + if (!m_manager) { + qWarning() << "No manager selected; cannot save."; + } else { + QContact curr; + if (m_contactId != QContactLocalId(0)) + curr = m_manager->contact(m_contactId); + QContactName nm = curr.detail(QContactName::DefinitionName); + QContactPhoneNumber phn = curr.detail(QContactPhoneNumber::DefinitionName); + QContactEmailAddress em = curr.detail(QContactEmailAddress::DefinitionName); + QContactAddress adr = curr.detail(QContactAddress::DefinitionName); + QContactAvatar av = curr.detail(QContactAvatar::DefinitionName); + + QString saveNameField = nameField(); + if (!saveNameField.isEmpty()) + nm.setValue(nameField(), m_nameEdit->text()); + phn.setNumber(m_phoneEdit->text()); + em.setEmailAddress(m_emailEdit->text()); + adr.setStreet(m_addrEdit->text()); + av.setAvatar(m_newAvatarPath); + + curr.saveDetail(&nm); + curr.saveDetail(&phn); + curr.saveDetail(&em); + curr.saveDetail(&adr); + curr.saveDetail(&av); + + bool success = m_manager->saveContact(&curr); + if (success) + QMessageBox::information(this, "Success!", "Contact saved successfully!"); + else + QMessageBox::information(this, "Failed!", "Failed to save contact!"); + } + + emit showListPage(); + } + + void ContactEditor::deleteClicked() + { + if (!m_manager) { + qWarning() << "No manager selected; cannot delete."; + } else { + if (m_contactId == QContactLocalId(0)) + qWarning() << "Contact is invalid; cannot delete."; + + bool success = m_manager->removeContact(m_contactId); + if (success) + QMessageBox::information(this, "Success!", "Contact deleted successfully!"); + else + QMessageBox::information(this, "Failed!", "Failed to delete contact!"); + } + + emit showListPage(); + } + + void ContactEditor::cancelClicked() + { + emit showListPage(); + }</pre> +<p /><address><hr /><div align="center"> +<table width="100%" cellspacing="0" border="0"><tr class="address"> +<td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> +<td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> +</tr></table></div></address></body> +</html> diff --git a/doc/html/samplephonebook-groupeditdialog-h.html b/doc/html/samplephonebook-contacteditor-h.html index 223a318f40..6e26f496ab 100644 --- a/doc/html/samplephonebook-groupeditdialog-h.html +++ b/doc/html/samplephonebook-contacteditor-h.html @@ -3,7 +3,7 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> - <title>Qt Mobility Project 1.0: groupeditdialog.h Example File (samplephonebook/groupeditdialog.h)</title> + <title>Qt Mobility Project 1.0: contacteditor.h Example File (samplephonebook/contacteditor.h)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -11,7 +11,7 @@ <tr> <td align="left" valign="top" width="32"><a href="http://qt.nokia.com/"><img src="images/qtlogo.png" align="left" border="0" /></a></td> <td width="1"> </td><td class="postheader" valign="center"><a href="index.html"><font color="#004faf">Home</font></a> · <a href="classes.html"><font color="#004faf">All Classes</font></a> · <a href="functions.html"><font color="#004faf">All Functions</font></a> ·</td> -<td align="right" valign="top" width="230"><img src="images/codeless.png" border="0" /></td></tr></table><h1 class="title">groupeditdialog.h Example File<br /><span class="small-subtitle">samplephonebook/groupeditdialog.h</span> +<td align="right" valign="top" width="230"><img src="images/codeless.png" border="0" /></td></tr></table><h1 class="title">contacteditor.h Example File<br /><span class="small-subtitle">samplephonebook/contacteditor.h</span> </h1> <pre><span class="comment"> /**************************************************************************** ** @@ -54,59 +54,66 @@ ** ****************************************************************************/</span> - #ifndef GROUPEDITDIALOG_H - #define GROUPEDITDIALOG_H + #ifndef CONTACTEDITOR_H + #define CONTACTEDITOR_H - #include <qmobilityglobal.h> - #include <QDialog> + #include "qtcontacts.h" + #include <QWidget> + #include <QMap> + #include <QPlainTextEdit> + + class QScrollArea; class QPushButton; - class QListWidget; - class QListWidgetItem; class QLineEdit; - QTM_BEGIN_NAMESPACE - class QContactManager; - QTM_END_NAMESPACE - QTM_USE_NAMESPACE - class GroupEditDialog : public QDialog + class ContactEditor : public QWidget { Q_OBJECT public: - GroupEditDialog(QWidget *parent, QContactManager *contactManager); + ContactEditor(QWidget *parent = 0); + ~ContactEditor(); - private: - void repopulateGroupList(); + signals: + void showListPage(); public slots: - void show(); + void setCurrentContact(QContactManager* manager, QContactLocalId currentId); private slots: - void addButtonClicked(); - void saveButtonClicked(); - void deleteButtonClicked(); - void doneButtonClicked(); - void groupItemActivated(QListWidgetItem * item); - void groupItemChanged ( QListWidgetItem * current, QListWidgetItem * previous ); + void saveClicked(); + void deleteClicked(); + void cancelClicked(); + void avatarClicked(); private: - QListWidget *listWidget; - QLineEdit *groupNameEdit; - QPushButton *addButton; - QPushButton *saveButton; - QPushButton *deleteButton; - QPushButton *doneButton; - QContactManager *cm; + QString nameField(); + + QPushButton *m_saveBtn; + QPushButton *m_deleteBtn; + QPushButton *m_cancelBtn; + + QScrollArea *m_detailsArea; <span class="comment">// contains the below elements.</span> + QLineEdit *m_nameEdit; + QLineEdit *m_phoneEdit; + QLineEdit *m_emailEdit; + QLineEdit *m_addrEdit; + QPushButton *m_avatarBtn; + + <span class="comment">// data</span> + QContactManager *m_manager; + QContactLocalId m_contactId; + QString m_newAvatarPath; }; - #endif <span class="comment">// GROUPEDITDIALOG_H</span></pre> + #endif <span class="comment">// CONTACTEDITOR_H</span></pre> <p /><address><hr /><div align="center"> <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/samplephonebook-contactlistpage-cpp.html b/doc/html/samplephonebook-contactlistpage-cpp.html new file mode 100644 index 0000000000..dc97df0447 --- /dev/null +++ b/doc/html/samplephonebook-contactlistpage-cpp.html @@ -0,0 +1,183 @@ +<?xml version="1.0" encoding="iso-8859-1"?> +<!DOCTYPE html + PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head> + <title>Qt Mobility Project 1.0: contactlistpage.cpp Example File (samplephonebook/contactlistpage.cpp)</title> + <link href="classic.css" rel="stylesheet" type="text/css" /> +</head> +<body> +<table border="0" cellpadding="0" cellspacing="0" width="100%"> +<tr> +<td align="left" valign="top" width="32"><a href="http://qt.nokia.com/"><img src="images/qtlogo.png" align="left" border="0" /></a></td> +<td width="1"> </td><td class="postheader" valign="center"><a href="index.html"><font color="#004faf">Home</font></a> · <a href="classes.html"><font color="#004faf">All Classes</font></a> · <a href="functions.html"><font color="#004faf">All Functions</font></a> ·</td> +<td align="right" valign="top" width="230"><img src="images/codeless.png" border="0" /></td></tr></table><h1 class="title">contactlistpage.cpp Example File<br /><span class="small-subtitle">samplephonebook/contactlistpage.cpp</span> +</h1> +<pre><span class="comment"> /**************************************************************************** + ** + ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** All rights reserved. + ** Contact: Nokia Corporation (qt-info@nokia.com) + ** + ** This file is part of the Qt Mobility Components. + ** + ** $QT_BEGIN_LICENSE:LGPL$ + ** No Commercial Usage + ** This file contains pre-release code and may not be distributed. + ** You may use this file in accordance with the terms and conditions + ** contained in the Technology Preview License Agreement accompanying + ** this package. + ** + ** GNU Lesser General Public License Usage + ** Alternatively, this file may be used under the terms of the GNU Lesser + ** General Public License version 2.1 as published by the Free Software + ** Foundation and appearing in the file LICENSE.LGPL included in the + ** packaging of this file. Please review the following information to + ** ensure the GNU Lesser General Public License version 2.1 requirements + ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. + ** + ** In addition, as a special exception, Nokia gives you certain additional + ** rights. These rights are described in the Nokia Qt LGPL Exception + ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. + ** + ** If you have questions regarding the use of this file, please contact + ** Nokia at qt-info@nokia.com. + ** + ** + ** + ** + ** + ** + ** + ** + ** $QT_END_LICENSE$ + ** + ****************************************************************************/</span> + + #include "contactlistpage.h" + + #include <QtGui> + + ContactListPage::ContactListPage(QWidget *parent) + : QWidget(parent) + { + m_manager = 0; + m_currentFilter = QContactFilter(); + + m_backendsLabel = new QLabel("Store:", this); + m_backendsLabel->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); + m_backendsCombo = new QComboBox(this); + QStringList availableManagers = QContactManager::availableManagers(); + m_backendsCombo->addItems(availableManagers); + connect(m_backendsCombo, SIGNAL(currentIndexChanged(QString)), this, SLOT(backendSelected())); + m_filterActiveLabel = new QLabel("Filter: Inactive"); + m_filterActiveLabel->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed)); + + m_contactsList = new QListWidget(this); + + m_addContactBtn = new QPushButton("Add", this); + connect(m_addContactBtn, SIGNAL(clicked()), this, SLOT(addContactClicked())); + m_editBtn = new QPushButton("Edit", this); + connect(m_editBtn, SIGNAL(clicked()), this, SLOT(editClicked())); + m_findBtn = new QPushButton("Find", this); + connect(m_findBtn, SIGNAL(clicked()), this, SLOT(findClicked())); + + QHBoxLayout *backendLayout = new QHBoxLayout; + backendLayout->addWidget(m_backendsLabel); + backendLayout->addWidget(m_backendsCombo); + backendLayout->addWidget(m_filterActiveLabel); + + QHBoxLayout *btnLayout = new QHBoxLayout; + btnLayout->addWidget(m_addContactBtn); + btnLayout->addWidget(m_editBtn); + btnLayout->addWidget(m_findBtn); + + QVBoxLayout *bookLayout = new QVBoxLayout; + bookLayout->addLayout(backendLayout); + bookLayout->addWidget(m_contactsList); + bookLayout->addLayout(btnLayout); + + setLayout(bookLayout); + + <span class="comment">// force update to backend.</span> + QTimer::singleShot(0, this, SLOT(backendSelected())); + } + + ContactListPage::~ContactListPage() + { + QList<QContactManager*> initialisedManagers = m_initialisedManagers.values(); + while (!initialisedManagers.isEmpty()) { + QContactManager *deleteMe = initialisedManagers.takeFirst(); + delete deleteMe; + } + } + + void ContactListPage::backendSelected() + { + QString backend = m_backendsCombo->currentText(); + + <span class="comment">// first, check to see if they reselected the same backend.</span> + if (m_manager && m_manager->managerName() == backend) + return; + + <span class="comment">// the change is real. update.</span> + if (m_initialisedManagers.contains(backend)) { + m_manager = m_initialisedManagers.value(backend); + } else { + m_manager = new QContactManager(backend); + m_initialisedManagers.insert(backend, m_manager); + } + + <span class="comment">// signal that the manager has changed.</span> + emit managerChanged(m_manager); + + <span class="comment">// and... rebuild the list.</span> + rebuildList(m_currentFilter); + } + + void ContactListPage::rebuildList(const QContactFilter& filter) + { + <span class="comment">// first, check to see whether the filter does anything</span> + if (filter == QContactFilter()) + m_filterActiveLabel->setText("Filter: Inactive"); + else + m_filterActiveLabel->setText("Filter: Active"); + + QContact currContact; + m_currentFilter = filter; + m_contactsList->clear(); + m_idToListIndex.clear(); + QList<QContactLocalId> contactIds = m_manager->contacts(m_currentFilter); + foreach (const QContactLocalId& id, contactIds) { + QListWidgetItem *currItem = new QListWidgetItem; + currContact = m_manager->contact(id); + currItem->setData(Qt::DisplayRole, currContact.displayLabel()); + currItem->setData(Qt::UserRole, currContact.localId()); <span class="comment">// also store the id of the contact.</span> + m_idToListIndex.insert(currContact.localId(), m_contactsList->count()); + m_contactsList->addItem(currItem); + } + } + + void ContactListPage::addContactClicked() + { + emit showEditorPage(QContactLocalId(0)); + } + + void ContactListPage::editClicked() + { + if (m_contactsList->currentItem()) + emit showEditorPage(QContactLocalId(m_contactsList->currentItem()->data(Qt::UserRole).toUInt())); + <span class="comment">// else, nothing selected; ignore.</span> + } + + void ContactListPage::findClicked() + { + emit showFilterPage(m_currentFilter); + }</pre> +<p /><address><hr /><div align="center"> +<table width="100%" cellspacing="0" border="0"><tr class="address"> +<td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> +<td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> +</tr></table></div></address></body> +</html> diff --git a/doc/html/samplephonebook-groupdetailsdialog-h.html b/doc/html/samplephonebook-contactlistpage-h.html index 7f3952c603..20df5f39d1 100644 --- a/doc/html/samplephonebook-groupdetailsdialog-h.html +++ b/doc/html/samplephonebook-contactlistpage-h.html @@ -3,7 +3,7 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> - <title>Qt Mobility Project 1.0: groupdetailsdialog.h Example File (samplephonebook/groupdetailsdialog.h)</title> + <title>Qt Mobility Project 1.0: contactlistpage.h Example File (samplephonebook/contactlistpage.h)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -11,7 +11,7 @@ <tr> <td align="left" valign="top" width="32"><a href="http://qt.nokia.com/"><img src="images/qtlogo.png" align="left" border="0" /></a></td> <td width="1"> </td><td class="postheader" valign="center"><a href="index.html"><font color="#004faf">Home</font></a> · <a href="classes.html"><font color="#004faf">All Classes</font></a> · <a href="functions.html"><font color="#004faf">All Functions</font></a> ·</td> -<td align="right" valign="top" width="230"><img src="images/codeless.png" border="0" /></td></tr></table><h1 class="title">groupdetailsdialog.h Example File<br /><span class="small-subtitle">samplephonebook/groupdetailsdialog.h</span> +<td align="right" valign="top" width="230"><img src="images/codeless.png" border="0" /></td></tr></table><h1 class="title">contactlistpage.h Example File<br /><span class="small-subtitle">samplephonebook/contactlistpage.h</span> </h1> <pre><span class="comment"> /**************************************************************************** ** @@ -54,56 +54,68 @@ ** ****************************************************************************/</span> - #ifndef GROUPDETAILSDIALOG_H - #define GROUPDETAILSDIALOG_H + #ifndef CONTACTLISTPAGE_H + #define CONTACTLISTPAGE_H - #include <QDialog> - #include "qcontact.h" + #include "qtcontacts.h" + + #include <QWidget> + #include <QList> + #include <QListWidgetItem> - class QPushButton; class QListWidget; - class QListWidgetItem; + class QPushButton; + class QComboBox; + class QLabel; class QLineEdit; - QTM_BEGIN_NAMESPACE - class QContactManager; - QTM_END_NAMESPACE - QTM_USE_NAMESPACE - class GroupDetailsDialog : public QDialog + class ContactListPage : public QWidget { Q_OBJECT public: - GroupDetailsDialog(QWidget *parent, QContactManager *contactManager, const QContact &contact); - QList<QContactLocalId> groups(); + ContactListPage(QWidget *parent = 0); + ~ContactListPage(); - private: - void repopulateGroupList(); + void rebuildList(const QContactFilter& filter); - public slots: - void show(); - void groupItemChanged(QListWidgetItem * item); + signals: + void showEditorPage(QContactLocalId contactId); + void showFilterPage(const QContactFilter& filter); + void managerChanged(QContactManager *manager); private slots: - void okButtonClicked(); - void cancelButtonClicked(); + void backendSelected(); + void addContactClicked(); + void editClicked(); + void findClicked(); private: - QListWidget *listWidget; - QLineEdit *contactNameEdit; - QPushButton *cancelButton; - QPushButton *okButton; - QContactManager *cm; - QContact localContact; + <span class="comment">// elements of the contact list "page"</span> + QLabel *m_backendsLabel; + QComboBox *m_backendsCombo; + QLabel *m_filterActiveLabel; + + QListWidget *m_contactsList; + QPushButton *m_addContactBtn; + QPushButton *m_editBtn; + QPushButton *m_findBtn; + + <span class="comment">// data</span> + QContactManager *m_manager; + QMap<QContactLocalId, int> m_idToListIndex; + QMap<QString, QContactManager*> m_initialisedManagers; + + QContactFilter m_currentFilter; }; - #endif <span class="comment">// GROUPDETAILSDIALOG_H</span></pre> + #endif <span class="comment">// CONTACTLISTPAGE_H</span></pre> <p /><address><hr /><div align="center"> <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/samplephonebook-filterpage-cpp.html b/doc/html/samplephonebook-filterpage-cpp.html new file mode 100644 index 0000000000..76dcd1c8e4 --- /dev/null +++ b/doc/html/samplephonebook-filterpage-cpp.html @@ -0,0 +1,245 @@ +<?xml version="1.0" encoding="iso-8859-1"?> +<!DOCTYPE html + PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head> + <title>Qt Mobility Project 1.0: filterpage.cpp Example File (samplephonebook/filterpage.cpp)</title> + <link href="classic.css" rel="stylesheet" type="text/css" /> +</head> +<body> +<table border="0" cellpadding="0" cellspacing="0" width="100%"> +<tr> +<td align="left" valign="top" width="32"><a href="http://qt.nokia.com/"><img src="images/qtlogo.png" align="left" border="0" /></a></td> +<td width="1"> </td><td class="postheader" valign="center"><a href="index.html"><font color="#004faf">Home</font></a> · <a href="classes.html"><font color="#004faf">All Classes</font></a> · <a href="functions.html"><font color="#004faf">All Functions</font></a> ·</td> +<td align="right" valign="top" width="230"><img src="images/codeless.png" border="0" /></td></tr></table><h1 class="title">filterpage.cpp Example File<br /><span class="small-subtitle">samplephonebook/filterpage.cpp</span> +</h1> +<pre><span class="comment"> /**************************************************************************** + ** + ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** All rights reserved. + ** Contact: Nokia Corporation (qt-info@nokia.com) + ** + ** This file is part of the Qt Mobility Components. + ** + ** $QT_BEGIN_LICENSE:LGPL$ + ** No Commercial Usage + ** This file contains pre-release code and may not be distributed. + ** You may use this file in accordance with the terms and conditions + ** contained in the Technology Preview License Agreement accompanying + ** this package. + ** + ** GNU Lesser General Public License Usage + ** Alternatively, this file may be used under the terms of the GNU Lesser + ** General Public License version 2.1 as published by the Free Software + ** Foundation and appearing in the file LICENSE.LGPL included in the + ** packaging of this file. Please review the following information to + ** ensure the GNU Lesser General Public License version 2.1 requirements + ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. + ** + ** In addition, as a special exception, Nokia gives you certain additional + ** rights. These rights are described in the Nokia Qt LGPL Exception + ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. + ** + ** If you have questions regarding the use of this file, please contact + ** Nokia at qt-info@nokia.com. + ** + ** + ** + ** + ** + ** + ** + ** + ** $QT_END_LICENSE$ + ** + ****************************************************************************/</span> + + #include "filterpage.h" + + #include <QtGui> + + FilterPage::FilterPage(QWidget* parent) + : QWidget(parent) + { + m_valueCriteriaEdit = new QLineEdit(this); + m_fieldCriteriaCombo = new QComboBox(this); + m_criteriaTypeCombo = new QComboBox(this); + m_joinMethodCombo = new QComboBox(this); + m_cumulativeExpressionLabel = new QLabel(this); + m_cumulativeExpressionLabel->setText("Match All Contacts"); + + QStringList filterableFields; + filterableFields.append("Name"); + filterableFields.append("Phone Number"); + filterableFields.append("Email"); + m_fieldCriteriaCombo->addItems(filterableFields); + + QStringList criteriaTypes; + criteriaTypes.append("Exact Match"); + criteriaTypes.append("Starts With"); + criteriaTypes.append("Ends With"); + criteriaTypes.append("Contains"); + m_criteriaTypeCombo->addItems(criteriaTypes); + + QStringList joinTypes; + joinTypes.append("AND"); + joinTypes.append("OR"); + m_joinMethodCombo->addItems(joinTypes); + + QFormLayout *formLayout = new QFormLayout; + formLayout->addRow("Search String: ", m_valueCriteriaEdit); + formLayout->addRow("Search Field: ", m_fieldCriteriaCombo); + formLayout->addRow("Criteria Type: ", m_criteriaTypeCombo); + formLayout->addRow("Join Method: ", m_joinMethodCombo); + <span class="comment">// TODO: add separator.</span> + formLayout->addRow("Filter Expression: ", m_cumulativeExpressionLabel); + + m_add = new QPushButton("Add", this); + connect(m_add, SIGNAL(clicked()), this, SLOT(addClicked())); + m_clear = new QPushButton("Clear", this); + connect(m_clear, SIGNAL(clicked()), this, SLOT(clearClicked())); + m_done = new QPushButton("Filter", this); + connect(m_done, SIGNAL(clicked()), this, SLOT(doneClicked())); + + QHBoxLayout *btnLayout = new QHBoxLayout; + btnLayout->addWidget(m_add); + btnLayout->addWidget(m_clear); + btnLayout->addWidget(m_done); + + QVBoxLayout *pageLayout = new QVBoxLayout; + pageLayout->addLayout(formLayout); + pageLayout->addLayout(btnLayout); + + setLayout(pageLayout); + } + + FilterPage::~FilterPage() + { + } + + void FilterPage::addClicked() + { + QContactDetailFilter fil; + QString defName; + QString fieldName; + QString exprName; + QString exprMatch; + QString exprJoin; + switch (m_fieldCriteriaCombo->currentIndex()) { + case 0: + { + <span class="comment">// name</span> + defName = QString(QLatin1String(QContactDisplayLabel::DefinitionName)); + fieldName = QString(QLatin1String(QContactDisplayLabel::FieldLabel)); + + exprName = "Name"; + } + break; + + case 1: + { + <span class="comment">// phone number</span> + defName = QString(QLatin1String(QContactPhoneNumber::DefinitionName)); + fieldName = QString(QLatin1String(QContactPhoneNumber::FieldNumber)); + + exprName = "Phone Number"; + } + break; + + default: + { + <span class="comment">// email address</span> + defName = QString(QLatin1String(QContactEmailAddress::DefinitionName)); + fieldName = QString(QLatin1String(QContactEmailAddress::FieldEmailAddress)); + + exprName = "Email Address"; + } + break; + + } + fil.setDetailDefinitionName(defName, fieldName); + fil.setValue(m_valueCriteriaEdit->text()); + + QContactFilter::MatchFlags matchFlags; + switch (m_criteriaTypeCombo->currentIndex()) { + case 0: + { + matchFlags |= QContactFilter::MatchExactly; + exprMatch = "equals"; + } + break; + + case 1: + { + matchFlags |= QContactFilter::MatchStartsWith; + exprMatch = "starts with"; + } + break; + + case 2: + { + matchFlags |= QContactFilter::MatchEndsWith; + exprMatch = "ends with"; + } + break; + + default: + { + matchFlags |= QContactFilter::MatchContains; + exprMatch = "contains"; + } + break; + } + fil.setMatchFlags(matchFlags); + + <span class="comment">// if OR then join with OR</span> + if (m_joinMethodCombo->currentIndex() == 1) { + QContactUnionFilter ufil; + ufil << m_cumulativeFilter << fil; + QContactIntersectionFilter ifil; + ifil << ufil; + m_cumulativeFilter = ifil; + exprJoin = "OR"; + } else { + <span class="comment">// otherwise, just AND.</span> + QContactIntersectionFilter ifil(m_cumulativeFilter); + ifil << fil; + m_cumulativeFilter = ifil; + exprJoin = "AND"; + } + + <span class="comment">// set the expression so far</span> + if (!m_cumulativeExpression.isEmpty()) + m_cumulativeExpression += " " + exprJoin + " "; + m_cumulativeExpression += exprName + " " + exprMatch + " \"" + m_valueCriteriaEdit->text() + "\""; + + <span class="comment">// and clear the UI ready for the next filter expression.</span> + m_valueCriteriaEdit->setText(""); + m_fieldCriteriaCombo->setCurrentIndex(0); + m_criteriaTypeCombo->setCurrentIndex(0); + m_joinMethodCombo->setCurrentIndex(0); + m_cumulativeExpressionLabel->setText(m_cumulativeExpression); + } + + void FilterPage::clearClicked() + { + m_cumulativeExpression = QString(); + m_valueCriteriaEdit->setText(""); + m_fieldCriteriaCombo->setCurrentIndex(0); + m_criteriaTypeCombo->setCurrentIndex(0); + m_joinMethodCombo->setCurrentIndex(0); + m_cumulativeExpressionLabel->setText("Match All Contacts"); + m_cumulativeFilter = QContactFilter(); + } + + void FilterPage::doneClicked() + { + emit showListPage(m_cumulativeFilter); + }</pre> +<p /><address><hr /><div align="center"> +<table width="100%" cellspacing="0" border="0"><tr class="address"> +<td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> +<td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> +</tr></table></div></address></body> +</html> diff --git a/doc/html/samplephonebook-finddialog-h.html b/doc/html/samplephonebook-filterpage-h.html index 52972e9f50..e7e130a743 100644 --- a/doc/html/samplephonebook-finddialog-h.html +++ b/doc/html/samplephonebook-filterpage-h.html @@ -3,7 +3,7 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> - <title>Qt Mobility Project 1.0: finddialog.h Example File (samplephonebook/finddialog.h)</title> + <title>Qt Mobility Project 1.0: filterpage.h Example File (samplephonebook/filterpage.h)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -11,7 +11,7 @@ <tr> <td align="left" valign="top" width="32"><a href="http://qt.nokia.com/"><img src="images/qtlogo.png" align="left" border="0" /></a></td> <td width="1"> </td><td class="postheader" valign="center"><a href="index.html"><font color="#004faf">Home</font></a> · <a href="classes.html"><font color="#004faf">All Classes</font></a> · <a href="functions.html"><font color="#004faf">All Functions</font></a> ·</td> -<td align="right" valign="top" width="230"><img src="images/codeless.png" border="0" /></td></tr></table><h1 class="title">finddialog.h Example File<br /><span class="small-subtitle">samplephonebook/finddialog.h</span> +<td align="right" valign="top" width="230"><img src="images/codeless.png" border="0" /></td></tr></table><h1 class="title">filterpage.h Example File<br /><span class="small-subtitle">samplephonebook/filterpage.h</span> </h1> <pre><span class="comment"> /**************************************************************************** ** @@ -54,51 +54,61 @@ ** ****************************************************************************/</span> - #ifndef FINDDIALOG_H - #define FINDDIALOG_H + #ifndef FILTERPAGE_H + #define FILTERPAGE_H - #include <QDialog> - #include "qcontactfilter.h" + #include "qtcontacts.h" - class QLineEdit; + #include <QWidget> + #include <QMap> + #include <QPlainTextEdit> + + class QScrollArea; + class QComboBox; class QPushButton; + class QLineEdit; class QLabel; - - class FilterDialog; - QTM_USE_NAMESPACE - class FindDialog : public QDialog + class FilterPage : public QWidget { Q_OBJECT public: - FindDialog(QWidget *parent = 0); - QString getFindText() const; - QContactFilter getFindFilter() const; - bool isSimpleFilterEnabled() const; - void showEvent(QShowEvent *event); + FilterPage(QWidget *parent = 0); + ~FilterPage(); + + signals: + void showListPage(const QContactFilter& filter); public slots: - void findClicked(); - void filterClicked(); - void filterHidden(); + + private slots: + void addClicked(); + void clearClicked(); + void doneClicked(); private: - QPushButton *findButton; - QPushButton *filterButton; - FilterDialog *filterDialog; - QLineEdit *lineEdit; - QLabel *findLabel; - QString findText; - bool simpleFilter; + QLineEdit *m_valueCriteriaEdit; + QComboBox *m_fieldCriteriaCombo; + QComboBox *m_criteriaTypeCombo; + QComboBox *m_joinMethodCombo; + + QLabel *m_cumulativeExpressionLabel; + + QPushButton *m_add; + QPushButton *m_clear; + QPushButton *m_done; + + QString m_cumulativeExpression; + QContactFilter m_cumulativeFilter; }; - #endif</pre> + #endif <span class="comment">// FILTERPAGE_H</span></pre> <p /><address><hr /><div align="center"> <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/samplephonebook-finddialog-cpp.html b/doc/html/samplephonebook-finddialog-cpp.html deleted file mode 100644 index dfe93aefab..0000000000 --- a/doc/html/samplephonebook-finddialog-cpp.html +++ /dev/null @@ -1,168 +0,0 @@ -<?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE html - PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> -<head> - <title>Qt Mobility Project 1.0: finddialog.cpp Example File (samplephonebook/finddialog.cpp)</title> - <link href="classic.css" rel="stylesheet" type="text/css" /> -</head> -<body> -<table border="0" cellpadding="0" cellspacing="0" width="100%"> -<tr> -<td align="left" valign="top" width="32"><a href="http://qt.nokia.com/"><img src="images/qtlogo.png" align="left" border="0" /></a></td> -<td width="1"> </td><td class="postheader" valign="center"><a href="index.html"><font color="#004faf">Home</font></a> · <a href="classes.html"><font color="#004faf">All Classes</font></a> · <a href="functions.html"><font color="#004faf">All Functions</font></a> ·</td> -<td align="right" valign="top" width="230"><img src="images/codeless.png" border="0" /></td></tr></table><h1 class="title">finddialog.cpp Example File<br /><span class="small-subtitle">samplephonebook/finddialog.cpp</span> -</h1> -<pre><span class="comment"> /**************************************************************************** - ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). - ** All rights reserved. - ** Contact: Nokia Corporation (qt-info@nokia.com) - ** - ** This file is part of the Qt Mobility Components. - ** - ** $QT_BEGIN_LICENSE:LGPL$ - ** No Commercial Usage - ** This file contains pre-release code and may not be distributed. - ** You may use this file in accordance with the terms and conditions - ** contained in the Technology Preview License Agreement accompanying - ** this package. - ** - ** GNU Lesser General Public License Usage - ** Alternatively, this file may be used under the terms of the GNU Lesser - ** General Public License version 2.1 as published by the Free Software - ** Foundation and appearing in the file LICENSE.LGPL included in the - ** packaging of this file. Please review the following information to - ** ensure the GNU Lesser General Public License version 2.1 requirements - ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. - ** - ** In addition, as a special exception, Nokia gives you certain additional - ** rights. These rights are described in the Nokia Qt LGPL Exception - ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. - ** - ** If you have questions regarding the use of this file, please contact - ** Nokia at qt-info@nokia.com. - ** - ** - ** - ** - ** - ** - ** - ** - ** $QT_END_LICENSE$ - ** - ****************************************************************************/</span> - - #include "finddialog.h" - #include "../incomingcalls/filterdialog.h" - #include "../incomingcalls/filterdialog.cpp" - #include <QtGui> - - FindDialog::FindDialog(QWidget *parent) - : QDialog(parent), simpleFilter(true) - { - QVBoxLayout *layout = new QVBoxLayout(this); - filterDialog = new FilterDialog(this); - - findLabel = new QLabel(tr("Contact name:")); - lineEdit = new QLineEdit; - - findButton = new QPushButton(tr("&Find")); - findText = ""; - - filterButton = new QPushButton(tr("Show Filter Details")); - - QHBoxLayout *simpleFindLayout = new QHBoxLayout; - simpleFindLayout->addWidget(findLabel); - simpleFindLayout->addWidget(lineEdit); - simpleFindLayout->addStretch(1); - simpleFindLayout->addWidget(findButton); - simpleFindLayout->addStretch(1); - - QHBoxLayout *simpleFilterLayout = new QHBoxLayout; - simpleFilterLayout->addStretch(1); - simpleFilterLayout->addWidget(filterButton); - simpleFilterLayout->addStretch(1); - layout->addLayout(simpleFindLayout); - layout->addLayout(simpleFilterLayout); - layout->addWidget(filterDialog); - - setLayout(layout); - setWindowTitle(tr("Find a Contact")); - connect(findButton, SIGNAL(clicked()), this, SLOT(findClicked())); - connect(findButton, SIGNAL(clicked()), this, SLOT(accept())); - connect(filterButton, SIGNAL(clicked()), this, SLOT(filterClicked())); - connect(filterDialog, SIGNAL(hidden()), this, SLOT(filterHidden())); - - lineEdit->setFocus(); - } - - void FindDialog::findClicked() - { - QString text = lineEdit->text(); - - if (text.isEmpty()) { - QMessageBox::information(this, tr("Empty Field"), - tr("Please enter a name.")); - return; - } else { - findText = text; - lineEdit->clear(); - hide(); - } - } - - void FindDialog::filterClicked() - { - simpleFilter = false; - lineEdit->hide(); - findButton->hide(); - findLabel->hide(); - filterButton->hide(); - filterDialog->showDialog(); - } - - void FindDialog::showEvent(QShowEvent *event) - { - QDialog::showEvent(event); - simpleFilter = true; - filterButton->show(); - filterDialog->hide(); - lineEdit->show(); - findButton->show(); - findLabel->show(); - lineEdit->setFocus(); - } - - void FindDialog::filterHidden() - { - <span class="comment">// was the dialog accepted?</span> - if (filterDialog->status() == 1) { - accept(); - }else{ - reject(); - } - } - - bool FindDialog::isSimpleFilterEnabled() const - { - return simpleFilter; - } - - QString FindDialog::getFindText() const - { - return findText; - } - - QContactFilter FindDialog::getFindFilter() const - { - return filterDialog->filter(); - }</pre> -<p /><address><hr /><div align="center"> -<table width="100%" cellspacing="0" border="0"><tr class="address"> -<td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> -<td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> -</tr></table></div></address></body> -</html> diff --git a/doc/html/samplephonebook-groupdetailsdialog-cpp.html b/doc/html/samplephonebook-groupdetailsdialog-cpp.html deleted file mode 100644 index 0d14740973..0000000000 --- a/doc/html/samplephonebook-groupdetailsdialog-cpp.html +++ /dev/null @@ -1,217 +0,0 @@ -<?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE html - PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> -<head> - <title>Qt Mobility Project 1.0: groupdetailsdialog.cpp Example File (samplephonebook/groupdetailsdialog.cpp)</title> - <link href="classic.css" rel="stylesheet" type="text/css" /> -</head> -<body> -<table border="0" cellpadding="0" cellspacing="0" width="100%"> -<tr> -<td align="left" valign="top" width="32"><a href="http://qt.nokia.com/"><img src="images/qtlogo.png" align="left" border="0" /></a></td> -<td width="1"> </td><td class="postheader" valign="center"><a href="index.html"><font color="#004faf">Home</font></a> · <a href="classes.html"><font color="#004faf">All Classes</font></a> · <a href="functions.html"><font color="#004faf">All Functions</font></a> ·</td> -<td align="right" valign="top" width="230"><img src="images/codeless.png" border="0" /></td></tr></table><h1 class="title">groupdetailsdialog.cpp Example File<br /><span class="small-subtitle">samplephonebook/groupdetailsdialog.cpp</span> -</h1> -<pre><span class="comment"> /**************************************************************************** - ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). - ** All rights reserved. - ** Contact: Nokia Corporation (qt-info@nokia.com) - ** - ** This file is part of the Qt Mobility Components. - ** - ** $QT_BEGIN_LICENSE:LGPL$ - ** No Commercial Usage - ** This file contains pre-release code and may not be distributed. - ** You may use this file in accordance with the terms and conditions - ** contained in the Technology Preview License Agreement accompanying - ** this package. - ** - ** GNU Lesser General Public License Usage - ** Alternatively, this file may be used under the terms of the GNU Lesser - ** General Public License version 2.1 as published by the Free Software - ** Foundation and appearing in the file LICENSE.LGPL included in the - ** packaging of this file. Please review the following information to - ** ensure the GNU Lesser General Public License version 2.1 requirements - ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. - ** - ** In addition, as a special exception, Nokia gives you certain additional - ** rights. These rights are described in the Nokia Qt LGPL Exception - ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. - ** - ** If you have questions regarding the use of this file, please contact - ** Nokia at qt-info@nokia.com. - ** - ** - ** - ** - ** - ** - ** - ** - ** $QT_END_LICENSE$ - ** - ****************************************************************************/</span> - - #include "groupdetailsdialog.h" - - #include <QtGui> - #include "qcontact.h" - #include "qcontactmanager.h" - - #include "qcontactrelationship.h" - #include "qcontacttype.h" - #include "qcontactdetailfilter.h" - - GroupDetailsDialog::GroupDetailsDialog(QWidget *parent, QContactManager *contactManager, const QContact &contact) - : QDialog(parent), cm(contactManager) - { - Q_ASSERT(contactManager); - setWindowTitle(tr("Group Details")); - - QFormLayout *layout = new QFormLayout; - - qDebug() << "constructed group details dialog for contact:" << contact.displayLabel(); - qDebug() << " id =" << contact.id().managerUri() << ":" << contact.id().localId(); - - localContact = contact; - contactNameEdit = new QLineEdit(this); - contactNameEdit->setReadOnly(true); - contactNameEdit->setText(contact.displayLabel()); - listWidget = new QListWidget(this); - okButton = new QPushButton(tr("&Ok"), this); - cancelButton = new QPushButton(tr("&Cancel"), this); - - layout->addRow(tr("Contact Name"), contactNameEdit); - layout->addRow(listWidget); - - QHBoxLayout *buttonLayout = new QHBoxLayout; - buttonLayout->addWidget(okButton); - buttonLayout->addWidget(cancelButton); - layout->addRow(buttonLayout); - - setLayout(layout); - - repopulateGroupList(); - - connect(okButton, SIGNAL(clicked()), - this, SLOT(okButtonClicked())); - connect(cancelButton, SIGNAL(clicked()), - this, SLOT(cancelButtonClicked())); - connect(listWidget, SIGNAL(itemChanged(QListWidgetItem *)), - this, SLOT(groupItemChanged(QListWidgetItem *))); - } - - void GroupDetailsDialog::repopulateGroupList() - { - listWidget->clear(); - - QContactDetailFilter groupFilter; - groupFilter.setDetailDefinitionName(QContactType::DefinitionName, QContactType::FieldType); - groupFilter.setValue(QString(QLatin1String(QContactType::TypeGroup))); - QList<QContactLocalId> grpList = cm->contacts(groupFilter); - for (int index=0; index < grpList.count(); index++){ - QContact grp = cm->contact(grpList[index]); - QListWidgetItem *item = new QListWidgetItem(grp.displayLabel(), listWidget); - item->setFlags(item->flags() | Qt::ItemIsUserCheckable); - bool foundInGroup = false; - - QContactId groupId; - groupId.setManagerUri(cm->managerUri()); - groupId.setLocalId(grpList[index]); - QList<QContactRelationship> thisGroupsRels = cm->relationships(QContactRelationship::HasMember, groupId, QContactRelationshipFilter::First); - foreach (const QContactRelationship& currRel, thisGroupsRels) { - if (currRel.second() == localContact.id()) { - foundInGroup = true; - break; - } - } - if (foundInGroup) - item->setCheckState(Qt::Checked); - else - item->setCheckState(Qt::Unchecked); - <span class="comment">// store the group ID as Qt::UserRole + 1</span> - item->setData(Qt::UserRole + 1, grpList[index]); - } - - } - - QList<QContactLocalId> GroupDetailsDialog::groups() - { - QContactId localContactUri = localContact.id(); - QList<QContactRelationship> relationships = cm->relationships(QContactRelationship::HasMember, localContactUri); - QList<QContactLocalId> ret; - foreach (const QContactRelationship& currRel, relationships) { - if (currRel.second() == localContactUri) { - ret.append(currRel.first().localId()); - } - } - return ret; - } - - void GroupDetailsDialog::groupItemChanged(QListWidgetItem * item) - { - QContactLocalId id = item->data(Qt::UserRole + 1).toUInt(); <span class="comment">// id of the group.</span> - QContactId localContactUri = localContact.id(); - QContactId groupId; - groupId.setManagerUri(cm->managerUri()); - groupId.setLocalId(id); - QList<QContactRelationship> relationships = cm->relationships(QContactRelationship::HasMember, localContactUri, QContactRelationshipFilter::Second); - QList<QContactLocalId> currentGroups; - foreach (const QContactRelationship& currRel, relationships) { - currentGroups.append(currRel.first().localId()); - } - - qDebug() << "groups that localcontact is part of:"; - foreach (const QContactLocalId& dbgid, currentGroups) qDebug() << dbgid; - if (item->checkState() == Qt::Checked) { - qDebug() << "item is now checked!"; - qDebug() << "already =" << currentGroups.contains(id); - if (!currentGroups.contains(id)) { - qDebug() << "groupId =" << id; - qDebug() << "localContactId =" << localContactUri.managerUri() << ":" << localContactUri.localId(); - <span class="comment">// add it to the group.</span> - QContactRelationship newRelationship; - newRelationship.setFirst(groupId); - newRelationship.setRelationshipType(QContactRelationship::HasMember); - newRelationship.setSecond(localContactUri); - bool success = cm->saveRelationship(&newRelationship); - qDebug() << "succeed adding?" << success; - } - } else { - qDebug() << "item is now unchecked!"; - qDebug() << "already =" << currentGroups.contains(id); - if (currentGroups.contains(id)) { - <span class="comment">// remove any membership in that group</span> - QContactRelationship currRel; - currRel.setFirst(groupId); - currRel.setRelationshipType(QContactRelationship::HasMember); - currRel.setSecond(localContactUri); - bool success = cm->removeRelationship(currRel); - qDebug() << "succeed removing?" << success; - } - } - } - - void GroupDetailsDialog::show() - { - repopulateGroupList(); - } - - void GroupDetailsDialog::okButtonClicked() - { - accept(); - } - - void GroupDetailsDialog::cancelButtonClicked() - { - reject(); - }</pre> -<p /><address><hr /><div align="center"> -<table width="100%" cellspacing="0" border="0"><tr class="address"> -<td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> -<td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> -</tr></table></div></address></body> -</html> diff --git a/doc/html/samplephonebook-groupeditdialog-cpp.html b/doc/html/samplephonebook-groupeditdialog-cpp.html deleted file mode 100644 index a51346530d..0000000000 --- a/doc/html/samplephonebook-groupeditdialog-cpp.html +++ /dev/null @@ -1,236 +0,0 @@ -<?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE html - PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> -<head> - <title>Qt Mobility Project 1.0: groupeditdialog.cpp Example File (samplephonebook/groupeditdialog.cpp)</title> - <link href="classic.css" rel="stylesheet" type="text/css" /> -</head> -<body> -<table border="0" cellpadding="0" cellspacing="0" width="100%"> -<tr> -<td align="left" valign="top" width="32"><a href="http://qt.nokia.com/"><img src="images/qtlogo.png" align="left" border="0" /></a></td> -<td width="1"> </td><td class="postheader" valign="center"><a href="index.html"><font color="#004faf">Home</font></a> · <a href="classes.html"><font color="#004faf">All Classes</font></a> · <a href="functions.html"><font color="#004faf">All Functions</font></a> ·</td> -<td align="right" valign="top" width="230"><img src="images/codeless.png" border="0" /></td></tr></table><h1 class="title">groupeditdialog.cpp Example File<br /><span class="small-subtitle">samplephonebook/groupeditdialog.cpp</span> -</h1> -<pre><span class="comment"> /**************************************************************************** - ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). - ** All rights reserved. - ** Contact: Nokia Corporation (qt-info@nokia.com) - ** - ** This file is part of the Qt Mobility Components. - ** - ** $QT_BEGIN_LICENSE:LGPL$ - ** No Commercial Usage - ** This file contains pre-release code and may not be distributed. - ** You may use this file in accordance with the terms and conditions - ** contained in the Technology Preview License Agreement accompanying - ** this package. - ** - ** GNU Lesser General Public License Usage - ** Alternatively, this file may be used under the terms of the GNU Lesser - ** General Public License version 2.1 as published by the Free Software - ** Foundation and appearing in the file LICENSE.LGPL included in the - ** packaging of this file. Please review the following information to - ** ensure the GNU Lesser General Public License version 2.1 requirements - ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. - ** - ** In addition, as a special exception, Nokia gives you certain additional - ** rights. These rights are described in the Nokia Qt LGPL Exception - ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. - ** - ** If you have questions regarding the use of this file, please contact - ** Nokia at qt-info@nokia.com. - ** - ** - ** - ** - ** - ** - ** - ** - ** $QT_END_LICENSE$ - ** - ****************************************************************************/</span> - - #include "groupeditdialog.h" - - #include <QtGui> - #include "qcontact.h" - #include "qcontactmanager.h" - #include "qcontactdetailfilter.h" - #include "qcontactname.h" - - GroupEditDialog::GroupEditDialog(QWidget *parent, QContactManager *contactManager) - : QDialog(parent), cm(contactManager) - { - Q_ASSERT(contactManager); - setWindowTitle(tr("Groups Edit")); - - QFormLayout *layout = new QFormLayout; - - groupNameEdit = new QLineEdit(this); - listWidget = new QListWidget(this); - addButton = new QPushButton(tr("Add"), this); - saveButton = new QPushButton(tr("Save"), this); - deleteButton = new QPushButton(tr("Delete"), this); - doneButton = new QPushButton(tr("Done"), this); - - layout->addRow(tr("Group Name"), groupNameEdit); - layout->addRow(listWidget); - - QHBoxLayout *row1Layout = new QHBoxLayout; - row1Layout->addWidget(addButton); - row1Layout->addWidget(saveButton); - row1Layout->addWidget(deleteButton); - layout->addRow(row1Layout); - - QHBoxLayout *row2Layout = new QHBoxLayout; - row2Layout->addStretch(1); - row2Layout->addWidget(doneButton); - layout->addRow(row2Layout); - - setLayout(layout); - - repopulateGroupList(); - - connect(addButton, SIGNAL(clicked()), - this, SLOT(addButtonClicked())); - connect(deleteButton, SIGNAL(clicked()), - this, SLOT(deleteButtonClicked())); - connect(saveButton, SIGNAL(clicked()), - this, SLOT(saveButtonClicked())); - connect(doneButton, SIGNAL(clicked()), - this, SLOT(doneButtonClicked())); - connect(listWidget, SIGNAL(itemActivated(QListWidgetItem *)), - this, SLOT(groupItemActivated(QListWidgetItem *))); - connect(listWidget, SIGNAL(currentItemChanged (QListWidgetItem *, QListWidgetItem *)), - this, SLOT(groupItemChanged (QListWidgetItem *, QListWidgetItem *))); - } - - void GroupEditDialog::repopulateGroupList() - { - listWidget->clear(); - QContactDetailFilter groupFilter; - groupFilter.setDetailDefinitionName(QContactType::DefinitionName, QContactType::FieldType); - groupFilter.setValue(QString(QLatin1String(QContactType::TypeGroup))); - QList<QContactLocalId> grpList = cm->contacts(groupFilter); - for (int index=0; index < grpList.count(); index++){ - QContact grp = cm->contact(grpList[index]); - QListWidgetItem *item = new QListWidgetItem(grp.displayLabel(), listWidget); - <span class="comment">// store the group ID as Qt::UserRole + 1</span> - item->setData(Qt::UserRole + 1, grpList[index]); - } - - } - - void GroupEditDialog::show() - { - repopulateGroupList(); - } - - void GroupEditDialog::addButtonClicked() - { - if (!groupNameEdit->text().isEmpty()){ - QContact grp; - grp.setType(QContactType::TypeGroup); - bool result; - QContactName groupName; - groupName.setCustomLabel(groupNameEdit->text()); - grp.saveDetail(&groupName); - result = cm->saveContact(&grp); - - if (!result){ - QMessageBox::information(this, tr("Group Add"), - tr("Failed to add Group '%1'.").arg(grp.displayLabel())); - }else{ - repopulateGroupList(); - <span class="comment">// select the added group name</span> - for (int index = 0; index < listWidget->count();index++){ - if (listWidget->item(index)->data(Qt::UserRole + 1).toUInt() == grp.id().localId()){ - listWidget->setCurrentItem(listWidget->item(index)); - break; - } - } - } - - }else{ - QMessageBox::information(this, tr("Empty Field"), - tr("Please enter a name.")); - groupNameEdit->setFocus(); - } - } - - void GroupEditDialog::saveButtonClicked() - { - if (listWidget->currentItem()){ - QContactLocalId grpID = listWidget->currentItem()->data(Qt::UserRole + 1).toUInt(); - QContact grp = cm->contact(grpID); - bool result = false; - if (!grp.isEmpty()){ - QContactName groupName; - groupName.setCustomLabel(groupNameEdit->text()); - grp.saveDetail(&groupName); - result = cm->saveContact(&grp); - } - if (!result){ - QMessageBox::information(this, tr("Save Group"), - tr("Failed to save Group '%1'.").arg(listWidget->currentItem()->text())); - }else{ - repopulateGroupList(); - <span class="comment">// select the group name again</span> - for (int index = 0; index < listWidget->count();index++){ - if (listWidget->item(index)->data(Qt::UserRole + 1).toUInt() == grp.id().localId()){ - listWidget->setCurrentItem(listWidget->item(index)); - break; - } - } - } - } - } - - void GroupEditDialog::deleteButtonClicked() - { - if (listWidget->currentItem()){ - int lastCurrentRow = listWidget->currentRow(); - QContactLocalId grpID = listWidget->currentItem()->data(Qt::UserRole + 1).toUInt(); - if (!cm->removeContact(grpID)){ - QMessageBox::information(this, tr("Remove Group"), - tr("Failed to removed Group '%1'.").arg(listWidget->currentItem()->text())); - }else{ - repopulateGroupList(); - if (lastCurrentRow < listWidget->count()){ - listWidget->setCurrentRow(lastCurrentRow); - }else { - if (listWidget->count()) - listWidget->setCurrentRow(listWidget->count() - 1); - } - } - } - } - - void GroupEditDialog::doneButtonClicked() - { - accept(); - } - - void GroupEditDialog::groupItemActivated(QListWidgetItem * item) - { - if (item) - groupNameEdit->setText(listWidget->currentItem()->text()); - else - groupNameEdit->clear(); - } - - void GroupEditDialog::groupItemChanged ( QListWidgetItem * current, QListWidgetItem * <span class="comment">/*previous*/</span> ) - { - groupItemActivated(current); - }</pre> -<p /><address><hr /><div align="center"> -<table width="100%" cellspacing="0" border="0"><tr class="address"> -<td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> -<td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> -</tr></table></div></address></body> -</html> diff --git a/doc/html/samplephonebook-main-cpp.html b/doc/html/samplephonebook-main-cpp.html index 814bf2a96d..3b00da1899 100644 --- a/doc/html/samplephonebook-main-cpp.html +++ b/doc/html/samplephonebook-main-cpp.html @@ -70,6 +70,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/samplephonebook-maindialogform-240-320-cpp.html b/doc/html/samplephonebook-maindialogform-240-320-cpp.html deleted file mode 100644 index 1ceeea9a35..0000000000 --- a/doc/html/samplephonebook-maindialogform-240-320-cpp.html +++ /dev/null @@ -1,74 +0,0 @@ -<?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE html - PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> -<head> - <title>Qt Mobility Project 1.0: maindialogform_240_320.cpp Example File (samplephonebook/maindialogform_240_320.cpp)</title> - <link href="classic.css" rel="stylesheet" type="text/css" /> -</head> -<body> -<table border="0" cellpadding="0" cellspacing="0" width="100%"> -<tr> -<td align="left" valign="top" width="32"><a href="http://qt.nokia.com/"><img src="images/qtlogo.png" align="left" border="0" /></a></td> -<td width="1"> </td><td class="postheader" valign="center"><a href="index.html"><font color="#004faf">Home</font></a> · <a href="classes.html"><font color="#004faf">All Classes</font></a> · <a href="functions.html"><font color="#004faf">All Functions</font></a> ·</td> -<td align="right" valign="top" width="230"><img src="images/codeless.png" border="0" /></td></tr></table><h1 class="title">maindialogform_240_320.cpp Example File<br /><span class="small-subtitle">samplephonebook/maindialogform_240_320.cpp</span> -</h1> -<pre><span class="comment"> /**************************************************************************** - ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). - ** All rights reserved. - ** Contact: Nokia Corporation (qt-info@nokia.com) - ** - ** This file is part of the Qt Mobility Components. - ** - ** $QT_BEGIN_LICENSE:LGPL$ - ** No Commercial Usage - ** This file contains pre-release code and may not be distributed. - ** You may use this file in accordance with the terms and conditions - ** contained in the Technology Preview License Agreement accompanying - ** this package. - ** - ** GNU Lesser General Public License Usage - ** Alternatively, this file may be used under the terms of the GNU Lesser - ** General Public License version 2.1 as published by the Free Software - ** Foundation and appearing in the file LICENSE.LGPL included in the - ** packaging of this file. Please review the following information to - ** ensure the GNU Lesser General Public License version 2.1 requirements - ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. - ** - ** In addition, as a special exception, Nokia gives you certain additional - ** rights. These rights are described in the Nokia Qt LGPL Exception - ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. - ** - ** If you have questions regarding the use of this file, please contact - ** Nokia at qt-info@nokia.com. - ** - ** - ** - ** - ** - ** - ** - ** - ** $QT_END_LICENSE$ - ** - ****************************************************************************/</span> - - #include "maindialogform_240_320.h" - - MainDialogForm240By320::MainDialogForm240By320(QWidget *parent) - :QWidget(parent) - { - setupUi(this); - } - - MainDialogForm240By320::~MainDialogForm240By320() - { - }</pre> -<p /><address><hr /><div align="center"> -<table width="100%" cellspacing="0" border="0"><tr class="address"> -<td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> -<td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> -</tr></table></div></address></body> -</html> diff --git a/doc/html/samplephonebook-maindialogform-240-320-h.html b/doc/html/samplephonebook-maindialogform-240-320-h.html deleted file mode 100644 index beb8a903e3..0000000000 --- a/doc/html/samplephonebook-maindialogform-240-320-h.html +++ /dev/null @@ -1,71 +0,0 @@ -<?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE html - PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> -<head> - <title>Qt Mobility Project 1.0: maindialogform_240_320.h Example File (samplephonebook/maindialogform_240_320.h)</title> - <link href="classic.css" rel="stylesheet" type="text/css" /> -</head> -<body> -<table border="0" cellpadding="0" cellspacing="0" width="100%"> -<tr> -<td align="left" valign="top" width="32"><a href="http://qt.nokia.com/"><img src="images/qtlogo.png" align="left" border="0" /></a></td> -<td width="1"> </td><td class="postheader" valign="center"><a href="index.html"><font color="#004faf">Home</font></a> · <a href="classes.html"><font color="#004faf">All Classes</font></a> · <a href="functions.html"><font color="#004faf">All Functions</font></a> ·</td> -<td align="right" valign="top" width="230"><img src="images/codeless.png" border="0" /></td></tr></table><h1 class="title">maindialogform_240_320.h Example File<br /><span class="small-subtitle">samplephonebook/maindialogform_240_320.h</span> -</h1> -<pre><span class="comment"> /**************************************************************************** - ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). - ** All rights reserved. - ** Contact: Nokia Corporation (qt-info@nokia.com) - ** - ** This file is part of the Qt Mobility Components. - ** - ** $QT_BEGIN_LICENSE:LGPL$ - ** No Commercial Usage - ** This file contains pre-release code and may not be distributed. - ** You may use this file in accordance with the terms and conditions - ** contained in the Technology Preview License Agreement accompanying - ** this package. - ** - ** GNU Lesser General Public License Usage - ** Alternatively, this file may be used under the terms of the GNU Lesser - ** General Public License version 2.1 as published by the Free Software - ** Foundation and appearing in the file LICENSE.LGPL included in the - ** packaging of this file. Please review the following information to - ** ensure the GNU Lesser General Public License version 2.1 requirements - ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. - ** - ** In addition, as a special exception, Nokia gives you certain additional - ** rights. These rights are described in the Nokia Qt LGPL Exception - ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. - ** - ** If you have questions regarding the use of this file, please contact - ** Nokia at qt-info@nokia.com. - ** - ** - ** - ** - ** - ** - ** - ** - ** $QT_END_LICENSE$ - ** - ****************************************************************************/</span> - - #include "ui_maindialog_240_320.h" - - class MainDialogForm240By320 : public QWidget, Ui::MainDialog240By320 - { - public: - MainDialogForm240By320(QWidget *parent); - ~MainDialogForm240By320(); - };</pre> -<p /><address><hr /><div align="center"> -<table width="100%" cellspacing="0" border="0"><tr class="address"> -<td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> -<td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> -</tr></table></div></address></body> -</html> diff --git a/doc/html/samplephonebook-maindialogform-640-480-cpp.html b/doc/html/samplephonebook-maindialogform-640-480-cpp.html deleted file mode 100644 index 6928100b26..0000000000 --- a/doc/html/samplephonebook-maindialogform-640-480-cpp.html +++ /dev/null @@ -1,74 +0,0 @@ -<?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE html - PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> -<head> - <title>Qt Mobility Project 1.0: maindialogform_640_480.cpp Example File (samplephonebook/maindialogform_640_480.cpp)</title> - <link href="classic.css" rel="stylesheet" type="text/css" /> -</head> -<body> -<table border="0" cellpadding="0" cellspacing="0" width="100%"> -<tr> -<td align="left" valign="top" width="32"><a href="http://qt.nokia.com/"><img src="images/qtlogo.png" align="left" border="0" /></a></td> -<td width="1"> </td><td class="postheader" valign="center"><a href="index.html"><font color="#004faf">Home</font></a> · <a href="classes.html"><font color="#004faf">All Classes</font></a> · <a href="functions.html"><font color="#004faf">All Functions</font></a> ·</td> -<td align="right" valign="top" width="230"><img src="images/codeless.png" border="0" /></td></tr></table><h1 class="title">maindialogform_640_480.cpp Example File<br /><span class="small-subtitle">samplephonebook/maindialogform_640_480.cpp</span> -</h1> -<pre><span class="comment"> /**************************************************************************** - ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). - ** All rights reserved. - ** Contact: Nokia Corporation (qt-info@nokia.com) - ** - ** This file is part of the Qt Mobility Components. - ** - ** $QT_BEGIN_LICENSE:LGPL$ - ** No Commercial Usage - ** This file contains pre-release code and may not be distributed. - ** You may use this file in accordance with the terms and conditions - ** contained in the Technology Preview License Agreement accompanying - ** this package. - ** - ** GNU Lesser General Public License Usage - ** Alternatively, this file may be used under the terms of the GNU Lesser - ** General Public License version 2.1 as published by the Free Software - ** Foundation and appearing in the file LICENSE.LGPL included in the - ** packaging of this file. Please review the following information to - ** ensure the GNU Lesser General Public License version 2.1 requirements - ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. - ** - ** In addition, as a special exception, Nokia gives you certain additional - ** rights. These rights are described in the Nokia Qt LGPL Exception - ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. - ** - ** If you have questions regarding the use of this file, please contact - ** Nokia at qt-info@nokia.com. - ** - ** - ** - ** - ** - ** - ** - ** - ** $QT_END_LICENSE$ - ** - ****************************************************************************/</span> - - #include "maindialogform_640_480.h" - - MainDialogForm640By480::MainDialogForm640By480(QWidget *parent) - :QWidget(parent) - { - setupUi(this); - } - - MainDialogForm640By480::~MainDialogForm640By480() - { - }</pre> -<p /><address><hr /><div align="center"> -<table width="100%" cellspacing="0" border="0"><tr class="address"> -<td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> -<td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> -</tr></table></div></address></body> -</html> diff --git a/doc/html/samplephonebook-maindialogform-640-480-h.html b/doc/html/samplephonebook-maindialogform-640-480-h.html deleted file mode 100644 index 48bc0e0913..0000000000 --- a/doc/html/samplephonebook-maindialogform-640-480-h.html +++ /dev/null @@ -1,71 +0,0 @@ -<?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE html - PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> -<head> - <title>Qt Mobility Project 1.0: maindialogform_640_480.h Example File (samplephonebook/maindialogform_640_480.h)</title> - <link href="classic.css" rel="stylesheet" type="text/css" /> -</head> -<body> -<table border="0" cellpadding="0" cellspacing="0" width="100%"> -<tr> -<td align="left" valign="top" width="32"><a href="http://qt.nokia.com/"><img src="images/qtlogo.png" align="left" border="0" /></a></td> -<td width="1"> </td><td class="postheader" valign="center"><a href="index.html"><font color="#004faf">Home</font></a> · <a href="classes.html"><font color="#004faf">All Classes</font></a> · <a href="functions.html"><font color="#004faf">All Functions</font></a> ·</td> -<td align="right" valign="top" width="230"><img src="images/codeless.png" border="0" /></td></tr></table><h1 class="title">maindialogform_640_480.h Example File<br /><span class="small-subtitle">samplephonebook/maindialogform_640_480.h</span> -</h1> -<pre><span class="comment"> /**************************************************************************** - ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). - ** All rights reserved. - ** Contact: Nokia Corporation (qt-info@nokia.com) - ** - ** This file is part of the Qt Mobility Components. - ** - ** $QT_BEGIN_LICENSE:LGPL$ - ** No Commercial Usage - ** This file contains pre-release code and may not be distributed. - ** You may use this file in accordance with the terms and conditions - ** contained in the Technology Preview License Agreement accompanying - ** this package. - ** - ** GNU Lesser General Public License Usage - ** Alternatively, this file may be used under the terms of the GNU Lesser - ** General Public License version 2.1 as published by the Free Software - ** Foundation and appearing in the file LICENSE.LGPL included in the - ** packaging of this file. Please review the following information to - ** ensure the GNU Lesser General Public License version 2.1 requirements - ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. - ** - ** In addition, as a special exception, Nokia gives you certain additional - ** rights. These rights are described in the Nokia Qt LGPL Exception - ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. - ** - ** If you have questions regarding the use of this file, please contact - ** Nokia at qt-info@nokia.com. - ** - ** - ** - ** - ** - ** - ** - ** - ** $QT_END_LICENSE$ - ** - ****************************************************************************/</span> - - #include "ui_maindialog_640_480.h" - - class MainDialogForm640By480 : public QWidget, Ui::MainDialog640By480 - { - public: - MainDialogForm640By480(QWidget *parent); - ~MainDialogForm640By480(); - };</pre> -<p /><address><hr /><div align="center"> -<table width="100%" cellspacing="0" border="0"><tr class="address"> -<td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> -<td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> -</tr></table></div></address></body> -</html> diff --git a/doc/html/samplephonebook-phonebook-cpp.html b/doc/html/samplephonebook-phonebook-cpp.html index 99b6d52ce6..259544ece5 100644 --- a/doc/html/samplephonebook-phonebook-cpp.html +++ b/doc/html/samplephonebook-phonebook-cpp.html @@ -55,712 +55,74 @@ ****************************************************************************/</span> #include "phonebook.h" - #include "serialiser.h" - #include "contactdetailsform.h" - #include "maindialogform_640_480.h" - #include "maindialogform_240_320.h" - #include "groupeditdialog.h" - #include "groupdetailsdialog.h" - #include <QDesktopWidget> + #include "contactlistpage.h" + #include "contacteditor.h" + #include "filterpage.h" #include <QtGui> PhoneBook::PhoneBook(QWidget *parent) - : QWidget(parent), dialog(0), addingContact(false), editingContact(false) + : QWidget(parent) { + m_editorPage = new ContactEditor(this); + connect(m_editorPage, SIGNAL(showListPage()), this, SLOT(activateList())); - QVBoxLayout *layout = new QVBoxLayout; + m_filterPage = new FilterPage(this); + connect(m_filterPage, SIGNAL(showListPage(QContactFilter)), this, SLOT(activateList(QContactFilter))); - QDesktopWidget screenWidget; + m_listPage = new ContactListPage(this); + connect(m_listPage, SIGNAL(showEditorPage(QContactLocalId)), this, SLOT(activateEditor(QContactLocalId))); + connect(m_listPage, SIGNAL(showFilterPage(QContactFilter)), this, SLOT(activateFind())); + connect(m_listPage, SIGNAL(managerChanged(QContactManager*)), this, SLOT(managerChanged(QContactManager*))); - if (QApplication::desktop()->width() > 480){ - smallScreenSize = false; - mainDialogForm640By480 = new MainDialogForm640By480(this); - mainForm = mainDialogForm640By480; - detailsForm = mainForm; - layout->addWidget(mainForm); - setLayout(layout); - }else{ - smallScreenSize = true; - mainDialogForm240By320 = new MainDialogForm240By320(this); - contactDetailsForm = new ContactDetailsForm(mainDialogForm240By320); - mainForm = mainDialogForm240By320; - detailsForm = contactDetailsForm; - layout->addWidget(mainForm); - setLayout(layout); - showMaximized(); - } + m_stackedWidget = new QStackedWidget(this); + m_stackedWidget->addWidget(m_listPage); + m_stackedWidget->addWidget(m_editorPage); + m_stackedWidget->addWidget(m_filterPage); + m_stackedWidget->setCurrentIndex(0); - addButton = qFindChild<QPushButton*>(mainForm, "addButton"); - openButton = qFindChild<QPushButton*>(mainForm, "openButton"); - removeButton = qFindChild<QPushButton*>(mainForm, "deleteButton"); - findButton = qFindChild<QPushButton*>(mainForm, "findButton"); - importButton = qFindChild<QPushButton*>(mainForm, "importButton"); - exportButton = qFindChild<QPushButton*>(mainForm, "exportButton"); - avatarButton = qFindChild<QPushButton*>(mainForm, "avatarButton"); - quitButton = qFindChild<QPushButton*>(mainForm, "quitButton"); - if(!avatarButton) - avatarButton = qFindChild<QPushButton*>(detailsForm, "avatarButton"); - saveButton = qFindChild<QPushButton*>(mainForm, "saveButton"); - if(!saveButton) - saveButton = qFindChild<QPushButton*>(detailsForm, "saveButton"); - cancelButton = qFindChild<QPushButton*>(detailsForm, "cancelButton"); - groupsButton = qFindChild<QPushButton*>(detailsForm, "groupsButton"); - - avatarButton->installEventFilter(this); - - removeButton->setEnabled(false); - findButton->setEnabled(false); - saveButton->setEnabled(true); - exportButton->setEnabled(false); - - nameLine = qFindChild<QLineEdit*>(detailsForm, "nameEdit"); - avatarPixmapLabel = qFindChild<QLabel*>(detailsForm, "avatarPixmapLabel"); - emailLine = qFindChild<QLineEdit*>(detailsForm, "emailEdit"); - homePhoneLine = qFindChild<QLineEdit*>(detailsForm, "homePhoneEdit"); - workPhoneLine = qFindChild<QLineEdit*>(detailsForm, "workPhoneEdit"); - mobilePhoneLine = qFindChild<QLineEdit*>(detailsForm, "mobilePhoneEdit"); - addressText = qFindChild<QPlainTextEdit*>(detailsForm, "addressEdit"); - contactsList = qFindChild<QListWidget*>(mainForm, "contactListWidget"); - currentIndexLabel = qFindChild<QLabel*>(mainForm, "contactStatusLabel"); - backendCombo = qFindChild<QComboBox*>(mainForm, "contactEngineComboBox"); - - QStringList availableManagers = QContactManager::availableManagers(); - foreach (const QString manager, availableManagers) - backendCombo->addItem(manager); - connect(backendCombo, SIGNAL(currentIndexChanged(QString)), this, SLOT(backendSelected(QString))); - - if(cancelButton) - connect(cancelButton, SIGNAL(clicked()), this, SLOT(cancelContact())); - if(openButton){ - connect(openButton, SIGNAL(clicked()), this, SLOT(openContact())); - openButton->setEnabled(false); - } - connect(avatarButton, SIGNAL(clicked()), this, SLOT(selectAvatar())); - connect(addButton, SIGNAL(clicked()), this, SLOT(addContact())); - connect(saveButton, SIGNAL(clicked()), this, SLOT(saveContact())); - connect(removeButton, SIGNAL(clicked()), this, SLOT(removeContact())); - connect(findButton, SIGNAL(clicked()), this, SLOT(findContact())); - connect(importButton, SIGNAL(clicked()), this, SLOT(importFromVCard())); - connect(exportButton, SIGNAL(clicked()), this, SLOT(exportAsVCard())); - if(quitButton) - connect(quitButton, SIGNAL(clicked()), this, SLOT(close())); - connect(groupsButton, SIGNAL(clicked()), this, SLOT(editGroupDetails())); - connect(contactsList, SIGNAL(currentRowChanged(int)), this, SLOT(contactSelected(int))); - if (smallScreenSize){ - connect(detailsForm, SIGNAL(accepted()), this, SLOT(saveContact())); - connect(detailsForm, SIGNAL(rejected()), this, SLOT(cancelContact())); - } - setWindowTitle(tr("Sample Phone Book")); - <span class="comment">// instantiate a new contact manager</span> - cm = 0; - backendSelected(backendCombo->currentText()); + QVBoxLayout *centralLayout = new QVBoxLayout; + centralLayout->addWidget(m_stackedWidget); + setLayout(centralLayout); } PhoneBook::~PhoneBook() { - foreach (const QContactManager* manager, managers.values()) - delete manager; - } - - void PhoneBook::backendChanged(const QList<QContactLocalId>& changes) - { - <span class="comment">// load all contacts from the updated backend</span> - QContactDetailFilter contactFilter; - contactFilter.setDetailDefinitionName(QContactType::DefinitionName, QContactType::FieldType); - contactFilter.setValue(QString(QLatin1String(QContactType::TypeContact))); - QList<QContactLocalId> contactIds = cm->contacts(contactFilter); - contacts.clear(); - foreach (const QContactLocalId cid, contactIds) - contacts.append(cm->contact(cid)); - qDebug() << "backend changed, and now have" << contactIds.size() << "contacts which are TypeContact!"; - - <span class="comment">// if there are no contacts in the backend any more, we add a new, unsaved contact</span> - <span class="comment">// otherwise, display the current one. Either way, need to repopulate the list.</span> - populateList(cm->contact(changes.value(0))); <span class="comment">// this may fail if the change was a removal.</span> - if (!contacts.isEmpty()){ - displayContact(); - } else { - nameLine->setText(QString()); - emailLine->setText(QString()); - homePhoneLine->setText(QString()); - workPhoneLine->setText(QString()); - mobilePhoneLine->setText(QString()); - addressText->setPlainText(QString()); - avatarPixmapLabel->clear(); - updateButtons(); - } - } - - void PhoneBook::backendSelected(const QString& backend) - { - currentIndex = -1; - - <span class="comment">// first, disconnect any signals from the current manager</span> - if (cm) - cm->disconnect(); - - <span class="comment">// then, load the selected manager (or create it if it doesn't exist)</span> - if (managers.value(backend, 0) != 0) { - cm = managers.value(backend); - } else { - cm = new QContactManager(backend); - managers.insert(backend, cm); - } - - <span class="comment">// and connect the selected manager's signals to our slots</span> - connect(cm, SIGNAL(contactsAdded(const QList<QContactLocalId>&)), this, SLOT(backendChanged(const QList<QContactLocalId>&))); - connect(cm, SIGNAL(contactsChanged(const QList<QContactLocalId>&)), this, SLOT(backendChanged(const QList<QContactLocalId>&))); - connect(cm, SIGNAL(contactsRemoved(const QList<QContactLocalId>&)), this, SLOT(backendChanged(const QList<QContactLocalId>&))); - - <span class="comment">// and trigger an update.</span> - backendChanged(QList<QContactLocalId>()); - } - - bool PhoneBook::eventFilter(QObject* watched, QEvent* event) - { - if (watched == avatarButton && event->type() == QEvent::Resize) { - QResizeEvent *re = (QResizeEvent*)event; - QSize trim(20,20); - QSize newSize = re->size(); - newSize -= trim; - avatarButton->setIconSize(newSize); - return true; - } - - return false; - } - - void PhoneBook::contactSelected(int row) - { - if (row < 0) - return; - - while (currentIndex > row) { - previous(); - } - - while (currentIndex < row) { - next(); - } - } - - void PhoneBook::populateList(const QContact& currentContact) - { - <span class="comment">// first, we sort the contacts according to display name</span> - <span class="comment">// then we populate the list widget.</span> - QList<QContact> sorted; - if (contacts.size() > 0) { - sorted.append(contacts.at(0)); - contacts.removeFirst(); - } - - <span class="comment">// sort the list.</span> - foreach (const QContact& contact, contacts) { - bool inserted = false; - for (int i = 0; i < sorted.size(); i++) { - <span class="comment">// first, retrieve the display labels from each contact</span> - QContact sortedContact = sorted.at(i); - QContactDisplayLabel cdl = contact.detail(QContactDisplayLabel::DefinitionName); - QContactDisplayLabel sdl = sortedContact.detail(QContactDisplayLabel::DefinitionName); - - <span class="comment">// compare the display labels, and insert into list.</span> - if (cdl.label().toLower() < sdl.label().toLower()) { - sorted.insert(i, contact); - inserted = true; - break; - } - } - - if (!inserted) { - sorted.append(contact); - } - } - - <span class="comment">// replace our member list.</span> - contacts = sorted; - - <span class="comment">// and repopulate the list widget.</span> - contactsList->clear(); - foreach (const QContact& contact, contacts) { - new QListWidgetItem(contact.displayLabel(), contactsList); - } - - <span class="comment">// now find out what our new current index is</span> - currentIndex = 0; - for (int i = 0; i < contacts.size(); i++) { - if (contacts.at(i) == currentContact) { - currentIndex = i; - break; - } - } - - <span class="comment">// and set the selection in the list widget.</span> - contactsList->setCurrentRow(currentIndex); - } - - QContact PhoneBook::buildContact() const - { - <span class="comment">// builds the contact from the current index / current UI.</span> - QContact c; - QContactName contactName = buildName(nameLine->text()); - c.saveDetail(&contactName); - - QContactEmailAddress emailAddress; - emailAddress.setEmailAddress(emailLine->text()); - c.saveDetail(&emailAddress); - - QContactPhoneNumber homePhone; - homePhone.setNumber(homePhoneLine->text()); - homePhone.setContexts(QStringList(QContactDetail::ContextHome)); - homePhone.setSubTypes(QStringList(QContactPhoneNumber::SubTypeLandline)); - homePhone.setSubTypes(QStringList(QContactPhoneNumber::SubTypeVoice)); - c.saveDetail(&homePhone); - - QContactPhoneNumber workPhone; - workPhone.setNumber(workPhoneLine->text()); - workPhone.setContexts(QStringList(QContactDetail::ContextWork)); - workPhone.setSubTypes(QStringList(QContactPhoneNumber::SubTypeLandline)); - workPhone.setSubTypes(QStringList(QContactPhoneNumber::SubTypeVoice)); - c.saveDetail(&workPhone); - - QContactPhoneNumber mobilePhone; - mobilePhone.setNumber(mobilePhoneLine->text()); - mobilePhone.setSubTypes(QStringList(QContactPhoneNumber::SubTypeMobile)); - c.saveDetail(&mobilePhone); - - <span class="comment">// note that we abuse the "street" field in this example.</span> - QContactAddress address; - address.setStreet(addressText->toPlainText()); - address.setSubTypes(QStringList() << QContactAddress::SubTypeDomestic << QContactAddress::SubTypeParcel << QContactAddress::SubTypePostal); - if (!address.street().isEmpty()) - c.saveDetail(&address); - - return c; - } - -<span class="comment"> /*! - * Build QContactName with one of the following set: - * 1. custom label, 2. first name, 3. last name - * If none is supported the returned QContactName is left empty. - */</span> - QContactName PhoneBook::buildName(const QString &name) const - { - QContactName contactName; - QContactDetailDefinition nameDef = cm->detailDefinition(QContactName::DefinitionName, QContactType::TypeContact); - if(nameDef.fields().contains(QContactName::FieldCustomLabel)) { - contactName.setCustomLabel(name); - } else if(nameDef.fields().contains(QContactName::FieldFirst)) { - contactName.setFirst(name); - } else if(nameDef.fields().contains(QContactName::FieldLast)) { - contactName.setLast(name); - } - return contactName; - } - - void PhoneBook::displayContact() - { - QContact c = contacts.value(currentIndex); - c = cm->contact(c.id().localId()); <span class="comment">// this removes any unsaved information.</span> - - QContactId contactUri = c.id(); - QList<QContactRelationship> relationships = cm->relationships(QContactRelationship::HasMember, contactUri); - QList<QContactLocalId> currentGroups; - foreach (const QContactRelationship& currRel, relationships) { - if (currRel.second() == contactUri) { - currentGroups.append(currRel.first().localId()); - } - } - contactGroups = currentGroups; - - <span class="comment">// display the name</span> - nameLine->setText(c.displayLabel()); - - <span class="comment">// display the email address</span> - emailLine->setText(c.detail(QContactEmailAddress::DefinitionName).value(QContactEmailAddress::FieldEmailAddress)); - - <span class="comment">// display the phone numbers</span> - QList<QContactDetail> phns = c.details(QContactPhoneNumber::DefinitionName); - bool foundHomePhone = false; - bool foundWorkPhone = false; - bool foundMobilePhone = false; - for (int i = 0; i < phns.size(); i++) { - QContactPhoneNumber current = phns.at(i); - if (current.subTypes().contains(QContactPhoneNumber::SubTypeMobile)) { - mobilePhoneLine->setText(current.number()); - foundMobilePhone = true; - } else if (current.contexts().contains(QContactDetail::ContextWork)) { - workPhoneLine->setText(current.number()); - foundWorkPhone = true; - } else { - homePhoneLine->setText(current.number()); - foundHomePhone = true; - } - } - - if (!foundHomePhone) - homePhoneLine->setText(""); - if (!foundWorkPhone) - workPhoneLine->setText(""); - if (!foundMobilePhone) - mobilePhoneLine->setText(""); - - <span class="comment">// display the address - again, we abuse the street() field.</span> - addressText->setPlainText((QContactAddress(c.detail(QContactAddress::DefinitionName))).street()); - - <span class="comment">// and build the avatar filename and display it if it exists.</span> - QString avatarFile = c.detail(QContactAvatar::DefinitionName).value(QContactAvatar::FieldAvatar); - if (avatarFile.isNull() || avatarFile.isEmpty()) { - avatarPixmapLabel->clear(); - } else { - QPixmap avatarPix(avatarFile); - avatarPixmapLabel->setPixmap(avatarPix.scaled(avatarPixmapLabel->size())); - } - - updateButtons(); - - } - - void PhoneBook::selectAvatar() - { - <span class="comment">//determine the list of file formats to pass to QFileDialog::getOpenFileName()</span> - QString supportedImageFormats; - for (int formatIndex = 0; formatIndex < QImageReader::supportedImageFormats().count(); formatIndex++) { - supportedImageFormats += QLatin1String(" *.") + QImageReader::supportedImageFormats()[formatIndex]; - } - - QString selected = QFileDialog::getOpenFileName(detailsForm, "Select avatar image file", ".", tr("Images (%1)").arg(supportedImageFormats)); - if (!selected.isNull()) { - QContact curr = contacts.at(currentIndex); - QContactAvatar av = curr.detail(QContactAvatar::DefinitionName); - av.setAvatar(selected); - curr.saveDetail(&av); - contacts.replace(currentIndex, curr); - - QPixmap avatarPix; - if (avatarPix.load(selected)){ - avatarPixmapLabel->setPixmap(avatarPix.scaled(avatarPixmapLabel->size())); - }else{ - qWarning() << "Unable to load avatar" << selected; - qWarning() << "Supported image formats are " << supportedImageFormats << " ;" << QImageReader::supportedImageFormats(); - avatarPixmapLabel->clear(); - } - } - } - - void PhoneBook::addContact() - { - if (addingContact) - saveContact(); - - QMessageBox msgBox(QMessageBox::Question, tr("Add Contact or Group"), tr("Add Contact or Group"), QMessageBox::NoButton, this); - QAbstractButton *addContactButton = msgBox.addButton(tr("Add Contact"), QMessageBox::YesRole); - (void*)msgBox.addButton(tr("Add Group"), QMessageBox::NoRole); - (void)msgBox.exec(); - if(msgBox.clickedButton() == addContactButton){ - addingContact = true; - lastIndex = currentIndex; - currentIndex = contacts.size(); - contacts.append(QContact()); - displayContact(); - nameLine->setFocus(); - if (smallScreenSize){ - contactDetailsForm->showMaximized(); - if (contactDetailsForm->exec() == QDialog::Accepted) - saveContact(); - } - }else{ - <span class="comment">// Groups will be modified in QContactManager by dialog</span> - GroupEditDialog grpDialog(this, cm); - if (smallScreenSize) - grpDialog.showMaximized(); - (void)grpDialog.exec(); - } - } - - void PhoneBook::saveContact() - { - if (smallScreenSize && !(addingContact || editingContact)) - return; - - addingContact = false; - editingContact = false; - if (smallScreenSize){ - contactDetailsForm->accept(); - showMaximized(); - } - - QContact c = buildContact(); - c.setId(contacts.at(currentIndex).id()); - QContactAvatar av = contacts.at(currentIndex).detail(QContactAvatar::DefinitionName); - c.saveDetail(&av); - - if (!cm->saveContact(&c)) { - QString errorCode = "Unable to save the contact in the database; error code:" + QString::number(cm->error()); - QMessageBox::information(this, "Save Failed", errorCode); - return; - } - } - - void PhoneBook::updateButtons() - { - QString currentState = "Unsaved"; - if (!contacts.count() || (contacts.at(currentIndex).id() == QContactId())) { - addButton->setEnabled(true); - findButton->setEnabled(false); - exportButton->setEnabled(false); - removeButton->setEnabled(false); - saveButton->setEnabled(addingContact || editingContact); - if(openButton) - openButton->setEnabled(false); - if (!smallScreenSize){ - nameLine->setEnabled(addingContact); - emailLine->setEnabled(addingContact); - homePhoneLine->setEnabled(addingContact); - workPhoneLine->setEnabled(addingContact); - mobilePhoneLine->setEnabled(addingContact); - addressText->setEnabled(addingContact); - avatarButton->setEnabled(addingContact); - } - } else { - addButton->setEnabled(!(addingContact || editingContact)); - findButton->setEnabled(true); - exportButton->setEnabled(true); - removeButton->setEnabled(true); - saveButton->setEnabled((mainForm == detailsForm) || addingContact || editingContact); - if(openButton) - openButton->setEnabled(true); - if (!smallScreenSize){ - nameLine->setEnabled(true); - emailLine->setEnabled(true); - homePhoneLine->setEnabled(true); - workPhoneLine->setEnabled(true); - mobilePhoneLine->setEnabled(true); - addressText->setEnabled(true); - avatarButton->setEnabled(true); - } - currentState = "Saved"; - } - importButton->setEnabled(!(addingContact || editingContact)); - - <span class="comment">// update the UI depending on the current state.</span> - int contactNumber = (contacts.isEmpty() ? 0 : currentIndex + 1); - QString currentIndexLabelString = tr("Contact %1 of %2 (%3)").arg(contactNumber).arg(contacts.size()).arg(currentState); - currentIndexLabel->setText(currentIndexLabelString); - } - - void PhoneBook::removeContact() - { - if (currentIndex < 0) - return; - QContact current = contacts.at(currentIndex); - QContactDisplayLabel cdl = current.detail(QContactDisplayLabel::DefinitionName); - QString contactName = cdl.label(); - int button = QMessageBox::question(this, - tr("Confirm Remove"), - tr("Are you sure you want to remove \"%1\"?").arg(contactName), - QMessageBox::Yes | QMessageBox::No); - - if (button == QMessageBox::Yes) { - cm->removeContact(contacts.at(currentIndex).id().localId()); - QMessageBox::information(this, tr("Remove Successful"), - tr("\"%1\" has been removed from your phone book.").arg(contactName)); - } - updateButtons(); } - void PhoneBook::next() + void PhoneBook::activateEditor(QContactLocalId contactId) { - <span class="comment">// we should display the next contact</span> - currentIndex += 1; - displayContact(); + m_editorPage->setCurrentContact(m_manager, contactId); + m_stackedWidget->setCurrentIndex(1); <span class="comment">// list = 0, editor = 1, find = 2.</span> } - void PhoneBook::previous() + void PhoneBook::activateList(const QContactFilter& filter) { - <span class="comment">// first, check to see if the current index is saved.</span> - <span class="comment">// if not, we delete it.</span> - if (contacts.at(currentIndex).id() == QContactId()) { - contacts.removeAt(currentIndex); - } - - <span class="comment">// we should display the previous contact</span> - currentIndex -= 1; - displayContact(); - } - - void PhoneBook::findContact() - { - - dialog = new FindDialog(this); - - if (smallScreenSize) - dialog->showMaximized(); - - if (dialog->exec() == QDialog::Accepted) { - bool found = false; - if (dialog->isSimpleFilterEnabled()){ - QString contactName = dialog->getFindText(); - <span class="comment">// XXX TODO: use QContactManager::contactsWithDetail</span> - for (int i = 0; i < contacts.size(); i++) { - QContact current = contacts.at(i); - QContactDisplayLabel cdl = current.detail(QContactDisplayLabel::DefinitionName); - if (cdl.label() == contactName) { - contactsList->setCurrentRow(i); - contactSelected(i); - found = true; - break; - } - } - if (!found) { - QMessageBox::information(this, tr("Contact Not Found"), - tr("Sorry, \"%1\" is not in your address book.").arg(contactName)); - } - }else{ - QList<QContactLocalId> matchedContacts = cm->contacts(dialog->getFindFilter()); - if (matchedContacts.count()){ - QStringList matchedContactNames; - QContact matchedContact; - contactsList->clearSelection(); - <span class="comment">// find the names of contacts that match</span> - for (int index = 0; index < matchedContacts.count(); index++){ - matchedContact = cm->contact(matchedContacts[index]); - if (!matchedContact.isEmpty()) - matchedContactNames.append("\"" + matchedContact.displayLabel() + "\""); - } - QMessageBox::information(this, tr("Contact(s) Found"), tr("Matched contact(s): %1").arg(matchedContactNames.join(","))); - }else{ - QMessageBox::information(this, tr("Contact not Found"), tr("No contacts in your addressbook match filter")); - } - } - } - delete dialog; - dialog = 0; - if (smallScreenSize) - showMaximized(); + m_currentFilter = filter; + activateList(); <span class="comment">// call base now.</span> } - void PhoneBook::openContact() + void PhoneBook::activateList() { - editingContact = true; - displayContact(); - if (smallScreenSize){ - nameLine->setFocus(); - if (contactDetailsForm->exec() == QDialog::Accepted) - saveContact(); - }else{ - detailsForm->show(); - } + m_listPage->rebuildList(m_currentFilter); + m_stackedWidget->setCurrentIndex(0); <span class="comment">// list = 0, editor = 1, find = 2.</span> } - void PhoneBook::cancelContact() + void PhoneBook::activateFind() { - if (smallScreenSize && !(addingContact || editingContact)) - return; - - addingContact = false; - editingContact = false; - if (smallScreenSize){ - contactDetailsForm->reject(); - showMaximized(); - } - currentIndex = lastIndex; - updateButtons(); + m_stackedWidget->setCurrentIndex(2); <span class="comment">// list = 0, editor = 1, find = 2.</span> } - void PhoneBook::importFromVCard() + void PhoneBook::managerChanged(QContactManager *manager) { - QString importFile = QFileDialog::getOpenFileName(this, "Select vCard file to import", ".", "*.vcf"); - if (importFile.isNull()) - return; - - <span class="comment">// import the vcard</span> - QContact importedContact; - - <span class="comment">// read in the file that we are importing</span> - QFile file(importFile); - if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) { - QMessageBox::information(this, tr("Import Failed"), - tr("Sorry, unable to import \"%1\".").arg(importFile)); - return; - } - - QTextStream in(&file); - QStringList vcardLines; - while (!in.atEnd()) { - vcardLines << in.readLine(); - } - - if (vcardLines.isEmpty()) { - QMessageBox::information(this, tr("Import Failed"), - tr("Sorry, unable to import \"%1\".").arg(importFile)); - return; - } - file.close(); - - <span class="comment">// convert it to a contact - probably need to write function to check that it's a valid vcard...</span> - importedContact = Serialiser::convertVcard(vcardLines); - - <span class="comment">// if the current contact is newly added (and not saved), we overwrite it</span> - cm->saveContact(&importedContact); - } - - void PhoneBook::exportAsVCard() - { - <span class="comment">// convert the display name to a meaningful file name</span> - QString newName = QFileDialog::getSaveFileName(this, "Export contact as...", ".", "*.vcf"); - if (newName.isNull()) { - <span class="comment">// they clicked cancel.</span> - return; - } - if (!newName.endsWith(".vcf")) { - newName += ".vcf"; - } - - QContact currentContact; - if (currentIndex >= contacts.size()) - currentContact = buildContact(); - else - currentContact = contacts.at(currentIndex); - QStringList vcardLines = Serialiser::convertContact(currentContact); - - QFile file(newName); - QContact current = contacts.at(currentIndex); - QContactDisplayLabel cdl = current.detail(QContactDisplayLabel::DefinitionName); - if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) { - QMessageBox::information(this, tr("Unable to export"), - tr("Unable to export contact \"%1\"!").arg(cdl.label())); - return; - } - - QTextStream out(&file); - foreach (const QString& line, vcardLines) - out << line << "\n"; - file.close(); - - QMessageBox::information(this, tr("Contact Exported"), - tr("Successfully exported contact \"%1\" as \"%2\"!").arg(cdl.label()).arg(newName)); - } - - void PhoneBook::editGroupDetails() - { - QContact c = buildContact(); - c.setId(contacts.value(currentIndex).id()); - GroupDetailsDialog dlg(detailsForm, cm, c); - if (smallScreenSize) - dlg.showMaximized(); - - if (dlg.exec() == QDialog::Accepted) - contactGroups = dlg.groups(); - - if (currentIndex < contacts.size()) - contacts.replace(currentIndex, c); + m_manager = manager; + m_editorPage->setCurrentContact(m_manager, 0); <span class="comment">// must reset the manager of the editor.</span> }</pre> <p /><address><hr /><div align="center"> <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/samplephonebook-phonebook-h.html b/doc/html/samplephonebook-phonebook-h.html index df827187d3..afc3ca8059 100644 --- a/doc/html/samplephonebook-phonebook-h.html +++ b/doc/html/samplephonebook-phonebook-h.html @@ -57,23 +57,24 @@ #ifndef PHONEBOOK_H #define PHONEBOOK_H - #include "finddialog.h" #include "qtcontacts.h" #include <QWidget> #include <QMap> #include <QPlainTextEdit> + class QStackedWidget; class QListWidget; class QPushButton; class QComboBox; class QLabel; class QLineEdit; - class QTextEdit; - class ContactDetailsForm; - class MainDialogForm640By480; - class MainDialogForm240By320; + class ContactListPage; + class ContactEditor; + class FilterPage; + + QTM_USE_NAMESPACE class PhoneBook : public QWidget { @@ -84,82 +85,32 @@ ~PhoneBook(); public slots: - void addContact(); - void saveContact(); - void removeContact(); - void findContact(); - void openContact(); - void cancelContact(); - void editGroupDetails(); - void next(); - void previous(); - void importFromVCard(); - void exportAsVCard(); - void selectAvatar(); - void contactSelected(int row); + void activateEditor(QContactLocalId contactId); + void activateList(const QContactFilter& filter); + void activateList(); + void activateFind(); - private slots: - void backendChanged(const QList<QContactLocalId>& changed); - void backendSelected(const QString& backend); + void managerChanged(QContactManager *manager); private: - QContact buildContact() const; - QContactName buildName(const QString &name) const; - void displayContact(); - void updateButtons(); - bool eventFilter(QObject* watched, QEvent* event); - void populateList(const QContact& currentContact); - - QListWidget *contactsList; - - QPushButton *addButton; - QPushButton *saveButton; - QPushButton *cancelButton; - QPushButton *removeButton; - QPushButton *findButton; - QPushButton *openButton; - QPushButton *importButton; - QPushButton *exportButton; - QPushButton *quitButton; - QPushButton *groupsButton; - QLabel *currentIndexLabel; - QLabel *currentBackendLabel; - QLabel *avatarPixmapLabel; - - QComboBox *backendCombo; - - QLineEdit *nameLine; - QPushButton *avatarButton; - QLineEdit *emailLine; - QLineEdit *homePhoneLine; - QLineEdit *workPhoneLine; - QLineEdit *mobilePhoneLine; - QPlainTextEdit *addressText; - - FindDialog *dialog; + <span class="comment">// the stacked widget which will display the pages</span> + QStackedWidget *m_stackedWidget; - int currentIndex; - int lastIndex; - bool addingContact; - bool editingContact; - bool smallScreenSize; - QList<QContact> contacts; - QList<QContactLocalId> contactGroups; + <span class="comment">// pages</span> + ContactListPage *m_listPage; + ContactEditor *m_editorPage; + FilterPage *m_filterPage; - QMap<QString, QContactManager*> managers; - QContactManager *cm; - ContactDetailsForm *contactDetailsForm; - MainDialogForm640By480 *mainDialogForm640By480; - MainDialogForm240By320 *mainDialogForm240By320; - QWidget *mainForm; - QWidget *detailsForm; + <span class="comment">// data</span> + QContactManager *m_manager; + QContactFilter m_currentFilter; }; - #endif <span class="comment">//PHONEBOOK_H</span></pre> + #endif <span class="comment">// PHONEBOOK_H</span></pre> <p /><address><hr /><div align="center"> <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/samplephonebook-samplephonebook-pro.html b/doc/html/samplephonebook-samplephonebook-pro.html index 86d36e3f9b..1bdc8610a3 100644 --- a/doc/html/samplephonebook-samplephonebook-pro.html +++ b/doc/html/samplephonebook-samplephonebook-pro.html @@ -28,35 +28,19 @@ ../../src/contacts/requests \ ../../src/contacts/details - INCLUDEPATH += ../testmodel - VPATH += ../testmodel - - qtAddLibrary(QtContacts) + CONFIG += mobility + MOBILITY = contacts # Input - SOURCES = contactdetailsform.cpp \ - maindialogform_240_320.cpp \ - maindialogform_640_480.cpp \ - phonebook.cpp \ - serialiser.cpp \ - groupeditdialog.cpp \ - groupdetailsdialog.cpp \ - main.cpp \ - finddialog.cpp - - HEADERS = contactdetailsform.h \ - maindialogform_240_320.h \ - maindialogform_640_480.h \ - phonebook.h \ - serialiser.h \ - finddialog.h \ - ../incomingcalls/filterdialog.h \ - groupeditdialog.h \ - groupdetailsdialog.h - - FORMS += contactdetails_240_320.ui \ - maindialog_240_320.ui \ - maindialog_640_480.ui + SOURCES += main.cpp \ + phonebook.cpp \ + contacteditor.cpp \ + contactlistpage.cpp \ + filterpage.cpp + HEADERS += phonebook.h \ + contacteditor.h \ + contactlistpage.h \ + filterpage.h symbian: { TARGET.CAPABILITY = ReadUserData \ @@ -66,12 +50,11 @@ AllFiles \ SwEvent } - include(../examples.pri) - qtAddLibrary(QtContacts)</pre> + include(../examples.pri)</pre> <p /><address><hr /><div align="center"> <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/samplephonebook-serialiser-cpp.html b/doc/html/samplephonebook-serialiser-cpp.html deleted file mode 100644 index eeca450783..0000000000 --- a/doc/html/samplephonebook-serialiser-cpp.html +++ /dev/null @@ -1,845 +0,0 @@ -<?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE html - PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> -<head> - <title>Qt Mobility Project 1.0: serialiser.cpp Example File (samplephonebook/serialiser.cpp)</title> - <link href="classic.css" rel="stylesheet" type="text/css" /> -</head> -<body> -<table border="0" cellpadding="0" cellspacing="0" width="100%"> -<tr> -<td align="left" valign="top" width="32"><a href="http://qt.nokia.com/"><img src="images/qtlogo.png" align="left" border="0" /></a></td> -<td width="1"> </td><td class="postheader" valign="center"><a href="index.html"><font color="#004faf">Home</font></a> · <a href="classes.html"><font color="#004faf">All Classes</font></a> · <a href="functions.html"><font color="#004faf">All Functions</font></a> ·</td> -<td align="right" valign="top" width="230"><img src="images/codeless.png" border="0" /></td></tr></table><h1 class="title">serialiser.cpp Example File<br /><span class="small-subtitle">samplephonebook/serialiser.cpp</span> -</h1> -<pre><span class="comment"> /**************************************************************************** - ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). - ** All rights reserved. - ** Contact: Nokia Corporation (qt-info@nokia.com) - ** - ** This file is part of the Qt Mobility Components. - ** - ** $QT_BEGIN_LICENSE:LGPL$ - ** No Commercial Usage - ** This file contains pre-release code and may not be distributed. - ** You may use this file in accordance with the terms and conditions - ** contained in the Technology Preview License Agreement accompanying - ** this package. - ** - ** GNU Lesser General Public License Usage - ** Alternatively, this file may be used under the terms of the GNU Lesser - ** General Public License version 2.1 as published by the Free Software - ** Foundation and appearing in the file LICENSE.LGPL included in the - ** packaging of this file. Please review the following information to - ** ensure the GNU Lesser General Public License version 2.1 requirements - ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. - ** - ** In addition, as a special exception, Nokia gives you certain additional - ** rights. These rights are described in the Nokia Qt LGPL Exception - ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. - ** - ** If you have questions regarding the use of this file, please contact - ** Nokia at qt-info@nokia.com. - ** - ** - ** - ** - ** - ** - ** - ** - ** $QT_END_LICENSE$ - ** - ****************************************************************************/</span> - - #include "serialiser.h" - #include <QUuid> - - QString Serialiser::escaped(const QString& input) - { - QString retn = ""; - for (int i = 0; i < input.length(); i++) { - QChar currChar = input.at(i); - if (currChar == '\\' || - currChar == '=' || - currChar == ',' || - currChar == ';' || - currChar == ':') { - <span class="comment">// we need to escape this character.</span> - retn += '\\'; <span class="comment">// escape with a single backslash.</span> - } - retn += currChar; - } - - return retn; - } - - QString Serialiser::convertDetail(const QContact& contact, const QContactDetail& detail, const QString& vcardField) - { - <span class="comment">// the format of the converted detail will be:</span> - <span class="comment">// X-com-nokia-mobility-contacts-vcard-detail-UUID;vcardField;definitionName;key=value,key=value;preferredFor=actionId,actionId</span> - <span class="comment">// where each of the elements are escaped strings.</span> - QString retn = "X-com-nokia-mobility-contacts-vcard-detail-"; - retn += escaped(QUuid::createUuid().toString()); - retn += ":"; - retn += escaped(vcardField); - retn += ";"; - retn += escaped(detail.definitionName()); - retn += ";"; - - QVariantMap vals = detail.values(); - foreach (const QString& key, vals.keys()) { - retn += escaped(key); - retn += "="; - retn += escaped(vals.value(key).toString()); - retn += ","; - } - retn.chop(1); - retn += ";"; - - retn += "preferredFor="; - foreach(const QContactActionDescriptor& actionDescr, contact.availableActions(QString())) { - if (contact.isPreferredDetail(actionDescr.actionName(), detail)) { - retn += escaped(actionDescr.actionName()) + ","; - } - } - - if (retn.endsWith(",")) - retn.chop(1); - - return retn; - } - - QStringList Serialiser::findActionIdsFromCustomString(const QString& customString) - { - QString pref = "preferredFor="; - int startPos = customString.indexOf(pref) + pref.length(); - if (startPos <= pref.length() || startPos >= customString.length()) - return QStringList(); - - QStringList retn; - QString currentActionId = ""; - for (int i = startPos; i < customString.length(); i++) { - QChar currChar = customString.at(i); - if (currChar == '\\') { - i += 1; - currentActionId += customString.at(i); - } else if (currChar == ',') { - if (currentActionId.length() > 0) { - retn << currentActionId; - } - - currentActionId = ""; - } - } - - if (currentActionId.length() > 0) - retn << currentActionId; - - return retn; - } - - QString Serialiser::findLinkStringFromCustomString(const QString& customString) - { - <span class="comment">// check to see if the custom detail was put there by us.</span> - if (customString.indexOf("X-com-nokia-mobility-contacts-vcard-detail-") != 0) { - return QString(); <span class="comment">// no link.</span> - } - - <span class="comment">// parse the detail. In this implementation, we ignore the linked vcard field.</span> - int sectionCount = 0; - QString linkString = ""; - for (int i = 0; i < customString.length(); i++) { - QChar currChar = customString.at(i); - - <span class="comment">// the second section is the link string. grab it.</span> - if (sectionCount > 0) { - if (currChar == '\\') { - linkString += customString.at(i+1); - } else { - linkString += currChar; - } - } - - if (currChar == ';' || currChar == ':') { - <span class="comment">// check to see whether we've finished copying the link string.</span> - sectionCount += 1; - if (sectionCount == 2) { - linkString.chop(1); <span class="comment">// chop off the trailing ';'</span> - return linkString; - } - } else if (currChar == '\\') { - <span class="comment">// skip the escaped character.</span> - i += 1; - } - } - - return QString(); <span class="comment">// no link.</span> - } - - QContactDetail Serialiser::convertCustomString(const QString& customString) - { - int nextSection = 0; - int oldNextSection = 0; - - <span class="comment">// check to see if the custom detail was put there by us.</span> - if (customString.indexOf("X-com-nokia-mobility-contacts-vcard-detail-") != 0) { - return QContactDetail(); - } - - <span class="comment">// parse the detail. In this implementation, we ignore the linked vcard field.</span> - int sectionCount = 0; - for (int i = nextSection; i < customString.length(); i++) { - QChar currChar = customString.at(i); - if (currChar == ';' || currChar == ':') { - <span class="comment">// check to see whether we've finished skipping past the unused sections.</span> - sectionCount += 1; - if (sectionCount == 2) { - nextSection = i + 1; - break; - } - } else if (currChar == '\\') { - <span class="comment">// skip the escaped character.</span> - i += 1; - } - } - - <span class="comment">// then, we parse the definitionName from the string.</span> - QString definitionName = ""; - for (int i = nextSection; i < customString.length(); i++) { - QChar currChar = customString.at(i); - if (currChar == ';') { - nextSection = i + 1; - break; - } else if (currChar == '\\') { - <span class="comment">// the next character is escaped.</span> - i += 1; - } - definitionName += customString.at(i); - } - - <span class="comment">// check to see whether this custom string was built by us</span> - if (nextSection == oldNextSection) { - <span class="comment">// nope; just return an empty detail.</span> - return QContactDetail(); - } - - <span class="comment">// then, we parse the values.</span> - QVariantMap values; - QString currKey = ""; - QString currVal = ""; - for (int i = nextSection; i < customString.length(); i++) { - QChar currChar = customString.at(i); - if (currChar == ';') { - <span class="comment">// finished with the key/value pairs.</span> - nextSection = i+1; - break; - } else if (currChar == '=') { - <span class="comment">// we have found the key. now find the value</span> - for (int j = i + 1; j < customString.length(); j++) { - currChar = customString.at(j); - if (currChar == ',') { - <span class="comment">// finished with this key/value pair</span> - i = j; - break; - } else if (currChar == ';') { - <span class="comment">// finished with all key/value pairs.</span> - i = j - 1; <span class="comment">// we want to see this char next time around.</span> - break; - } else if (currChar == '\\') { - j += 1; - currVal += customString.at(j); - } else { - currVal += currChar; - } - } - - <span class="comment">// and insert it into the map</span> - values.insert(currKey, currVal); - currKey = ""; - currVal = ""; - } else if (currChar == ',') { - <span class="comment">// finished with this key/value pair.</span> - <span class="comment">// this should have been handled in the above case...</span> - currKey = ""; - currVal = ""; - } else if (currChar == '\\') { - <span class="comment">// an escaped character in the key</span> - i += 1; - currKey += customString.at(i); - } else { - <span class="comment">// a normal character in the key.</span> - currKey += currChar; - } - } - - <span class="comment">// check to see whether this custom string was built by us</span> - if (nextSection == oldNextSection) { - <span class="comment">// nope; just return an empty detail.</span> - return QContactDetail(); - } - - <span class="comment">// we parse the attributes.</span> - QMap<QString, QString> attrs; - currKey = ""; - QString currAttr = ""; - for (int i = nextSection; i < customString.length(); i++) { - QChar currChar = customString.at(i); - if (currChar == ';') { - <span class="comment">// finished with the key/value pairs.</span> - nextSection = i+1; - break; - } else if (currChar == '=') { - <span class="comment">// we have found the key. now find the value</span> - for (int j = i + 1; j < customString.length(); j++) { - currChar = customString.at(j); - if (currChar == ',') { - <span class="comment">// finished with this key/value pair</span> - i = j; - break; - } else if (currChar == ';') { - <span class="comment">// finished with all key/value pairs.</span> - i = j - 1; <span class="comment">// we want to see this char next time around.</span> - break; - } else if (currChar == '\\') { - j += 1; - currAttr += customString.at(j); - } else { - currAttr += currChar; - } - } - - <span class="comment">// and insert it into the map</span> - values.insert(currKey, currAttr); - currKey = ""; - currAttr = ""; - } else if (currChar == ',') { - <span class="comment">// finished with this key/value pair.</span> - <span class="comment">// this should have been handled in the above case...</span> - currKey = ""; - currVal = ""; - } else if (currChar == '\\') { - <span class="comment">// an escaped character in the key</span> - i += 1; - currKey += customString.at(i); - } else { - <span class="comment">// a normal character in the key.</span> - currKey += currChar; - } - } - - <span class="comment">// check to see whether this custom string was built by us</span> - if (nextSection == oldNextSection) { - <span class="comment">// nope; just return an empty detail.</span> - return QContactDetail(); - } - - <span class="comment">// having parsed the definitionName, values, attributes, and preferences we build the detail.</span> - QContactDetail retn(definitionName); - QStringList keys = values.keys(); - foreach (const QString& key, keys) - retn.setValue(key, values.value(key)); - return retn; - } - - QContact Serialiser::convertVcard(const QStringList& vcardLines) - { - QMultiMap<QString, QContactDetail> vcardDetails; <span class="comment">// details built from vcard-supported fields</span> - QMultiMap<QString, QContactDetail> customDetails; <span class="comment">// details built from x-custom fields which are linked to vcardDetails</span> - QList<QContactDetail> unlinkedCustomDetails; <span class="comment">// details built from x-custom fields</span> - - QMap<QString, QContactDetail> customPreferredForUuid; <span class="comment">// map of detail uuid to detail which has some associated preference information.</span> - QMap<QString, QStringList> customPreferredFor; <span class="comment">// map of detail uuid to list of actionds for which the detail is preferred.</span> - QList<QContactDetail> vcardPreferredFor; <span class="comment">// list of details build from vcard-supported fields which had the pref flag set.</span> - - QContact retn; - QStringList strippedVcardLines = removeClutter(vcardLines); - foreach (const QString& line, strippedVcardLines) { - if (line.startsWith("X-com-nokia-mobility-contacts-vcard-detail-")) { - QContactDetail det = convertCustomString(line); - if (!det.isEmpty()) { - <span class="comment">// the line was a custom detail that we saved.</span> - QString linkString = findLinkStringFromCustomString(line); - if (linkString.isEmpty()) { - unlinkedCustomDetails.append(det); - } else { - customDetails.insert(linkString, det); - } - - QString detailUuid = QUuid::createUuid().toString(); - customPreferredForUuid.insert(detailUuid, det); - customPreferredFor.insert(detailUuid, findActionIdsFromCustomString(line)); - } - } else { - QContactDetail det = parsePropertyType(line); - QString defId = det.definitionName(); - if (defId.isEmpty()) { - <span class="comment">// this must be another program's custom field. ignore it.</span> - } else { - <span class="comment">// this is a built-in vcard supported field. build the detail.</span> - QStringList contexts = parseContext(line); - if (!contexts.isEmpty()) - det.setContexts(contexts); - if (defId == QContactPhoneNumber::DefinitionName) { - det.setValue(QContactPhoneNumber::FieldSubTypes, parseAttributes(line)); - det.setValue(QContactPhoneNumber::FieldNumber, parseValue(line)); - vcardDetails.insert("TEL", det); - } else if (defId == QContactEmailAddress::DefinitionName) { - det.setValue(QContactEmailAddress::FieldEmailAddress, parseValue(line)); - vcardDetails.insert("EMAIL", det); - } else if (defId == "Url") { - det.setValue(QContactUrl::FieldSubType, parseAttributes(line)); - det.setValue(QContactUrl::DefinitionName, parseValue(line)); - vcardDetails.insert("URL", det); - } else if (defId == QContactAvatar::DefinitionName) { - det.setValue(QContactAvatar::FieldSubType, parseAttributes(line)); - det.setValue(QContactAvatar::FieldAvatar, parseValue(line)); - vcardDetails.insert("PHOTO", det); - } else if (defId == QContactGuid::DefinitionName) { - det.setValue(QContactGuid::FieldGuid, parseValue(line)); - vcardDetails.insert("UID", det); - } else if (defId == QContactAddress::DefinitionName) { - det.setValue(QContactAddress::FieldSubTypes, parseAttributes(line)); - QStringList fieldValues = parseValue(line).split(";"); - <span class="comment">// ignore values 0 and 1 (extended and postal address) in this implementation</span> - det.setValue(QContactAddress::FieldStreet, fieldValues.value(2)); - det.setValue(QContactAddress::FieldLocality, fieldValues.value(3)); - det.setValue(QContactAddress::FieldRegion, fieldValues.value(4)); - det.setValue(QContactAddress::FieldPostcode, fieldValues.value(5)); - det.setValue(QContactAddress::FieldCountry, fieldValues.value(6)); - vcardDetails.insert("ADR", det); - } else if (defId == QContactName::DefinitionName) { - QStringList fieldValues = parseValue(line).split(";"); - if (vcardDetails.contains("N")) { - <span class="comment">// modify the existing name</span> - QContactDetail currName = vcardDetails.value("N"); - currName.setValue(QContactName::FieldPrefix, fieldValues.value(3)); - currName.setValue(QContactName::FieldFirst, fieldValues.value(1)); - currName.setValue(QContactName::FieldMiddle, fieldValues.value(2)); - currName.setValue(QContactName::FieldLast, fieldValues.value(0)); - currName.setValue(QContactName::FieldSuffix, fieldValues.value(4)); - vcardDetails.replace("N", currName); - } else { - <span class="comment">// create a new name if no existing name stored.</span> - det.setValue(QContactName::FieldPrefix, fieldValues.value(3)); - det.setValue(QContactName::FieldFirst, fieldValues.value(1)); - det.setValue(QContactName::FieldMiddle, fieldValues.value(2)); - det.setValue(QContactName::FieldLast, fieldValues.value(0)); - det.setValue(QContactName::FieldSuffix, fieldValues.value(4)); - vcardDetails.insert("N", det); - } - } else { - <span class="comment">// we don't know how to map this value type. Ignore the line.</span> - continue; - } - - if (parsePreferred(line)) { - vcardPreferredFor.append(det); - } - } - } - } - - <span class="comment">// at this stage, we have built two sets of details</span> - <span class="comment">// the first set is built from our custom lines, which contain all the information</span> - <span class="comment">// the second set is built from the vcard-builtin lines.</span> - <span class="comment">// we now want to reconcile the two sets by throwing out any custom-set details</span> - <span class="comment">// which are not related to any built-in line but should be.</span> - foreach (const QString& linkString, customDetails.keys()) { - foreach (const QContactDetail& linkedDetail, customDetails.values(linkString)) { - bool found = false; - QContactDetail toRemove; - foreach (const QContactDetail& vcardDetail, vcardDetails.values(linkString)) { - if (linkedDetail.values() == vcardDetail.values()) { - toRemove = vcardDetail; - found = true; - break; - } - } - - if (!found) { - <span class="comment">// this supposedly linked detail has no corresponding vcard detail.</span> - <span class="comment">// it is an orphan. ignore it.</span> - } else { - <span class="comment">// remove the vcard detail from the map</span>! - vcardDetails.remove(linkString, toRemove); - vcardPreferredFor.removeOne(toRemove); - - <span class="comment">// save the more verbose (ie, built from custom string) detail.</span> - toRemove = linkedDetail; <span class="comment">// copy so we can call non-const function.</span> - retn.saveDetail(&toRemove); - } - } - } - - <span class="comment">// any details which are left in the vcardDetails map should be included</span> - foreach (const QContactDetail& det, vcardDetails.values()) { - QContactDetail temp = det; - retn.saveDetail(&temp); - } - - <span class="comment">// as should any unlinked custom details.</span> - foreach (const QContactDetail& det, unlinkedCustomDetails) { - QContactDetail temp = det; - retn.saveDetail(&temp); - } - - <span class="comment">// now set any preferences found in the vcard should be set</span> - <span class="comment">//foreach (const QContactDetail& det, vcardPreferredFor) {</span> - <span class="comment">// there is no granularity here; hence, we assume that if any detail is listed as preferred,</span> - <span class="comment">// then it is the preferred detail for every action available to it.</span> - - <span class="comment">// new:</span> - <span class="comment">//foreach (QContactAbstractAction* impl, QContactAbstractAction::implementations()) {</span> - <span class="comment">// foreach (const QString& actionId, impl->actionsForDetail(det)) {</span> - <span class="comment">// retn.setPreferredDetail(actionId, det);</span> - <span class="comment">// }</span> - <span class="comment">//}</span> - - <span class="comment">// old:</span> - <span class="comment">//foreach (const QString& actionId, QContactManager::availableActions(det.definitionName())) {</span> - <span class="comment">// retn.setPreferredDetail(actionId, det);</span> - <span class="comment">//}</span> - <span class="comment">//}</span> - - <span class="comment">// and now we set any preferences saved in the custom strings</span> - foreach (const QString& detailUuid, customPreferredForUuid.keys()) { - QContactDetail det = customPreferredForUuid.value(detailUuid); - foreach (const QStringList& actionIds, customPreferredFor.values(detailUuid)) { - foreach (const QString& actionId, actionIds) { - retn.setPreferredDetail(actionId, det); - } - } - } - - return retn; - } - - QStringList Serialiser::removeClutter(const QStringList& vcard) - { - QStringList copy; - - foreach (QString line, vcard) { - QString firstBit = line.split(":", QString::SkipEmptyParts).value(0); - if (firstBit == "BEGIN" || firstBit == "VERSION" || firstBit == "CLASS" || firstBit == "PRODID" || firstBit == "REV" || firstBit == "END") { - <span class="comment">// ignore this line.</span> - } else { - copy.append(line); - } - } - - return copy; - } - - QContactDetail Serialiser::parsePropertyType(const QString& line) - { - <span class="comment">// depending on the line signature, return a QContact<PropertyType> object.</span> - QStringList semiColonSplit = line.split(";"); - QStringList colonSplit = line.split(":"); - if (semiColonSplit.size() == 0 && colonSplit.size() == 0) - return QContactDetail(); - - if (semiColonSplit.size() != 0) { - if (semiColonSplit.at(0) == "TEL") { - return QContactPhoneNumber(); - } else if (semiColonSplit.at(0) == "EMAIL") { - return QContactEmailAddress(); - } else if (semiColonSplit.at(0) == "ADR") { - return QContactAddress(); - } else if (semiColonSplit.at(0) == "PHOTO") { - return QContactAvatar(); - } else if (semiColonSplit.at(0) == "UID") { - return QContactGuid(); - } - } - - <span class="comment">// ok, so we have dealt with the cases where a semi colon proceeds the first token.</span> - <span class="comment">// Now we must deal with the fields where the first token is proceeded by a colon.</span> - if (colonSplit.size() != 0) { - if (colonSplit.at(0) == "URL") { - return QContactDetail("Url"); - } else if (colonSplit.at(0) == "N") { - QContactName name; - return name; - } else if (colonSplit.at(0) == "FN") { - QContactDisplayLabel label; - return label; - } - } - - <span class="comment">// otherwise, it's an unknown or custom field.</span> - return QContactDetail(); - } - - QStringList Serialiser::parseContext(const QString& line) - { - <span class="comment">// depending on the TYPE= section, return a context (work/home/...)</span> - <span class="comment">// returns the first one found.</span> - QStringList result; - QStringList contexts; - contexts << QContactDetail::ContextHome << QContactDetail::ContextWork << QContactDetail::ContextOther; - QStringList semiColonSplit = line.split(";"); - for (int i = 0; i < semiColonSplit.size(); i++) { - QString currSplit = semiColonSplit.at(i); - if (currSplit.startsWith("TYPE=")) { - for (int j = 0; j < contexts.size(); j++) { - QString currContext = contexts.at(j); - if (currSplit.contains(currContext.toLower()) && !result.contains(currContext)) { - result.append(currContext); - return result; - } - } - } - } - - return result; - } - - QString Serialiser::parseValue(const QString& line) - { - <span class="comment">// return the settable value of this field</span> - QStringList colonSplit = line.split(":"); - if (colonSplit.size() != 2) { - return QString(); - } - - return colonSplit.at(1); - } - - QString Serialiser::parseAttributes(const QString& line) - { - <span class="comment">// return any special attributes of this field</span> - QString result = ""; - QStringList contexts; - contexts << QContactDetail::ContextHome << QContactDetail::ContextWork << QContactDetail::ContextOther; - QStringList semiColonSplit = line.split(";"); - for (int i = 0; i < semiColonSplit.size(); i++) { - QString currSplit = semiColonSplit.at(i); - if (currSplit.startsWith("TYPE=")) { - <span class="comment">// get rid of the TYPE= preamble, then remove any Contexts/Pref</span> - QString possibleAttrs = currSplit.remove(0,5); - int startIndex = -1; - - <span class="comment">// firstly, remove pref if it exists.</span> - startIndex = possibleAttrs.indexOf("pref"); - if (startIndex != -1) - possibleAttrs = possibleAttrs.remove(startIndex, 4); - - <span class="comment">// then, remove any contexts</span> - for (int j = 0; j < contexts.size(); j++) { - startIndex = possibleAttrs.indexOf(contexts.at(j).toLower()); - if (startIndex != -1) { - possibleAttrs = possibleAttrs.remove(startIndex, contexts.at(j).length()); - } - } - - <span class="comment">// finally, remove any value</span> - startIndex = possibleAttrs.indexOf(":"); - if (startIndex != -1) { - possibleAttrs = possibleAttrs.left(startIndex); - } - - <span class="comment">// now we should be left with just attributes, separated by ",".</span> - QStringList attributes = possibleAttrs.split(",", QString::SkipEmptyParts); - foreach (QString attribute, attributes) { - <span class="comment">// special cases: deal with the vcard TYPE attributes that don't</span> - <span class="comment">// map directly to our QContactDetail SubType attributes.</span> - if (attribute == "cell") { - result += "Mobile,"; - } else if (attribute == "fax") { - result += "Facsimile,"; - } else if (attribute == "msg") { - result += "Messaging,"; - } else if (attribute == "dom") { - result += "Domestic,"; - } else if (attribute == "intl") { - result += "International,"; - } else { - QString firstLetter = ""; - firstLetter += attribute.at(0); - firstLetter = firstLetter.toUpper(); - QString rest = attribute.remove(0,1); - result += firstLetter + rest + ","; - } - } - - <span class="comment">// remove the trailing `,'</span> - result.chop(1); - } - } - - return result; - } - - bool Serialiser::parsePreferred(const QString& line) - { - <span class="comment">// return whether this field is preferred</span> - QStringList semiColonSplit = line.split(";"); - for (int i = 0; i < semiColonSplit.size(); i++) { - QString currSplit = semiColonSplit.at(i); - if (currSplit.startsWith("TYPE=")) { - if (currSplit.contains("pref")) { - return true; - } - } - } - - return false; - } - - bool Serialiser::detailIsPreferredForAnything(const QContact& contact, const QContactDetail& detail) - { - foreach (const QContactActionDescriptor& actionDescr, contact.availableActions(QString())) { - if (contact.isPreferredDetail(actionDescr.actionName(), detail)) { - return true; - } - } - - return false; - } - - QStringList Serialiser::convertContact(const QContact& contact) - { - QStringList vcard; - QContact c = contact; - - QDateTime curr = QDateTime::currentDateTime(); - QString entry = "REV:" + curr.toString("yyyy-MM-dd hh:mm:ss"); - vcard << "BEGIN:VCARD" << "VERSION:3.0" << "CLASS:PUBLIC" << "PRODID:-<span class="comment">//qcontactvcardserializer from Nokia.com//NONSGML Version 1//EN" << entry;</span> - - QStringList customVcardFields; - - QStringList vcardFieldsWithValues; - foreach (const QContactDetail& det, contact.details()) { - <span class="comment">// we look at each detail of the contact</span> - <span class="comment">// if the detail can be mapped to a non-singular vcard field, we create the vcard entry and the custom entry</span> - <span class="comment">// if the detail can be mapped to a singular vcard field, we check to see that another detail which also</span> - <span class="comment">// maps to the same vcard field hasn't been saved as the vcard entry before doing the above.</span> - QString definitionName = det.definitionName(); - if (definitionName == QContactName::DefinitionName) { - bool saved = false; - - <span class="comment">// only one name is allowed</span> - if (!vcardFieldsWithValues.contains("N")) { - entry = "N:" + det.value(QContactName::FieldLast) + ";" + det.value(QContactName::FieldFirst) + ";" + det.value(QContactName::FieldMiddle) + ";" + det.value(QContactName::FieldPrefix) + det.value(QContactName::FieldSuffix); - vcardFieldsWithValues << "N"; - vcard << entry; - customVcardFields << convertDetail(contact, det, "N"); - saved = true; - } - - <span class="comment">// if not already saved, save as a generic custom field.</span> - if (!saved) { - customVcardFields << convertDetail(contact, det); - } - } else if (definitionName == QContactDisplayLabel::DefinitionName) { - <span class="comment">// only one formatted name is allowed</span> - if (!vcardFieldsWithValues.contains("FN")) { - entry = "FN:" + det.value(QContactDisplayLabel::FieldLabel); - vcard << entry; - vcardFieldsWithValues << "FN"; - customVcardFields << convertDetail(contact, det, "FN"); - } - } else if (definitionName == QContactAddress::DefinitionName) { - <span class="comment">// any number of address fields are allowed.</span> - entry = "ADR;TYPE="; - QString typestr = ""; - QStringList subTypes = det.value<QStringList>(QContactAddress::FieldSubTypes); - QStringList contexts = det.contexts(); - if (contexts.contains(QContactDetail::ContextHome)) typestr += "home,"; - if (contexts.contains(QContactDetail::ContextWork)) typestr += "work,"; - if (contexts.contains(QContactDetail::ContextOther)) typestr += "other,"; - if (subTypes.contains(QContactAddress::SubTypeDomestic)) typestr += "dom,"; - if (subTypes.contains(QContactAddress::SubTypeInternational)) typestr += "intl,"; - if (subTypes.contains(QContactAddress::SubTypeParcel)) typestr += "parcel,"; - if (subTypes.contains(QContactAddress::SubTypePostal)) typestr += "postal,"; - if (detailIsPreferredForAnything(contact, det)) typestr += "pref,"; - typestr.chop(1); - entry += typestr + ":;;" + det.value(QContactAddress::FieldStreet) + ";" + det.value(QContactAddress::FieldLocality) + ";" + det.value(QContactAddress::FieldRegion) + ";" + det.value(QContactAddress::FieldPostcode) + ";" + det.value(QContactAddress::FieldCountry); - vcard << entry; - <span class="comment">//entry = "LABEL;TYPE=" + typestr + ":" + det.value(QContactAddress::FieldDisplayLabel);</span> - <span class="comment">//vcard << entry;</span> - vcardFieldsWithValues << "ADR"; - vcardFieldsWithValues << "LABEL"; - customVcardFields << convertDetail(contact, det, "ADR"); - } else if (definitionName == "Url") { - <span class="comment">// any number of Url fields are allowed.</span> - entry = "URL:" + det.value("Url"); - vcard << entry; - vcardFieldsWithValues << "URL"; - customVcardFields << convertDetail(contact, det, "URL"); - } else if (definitionName == QContactEmailAddress::DefinitionName) { - <span class="comment">// any number of email address fields are allowed.</span> - entry = "EMAIL;TYPE=internet"; - if (detailIsPreferredForAnything(contact, det)) entry += ",pref"; - entry += ":" + det.value(QContactEmailAddress::FieldEmailAddress); - vcard << entry; - vcardFieldsWithValues << "EMAIL"; - customVcardFields << convertDetail(contact, det, "EMAIL"); - } else if (definitionName == QContactPhoneNumber::DefinitionName) { - <span class="comment">// any number of telephone fields are allowed.</span> - entry = "TEL;TYPE="; - QString typeStr = ""; - QStringList subTypes = det.value<QStringList>(QContactPhoneNumber::FieldSubTypes); - QStringList contexts = det.contexts(); - if (subTypes.contains(QContactPhoneNumber::SubTypeMobile)) typeStr += "cell,"; - if (subTypes.contains(QContactPhoneNumber::SubTypeFacsimile)) typeStr += "fax,"; - if (subTypes.contains(QContactPhoneNumber::SubTypeVideo)) typeStr += "video,"; - if (subTypes.contains(QContactPhoneNumber::SubTypePager)) typeStr += "pager,"; - if (subTypes.contains(QContactPhoneNumber::SubTypeModem)) typeStr += "modem,"; - if (subTypes.contains(QContactPhoneNumber::SubTypeBulletinBoardSystem)) typeStr += "bbs,"; - if (subTypes.contains(QContactPhoneNumber::SubTypeMessagingCapable)) typeStr += "msg,"; - if (subTypes.contains(QContactPhoneNumber::SubTypeLandline) || typeStr.isEmpty()) typeStr += "voice,"; - if (contexts.contains(QContactDetail::ContextHome)) typeStr = "home," + typeStr; - if (contexts.contains(QContactDetail::ContextWork)) typeStr = "work," + typeStr; - if (contexts.contains(QContactDetail::ContextOther)) typeStr = "other," + typeStr; - if (detailIsPreferredForAnything(contact, det)) typeStr += "pref,"; - typeStr.chop(1); - entry += typeStr + ":" + det.value(QContactPhoneNumber::FieldNumber); - vcard << entry; - vcardFieldsWithValues << "TEL"; - customVcardFields << convertDetail(contact, det, "TEL"); - } else if (definitionName == QContactAvatar::DefinitionName) { - <span class="comment">// only one photo field is allowed per vcard, according to the spec</span> - if (vcardFieldsWithValues.contains("PHOTO")) { - <span class="comment">// vcard already contains a photo field; save this one as a custom field only.</span> - customVcardFields << convertDetail(contact, det); - } else { - <span class="comment">// vcard does not yet contain a photo field; save this as the photo field.</span> - vcardFieldsWithValues << "PHOTO"; - entry = "PHOTO;VALUE=uri:" + det.value(QContactAvatar::FieldAvatar); - customVcardFields << convertDetail(contact, det, "PHOTO"); - } - } else if (definitionName == QContactGuid::DefinitionName) { - <span class="comment">// only one UID field is allowed per vcard, according to the spec</span> - if (vcardFieldsWithValues.contains("UID")) { - <span class="comment">// vcard already contains a photo field; save this one as a custom field only.</span> - customVcardFields << convertDetail(contact, det); - } else { - <span class="comment">// vcard does not yet contain a UID field; save this as the UID field.</span> - vcardFieldsWithValues << "UID"; - entry = "UID:" + det.value(QContactGuid::FieldGuid); - customVcardFields << convertDetail(contact, det, "UID"); - } - } else { - <span class="comment">// there is no vcard field mapping for this detail;</span> - <span class="comment">// so, simply save it as a custom field.</span> - customVcardFields << convertDetail(contact, det); <span class="comment">// doesn't map to any vcard field</span> - } - } - - <span class="comment">// now append our custom vcard fields and end the vcard.</span> - vcard << customVcardFields; - vcard << "END:VCARD"; - - return vcard; - }</pre> -<p /><address><hr /><div align="center"> -<table width="100%" cellspacing="0" border="0"><tr class="address"> -<td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> -<td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> -</tr></table></div></address></body> -</html> diff --git a/doc/html/samplephonebook-serialiser-h.html b/doc/html/samplephonebook-serialiser-h.html deleted file mode 100644 index e38febfef7..0000000000 --- a/doc/html/samplephonebook-serialiser-h.html +++ /dev/null @@ -1,95 +0,0 @@ -<?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE html - PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> -<head> - <title>Qt Mobility Project 1.0: serialiser.h Example File (samplephonebook/serialiser.h)</title> - <link href="classic.css" rel="stylesheet" type="text/css" /> -</head> -<body> -<table border="0" cellpadding="0" cellspacing="0" width="100%"> -<tr> -<td align="left" valign="top" width="32"><a href="http://qt.nokia.com/"><img src="images/qtlogo.png" align="left" border="0" /></a></td> -<td width="1"> </td><td class="postheader" valign="center"><a href="index.html"><font color="#004faf">Home</font></a> · <a href="classes.html"><font color="#004faf">All Classes</font></a> · <a href="functions.html"><font color="#004faf">All Functions</font></a> ·</td> -<td align="right" valign="top" width="230"><img src="images/codeless.png" border="0" /></td></tr></table><h1 class="title">serialiser.h Example File<br /><span class="small-subtitle">samplephonebook/serialiser.h</span> -</h1> -<pre><span class="comment"> /**************************************************************************** - ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). - ** All rights reserved. - ** Contact: Nokia Corporation (qt-info@nokia.com) - ** - ** This file is part of the Qt Mobility Components. - ** - ** $QT_BEGIN_LICENSE:LGPL$ - ** No Commercial Usage - ** This file contains pre-release code and may not be distributed. - ** You may use this file in accordance with the terms and conditions - ** contained in the Technology Preview License Agreement accompanying - ** this package. - ** - ** GNU Lesser General Public License Usage - ** Alternatively, this file may be used under the terms of the GNU Lesser - ** General Public License version 2.1 as published by the Free Software - ** Foundation and appearing in the file LICENSE.LGPL included in the - ** packaging of this file. Please review the following information to - ** ensure the GNU Lesser General Public License version 2.1 requirements - ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. - ** - ** In addition, as a special exception, Nokia gives you certain additional - ** rights. These rights are described in the Nokia Qt LGPL Exception - ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. - ** - ** If you have questions regarding the use of this file, please contact - ** Nokia at qt-info@nokia.com. - ** - ** - ** - ** - ** - ** - ** - ** - ** $QT_END_LICENSE$ - ** - ****************************************************************************/</span> - - #ifndef SERIALISER_H - #define SERIALISER_H - - #include "qtcontacts.h" - - #include <QString> - #include <QStringList> - - QTM_USE_NAMESPACE - - class Serialiser - { - public: - static QStringList convertContact(const QContact& contact); - static QContact convertVcard(const QStringList& vcardLines); - - private: - static QString escaped(const QString& input); - static QString convertDetail(const QContact& contact, const QContactDetail& detail, const QString& vcardField = QString()); - static QStringList findActionIdsFromCustomString(const QString& customString); - static QString findLinkStringFromCustomString(const QString& customString); - static QContactDetail convertCustomString(const QString& customString); - static QStringList removeClutter(const QStringList& vcard); - static QContactDetail parsePropertyType(const QString& line); - static QStringList parseContext(const QString& line); - static QString parseValue(const QString& line); - static QString parseAttributes(const QString& line); - static bool parsePreferred(const QString& line); - static bool detailIsPreferredForAnything(const QContact& contact, const QContactDetail& detail); - }; - - #endif</pre> -<p /><address><hr /><div align="center"> -<table width="100%" cellspacing="0" border="0"><tr class="address"> -<td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> -<td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> -</tr></table></div></address></body> -</html> diff --git a/doc/html/samplephonebook.html b/doc/html/samplephonebook.html index 2680b87cc0..5f309eedc7 100644 --- a/doc/html/samplephonebook.html +++ b/doc/html/samplephonebook.html @@ -16,22 +16,14 @@ </h1> <p>Files:</p> <ul> -<li><a href="samplephonebook-contactdetailsform-cpp.html">samplephonebook/contactdetailsform.cpp</a></li> -<li><a href="samplephonebook-contactdetailsform-h.html">samplephonebook/contactdetailsform.h</a></li> -<li><a href="samplephonebook-finddialog-cpp.html">samplephonebook/finddialog.cpp</a></li> -<li><a href="samplephonebook-finddialog-h.html">samplephonebook/finddialog.h</a></li> -<li><a href="samplephonebook-groupdetailsdialog-cpp.html">samplephonebook/groupdetailsdialog.cpp</a></li> -<li><a href="samplephonebook-groupdetailsdialog-h.html">samplephonebook/groupdetailsdialog.h</a></li> -<li><a href="samplephonebook-groupeditdialog-cpp.html">samplephonebook/groupeditdialog.cpp</a></li> -<li><a href="samplephonebook-groupeditdialog-h.html">samplephonebook/groupeditdialog.h</a></li> -<li><a href="samplephonebook-maindialogform-240-320-cpp.html">samplephonebook/maindialogform_240_320.cpp</a></li> -<li><a href="samplephonebook-maindialogform-240-320-h.html">samplephonebook/maindialogform_240_320.h</a></li> -<li><a href="samplephonebook-maindialogform-640-480-cpp.html">samplephonebook/maindialogform_640_480.cpp</a></li> -<li><a href="samplephonebook-maindialogform-640-480-h.html">samplephonebook/maindialogform_640_480.h</a></li> +<li><a href="samplephonebook-contacteditor-cpp.html">samplephonebook/contacteditor.cpp</a></li> +<li><a href="samplephonebook-contacteditor-h.html">samplephonebook/contacteditor.h</a></li> +<li><a href="samplephonebook-contactlistpage-cpp.html">samplephonebook/contactlistpage.cpp</a></li> +<li><a href="samplephonebook-contactlistpage-h.html">samplephonebook/contactlistpage.h</a></li> +<li><a href="samplephonebook-filterpage-cpp.html">samplephonebook/filterpage.cpp</a></li> +<li><a href="samplephonebook-filterpage-h.html">samplephonebook/filterpage.h</a></li> <li><a href="samplephonebook-phonebook-cpp.html">samplephonebook/phonebook.cpp</a></li> <li><a href="samplephonebook-phonebook-h.html">samplephonebook/phonebook.h</a></li> -<li><a href="samplephonebook-serialiser-cpp.html">samplephonebook/serialiser.cpp</a></li> -<li><a href="samplephonebook-serialiser-h.html">samplephonebook/serialiser.h</a></li> <li><a href="samplephonebook-main-cpp.html">samplephonebook/main.cpp</a></li> <li><a href="samplephonebook-samplephonebook-pro.html">samplephonebook/samplephonebook.pro</a></li> </ul> @@ -69,6 +61,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/service-framework-on-symbian.html b/doc/html/service-framework-on-symbian.html index ad717435e9..544c4eb58d 100644 --- a/doc/html/service-framework-on-symbian.html +++ b/doc/html/service-framework-on-symbian.html @@ -16,21 +16,29 @@ </h1> <a name="how-to-register-and-unregister-service-plugins-in-s60"></a> <h2>How to register and unregister service plugins in S60?</h2> -<p>Registration phase is a little different compared to other platforms because of the authenticity of the provider is done during (un)registering phase based on the verification of VID/SID (vendor ID or secure ID). A tiny installer application must be implemented by the service provider. Installer application handles registering (and unregistering) of the service. Minimalistic example code for the installer is shown below. The full example of the installer can be found under <tt>examples/serviceinstaller_sfw_symbian</tt>.</p> -<pre> int main(int argc, char *argv[]) +<p>Registration phase is a little different compared to other platforms because of the authenticity of the provider is done during (un)registering phase based on the verification of VID/SID (vendor ID or secure ID). A tiny installer application must be implemented by the service provider. Installer application is responsible for the registering (and the unregistering) of the service. The example code for the installer is shown below. The whole installer project can be found under <tt>examples/serviceinstaller_sfw_symbian</tt>.</p> +<pre> const QString filemanagerxml = "c:\\resource\\apps\\xmldata\\filemanagerservice.xml"; + const QString bluetoothxml = "c:\\resource\\apps\\xmldata\\bluetoothtransferservice.xml"; + + int main(int argc, char *argv[]) { QCoreApplication app(argc, argv); QServiceManager s; - s.addService("c:\\private\\E00b7e42\\xmldata\\filemanagerservice.xml"); - s.addService("c:\\private\\E00b7e42\\xmldata\\bluetoothtransferservice.xml"); - return app.exec(); + if (QFile::exists(filemanagerxml)) { + s.addService(filemanagerxml); + } else { + s.removeService("FileManagerService"); + } + + if (QFile::exists(bluetoothxml)) { + s.addService(bluetoothxml); + } else { + s.removeService("BluetoothTransferService"); + } }</pre> -<p>The package file must be updated a little to run the installer on installation. Add FR and RB keywords to the end of the line which deploys installer.exe to device as follow:</p> -<pre> "/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/release/$(PLATFORM)/$(TARGET)/exampleinstaller.exe" - "!:\sys\bin\exampleinstaller.exe",FR,RB</pre> -<p>Those keywords defines that the installer application is run and the service is registered during the installation.</p> -<p>See more about the package file options: <a href="http://wiki.forum.nokia.com/index.php/Advanced_Package_File_Options">http://wiki.forum.nokia.com/index.php/Advanced_Package_File_Options</a></p> +<p>If you want to create your own installer take a copy from the installer project (<tt>examples/serviceinstaller_sfw_symbian</tt>) and modify only the necessary parts e.g a target for your installer and define plugins which are deployed etc.</p> <p>If the installer defines the VID (non-zero value) then the VID is stored to the database, otherwise SID is used. When unregistering the plugin the VID/SID verification is done to ensure that only the application which actually registered the service is only allowed to remove it. VID/SID is left to the database even the service has been unregistered. This prevents the exactly same way named services to be installed afterwards because the VID/SID information is locked to the service name.</p> <p>More info about VID and SID can be found from:</p> <ul> @@ -40,7 +48,7 @@ <a name="what-s-special-from-the-security-perspective"></a> <h2>What's special from the security perspective?</h2> <p>There is only one database in S60 because both databases (user and system) are combined to the same database. The database is located behind the server's private folder, (<tt>c:\private\2002AC7F</tt>). This ensures the database can't be thumbered (e.g. remove, move or replace) without Allfiles capability which isn't user-grantable (More about the capabilities: <a href="http://wiki.forum.nokia.com/index.php/Capabilities">http://wiki.forum.nokia.com/index.php/Capabilities</a>). That makes it impossible for example to replace the whole database with the new one which might contain malicious services.</p> -<p>Note! It doesn't matter which one scope is used in Symbian because both are mapped to the same database anyway.</p> +<p>Note! It doesn't matter which scope is used on Symbian as <a href="qservicemanager.html#Scope-enum">QServiceManager::UserScope</a> and <a href="qservicemanager.html#Scope-enum">QServiceManager::SystemScope</a> are mapped to the same database.</p> <a name="directory-structure"></a> <h2>Directory structure</h2> <p>There are different implementations for the both emulator and device because emulator doesn't support multiple applications to be loaded at the same time, (Known issue: <a href="http://bugreports.qt.nokia.com/browse/QTBUG-2950">QTBUG-2950</a>). The dll approach must be used in the emulator environment and the exe approach instead of dll in the real device.</p> @@ -49,6 +57,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/service-frameworks.html b/doc/html/service-frameworks.html index 6490a1e257..35adba4c25 100644 --- a/doc/html/service-frameworks.html +++ b/doc/html/service-frameworks.html @@ -204,6 +204,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/serviceactions-attachmentlistwidget-cpp.html b/doc/html/serviceactions-attachmentlistwidget-cpp.html index 97bb50f5ed..42ecb6b8b1 100644 --- a/doc/html/serviceactions-attachmentlistwidget-cpp.html +++ b/doc/html/serviceactions-attachmentlistwidget-cpp.html @@ -530,6 +530,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/serviceactions-attachmentlistwidget-h.html b/doc/html/serviceactions-attachmentlistwidget-h.html index ad85718bfd..ab094b18c0 100644 --- a/doc/html/serviceactions-attachmentlistwidget-h.html +++ b/doc/html/serviceactions-attachmentlistwidget-h.html @@ -106,6 +106,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/serviceactions-main-cpp.html b/doc/html/serviceactions-main-cpp.html index 0418d4817e..471e236a8d 100644 --- a/doc/html/serviceactions-main-cpp.html +++ b/doc/html/serviceactions-main-cpp.html @@ -77,6 +77,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/serviceactions-mainwindow-cpp.html b/doc/html/serviceactions-mainwindow-cpp.html index b0a96a2e6b..9a5ed9a237 100644 --- a/doc/html/serviceactions-mainwindow-cpp.html +++ b/doc/html/serviceactions-mainwindow-cpp.html @@ -1355,6 +1355,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/serviceactions-mainwindow-h.html b/doc/html/serviceactions-mainwindow-h.html index dc5c301af2..61ac42c733 100644 --- a/doc/html/serviceactions-mainwindow-h.html +++ b/doc/html/serviceactions-mainwindow-h.html @@ -95,6 +95,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/serviceactions-serviceactions-pro.html b/doc/html/serviceactions-serviceactions-pro.html index 24ea526402..5bbf78efb4 100644 --- a/doc/html/serviceactions-serviceactions-pro.html +++ b/doc/html/serviceactions-serviceactions-pro.html @@ -20,7 +20,8 @@ include(../examples.pri) - qtAddLibrary(QtMessaging) + CONFIG += mobility + MOBILITY = messaging INCLUDEPATH += ../../src/messaging symbian|win32 { @@ -49,6 +50,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/serviceactions.html b/doc/html/serviceactions.html index 465b626999..abeeec513e 100644 --- a/doc/html/serviceactions.html +++ b/doc/html/serviceactions.html @@ -254,6 +254,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/servicebrowser-main-cpp.html b/doc/html/servicebrowser-main-cpp.html index c749be5dd6..5fedce6bb4 100644 --- a/doc/html/servicebrowser-main-cpp.html +++ b/doc/html/servicebrowser-main-cpp.html @@ -69,6 +69,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/servicebrowser-servicebrowser-cpp.html b/doc/html/servicebrowser-servicebrowser-cpp.html index e4e4a6fadf..afbfd7bc7c 100644 --- a/doc/html/servicebrowser-servicebrowser-cpp.html +++ b/doc/html/servicebrowser-servicebrowser-cpp.html @@ -313,6 +313,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/servicebrowser-servicebrowser-h.html b/doc/html/servicebrowser-servicebrowser-h.html index f122376249..80bc2ce7ac 100644 --- a/doc/html/servicebrowser-servicebrowser-h.html +++ b/doc/html/servicebrowser-servicebrowser-h.html @@ -116,6 +116,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/servicebrowser-servicebrowser-pro.html b/doc/html/servicebrowser-servicebrowser-pro.html index 4f4e415eb8..cbf3635be8 100644 --- a/doc/html/servicebrowser-servicebrowser-pro.html +++ b/doc/html/servicebrowser-servicebrowser-pro.html @@ -26,7 +26,8 @@ SOURCES += servicebrowser.cpp \ main.cpp - qtAddLibrary(QtServiceFramework) + CONFIG += mobility + MOBILITY = serviceframework symbian { addFiles.sources = ../filemanagerplugin/filemanagerservice.xml @@ -40,6 +41,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/servicebrowser.html b/doc/html/servicebrowser.html index 5a362c8410..64523f4425 100644 --- a/doc/html/servicebrowser.html +++ b/doc/html/servicebrowser.html @@ -184,6 +184,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/servicefw.html b/doc/html/servicefw.html index 2b4532b5ed..ef88b5e51a 100644 --- a/doc/html/servicefw.html +++ b/doc/html/servicefw.html @@ -27,6 +27,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/slideshow-main-cpp.html b/doc/html/slideshow-main-cpp.html index 7f375f9476..90fad205e2 100644 --- a/doc/html/slideshow-main-cpp.html +++ b/doc/html/slideshow-main-cpp.html @@ -71,6 +71,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/slideshow-slideshow-cpp.html b/doc/html/slideshow-slideshow-cpp.html index 682918fcfb..ff035a9a2e 100644 --- a/doc/html/slideshow-slideshow-cpp.html +++ b/doc/html/slideshow-slideshow-cpp.html @@ -221,6 +221,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/slideshow-slideshow-h.html b/doc/html/slideshow-slideshow-h.html index 6c804f99d9..cd7726dfbd 100644 --- a/doc/html/slideshow-slideshow-h.html +++ b/doc/html/slideshow-slideshow-h.html @@ -97,6 +97,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/slideshow-slideshow-pro.html b/doc/html/slideshow-slideshow-pro.html index b20f57abf0..3a4736affe 100644 --- a/doc/html/slideshow-slideshow-pro.html +++ b/doc/html/slideshow-slideshow-pro.html @@ -18,7 +18,8 @@ INCLUDEPATH+=../../src/multimedia include (../examples.pri) - qtAddLibrary(QtMedia) + CONFIG += mobility + MOBILITY = multimedia HEADERS = \ slideshow.h @@ -30,6 +31,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/slideshow.html b/doc/html/slideshow.html index 4b9037eef7..231ac71b9d 100644 --- a/doc/html/slideshow.html +++ b/doc/html/slideshow.html @@ -36,6 +36,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/streamplayer-main-cpp.html b/doc/html/streamplayer-main-cpp.html index 3b10c8abd6..bef87387b0 100644 --- a/doc/html/streamplayer-main-cpp.html +++ b/doc/html/streamplayer-main-cpp.html @@ -79,6 +79,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/streamplayer-streamplayer-cpp.html b/doc/html/streamplayer-streamplayer-cpp.html index ac1a2114d3..f55d9d0e35 100644 --- a/doc/html/streamplayer-streamplayer-cpp.html +++ b/doc/html/streamplayer-streamplayer-cpp.html @@ -116,6 +116,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/streamplayer-streamplayer-h.html b/doc/html/streamplayer-streamplayer-h.html index 88d343f4c1..93ce299cbf 100644 --- a/doc/html/streamplayer-streamplayer-h.html +++ b/doc/html/streamplayer-streamplayer-h.html @@ -95,6 +95,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/streamplayer-streamplayer-pro.html b/doc/html/streamplayer-streamplayer-pro.html index f789112f1d..5d93782d42 100644 --- a/doc/html/streamplayer-streamplayer-pro.html +++ b/doc/html/streamplayer-streamplayer-pro.html @@ -19,7 +19,8 @@ INCLUDEPATH+=../../src/multimedia include (../examples.pri) - qtAddLibrary(QtMedia) + CONFIG += mobility + MOBILITY = multimedia HEADERS = \ streamplayer.h @@ -31,6 +32,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/streamplayer.html b/doc/html/streamplayer.html index e57f725a29..54330dc906 100644 --- a/doc/html/streamplayer.html +++ b/doc/html/streamplayer.html @@ -25,6 +25,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/sysinfo-dialog-cpp.html b/doc/html/sysinfo-dialog-cpp.html index 147164e668..82946013e3 100644 --- a/doc/html/sysinfo-dialog-cpp.html +++ b/doc/html/sysinfo-dialog-cpp.html @@ -55,25 +55,19 @@ ****************************************************************************/</span> #include "dialog.h" - #ifdef Q_OS_SYMBIAN - #include "ui_dialog_s60.h" - #else - #include "ui_dialog.h" - #endif #include <QMessageBox> #include <QTimer> Dialog::Dialog() : - QDialog(), - ui(new Ui::Dialog), + QWidget(), saver(NULL), systemInfo(NULL), di(NULL), ni(NULL) { - ui->setupUi(this); + setupUi(this); setupGeneral(); - connect(ui->tabWidget,SIGNAL(currentChanged(int)),this,SLOT(tabChanged(int))); - connect(ui->versionComboBox,SIGNAL(activated(int)), this,SLOT(getVersion(int))); - connect(ui->featureComboBox,SIGNAL(activated(int)), this,SLOT(getFeature(int))); + connect(tabWidget,SIGNAL(currentChanged(int)),this,SLOT(tabChanged(int))); + connect(versionComboBox,SIGNAL(activated(int)), this,SLOT(getVersion(int))); + connect(featureComboBox,SIGNAL(activated(int)), this,SLOT(getFeature(int))); QTimer *timer = new QTimer(this); connect(timer, SIGNAL(timeout()), this, SLOT(updateDeviceLockedState())); timer->start(1000); @@ -81,7 +75,6 @@ Dialog::~Dialog() { - delete ui; delete systemInfo; delete di; delete saver; @@ -92,7 +85,7 @@ QWidget::changeEvent(e); switch (e->type()) { case QEvent::LanguageChange: - ui->retranslateUi(this); + retranslateUi(this); break; default: break; @@ -165,17 +158,17 @@ { delete systemInfo; systemInfo = new QSystemInfo(this); - ui->curLanguageLineEdit->setText( systemInfo->currentLanguage()); - ui->languagesComboBox->clear(); - ui->languagesComboBox->insertItems(0,systemInfo->availableLanguages()); - ui->countryCodeLabel->setText(systemInfo->currentCountryCode()); + curLanguageLineEdit->setText( systemInfo->currentLanguage()); + languagesComboBox->clear(); + languagesComboBox->insertItems(0,systemInfo->availableLanguages()); + countryCodeLabel->setText(systemInfo->currentCountryCode()); } void Dialog::setupDevice() { delete di; di = new QSystemDeviceInfo(this); - ui->batteryLevelBar->setValue(di->batteryLevel()); + batteryLevelBar->setValue(di->batteryLevel()); connect(di,SIGNAL(batteryLevelChanged(int)), this,SLOT(updateBatteryStatus(int))); @@ -186,26 +179,26 @@ connect(di,SIGNAL(powerStateChanged(QSystemDeviceInfo::PowerState)), this,SLOT(updatePowerState(QSystemDeviceInfo::PowerState))); - ui->ImeiLabel->setText(di->imei()); - ui->imsiLabel->setText(di->imsi()); - ui->manufacturerLabel->setText(di->manufacturer()); - ui->modelLabel->setText(di->model()); - ui->productLabel->setText(di->productName()); + ImeiLabel->setText(di->imei()); + imsiLabel->setText(di->imsi()); + manufacturerLabel->setText(di->manufacturer()); + modelLabel->setText(di->model()); + productLabel->setText(di->productName()); - ui->deviceLockCheckBox->setChecked(di->isDeviceLocked()); + deviceLockCheckBox->setChecked(di->isDeviceLocked()); - ui->profileComboBox->setCurrentIndex(di->currentProfile()); + profileComboBox->setCurrentIndex(di->currentProfile()); connect(di, SIGNAL(currentProfileChanged(QSystemDeviceInfo::Profile)), this, SLOT(updateProfile(QSystemDeviceInfo::Profile))); if(di->currentPowerState() == QSystemDeviceInfo::BatteryPower) { - ui->radioButton_2->setChecked(true); + radioButton_2->setChecked(true); } else if(di->currentPowerState() == QSystemDeviceInfo::WallPower) { - ui->radioButton_3->setChecked(true); + radioButton_3->setChecked(true); } else if(di->currentPowerState() == QSystemDeviceInfo::WallPowerChargingBattery) { - ui->radioButton_4->setChecked(true); + radioButton_4->setChecked(true); } else { - ui->radioButton->setChecked(true); + radioButton->setChecked(true); } QSystemDeviceInfo::InputMethodFlags methods = di->inputMethodType(); @@ -229,33 +222,33 @@ inputs << "Mouse"; } - ui->inputMethodLabel->setText(inputs.join(" ")); + inputMethodLabel->setText(inputs.join(" ")); } void Dialog::updateDeviceLockedState() { if (di) - ui->deviceLockCheckBox->setChecked(di->isDeviceLocked()); + deviceLockCheckBox->setChecked(di->isDeviceLocked()); } void Dialog::updateProfile(QSystemDeviceInfo::Profile profile) { - ui->profileComboBox->setCurrentIndex(profile); + profileComboBox->setCurrentIndex(profile); } void Dialog::setupDisplay() { QSystemDisplayInfo di; - ui->brightnessLineEdit->setText(QString::number(di.displayBrightness(0))); - ui->colorDepthLineEdit->setText(QString::number(di.colorDepth((0)))); + brightnessLineEdit->setText(QString::number(di.displayBrightness(0))); + colorDepthLineEdit->setText(QString::number(di.colorDepth((0)))); } void Dialog::setupStorage() { QSystemStorageInfo mi; - ui->storageTreeWidget->clear(); - ui->storageTreeWidget->header()->setResizeMode(QHeaderView::ResizeToContents); + storageTreeWidget->clear(); + storageTreeWidget->header()->setResizeMode(QHeaderView::ResizeToContents); QStringList vols = mi.logicalDrives(); foreach(QString volName, vols) { @@ -281,7 +274,7 @@ items << QString::number(mi.totalDiskSpace(volName)); items << QString::number(mi.availableDiskSpace(volName)); QTreeWidgetItem *item = new QTreeWidgetItem(items); - ui->storageTreeWidget->addTopLevelItem(item); + storageTreeWidget->addTopLevelItem(item); } } @@ -290,7 +283,7 @@ delete ni; ni = new QSystemNetworkInfo(this); - connect(ui->netStatusComboBox,SIGNAL(activated(int)), + connect(netStatusComboBox,SIGNAL(activated(int)), this, SLOT(netStatusComboActivated(int))); connect(ni,SIGNAL(networkSignalStrengthChanged(QSystemNetworkInfo::NetworkMode, int)), @@ -302,13 +295,13 @@ connect(ni,SIGNAL(networkStatusChanged(QSystemNetworkInfo::NetworkMode,QSystemNetworkInfo::NetworkStatus)), this,SLOT(networkStatusChanged(QSystemNetworkInfo::NetworkMode,QSystemNetworkInfo::NetworkStatus))); - ui->cellIdLabel->setText(QString::number(ni->cellId())); - ui->locationAreaCodeLabel->setText(QString::number(ni->locationAreaCode())); - ui->currentMMCLabel->setText(ni->currentMobileCountryCode()); - ui->currentMNCLabel->setText(ni->currentMobileNetworkCode()); + cellIdLabel->setText(QString::number(ni->cellId())); + locationAreaCodeLabel->setText(QString::number(ni->locationAreaCode())); + currentMMCLabel->setText(ni->currentMobileCountryCode()); + currentMNCLabel->setText(ni->currentMobileNetworkCode()); - ui->homeMMCLabel->setText(ni->homeMobileCountryCode()); - ui->homeMNCLabel->setText(ni->homeMobileNetworkCode()); + homeMMCLabel->setText(ni->homeMobileCountryCode()); + homeMNCLabel->setText(ni->homeMobileNetworkCode()); } void Dialog::netStatusComboActivated(int index) { @@ -317,16 +310,16 @@ displayNetworkStatus(ni->networkStatus((QSystemNetworkInfo::NetworkMode)reIndex)); - ui->macAddressLabel->setText(ni->macAddress((QSystemNetworkInfo::NetworkMode)reIndex)); + macAddressLabel->setText(ni->macAddress((QSystemNetworkInfo::NetworkMode)reIndex)); int strength = ni->networkSignalStrength((QSystemNetworkInfo::NetworkMode)reIndex); if(strength < 0) strength = 0; - ui->signalLevelProgressBar->setValue(strength); + signalLevelProgressBar->setValue(strength); - ui->InterfaceLabel->setText(ni->interfaceForMode((QSystemNetworkInfo::NetworkMode)reIndex).humanReadableName()); + InterfaceLabel->setText(ni->interfaceForMode((QSystemNetworkInfo::NetworkMode)reIndex).humanReadableName()); - ui->operatorNameLabel->setText(ni->networkName((QSystemNetworkInfo::NetworkMode)reIndex)); + operatorNameLabel->setText(ni->networkName((QSystemNetworkInfo::NetworkMode)reIndex)); } void Dialog::getVersion(int index) @@ -345,7 +338,7 @@ }; QSystemInfo si; - ui->versionLineEdit->setText(si.version(version)); + versionLineEdit->setText(si.version(version)); } void Dialog::getFeature(int index) @@ -393,35 +386,35 @@ break; }; QSystemInfo si; - ui->featuresLineEdit->setText((si.hasFeatureSupported(feature) ? "true":"false" )); + featuresLineEdit->setText((si.hasFeatureSupported(feature) ? "true":"false" )); } <span class="comment"> //void Dialog::doVolumes(int /*index*/)</span> <span class="comment"> //{</span> <span class="comment"> // QSystemStorageInfo mi;</span> -<span class="comment"> // QString vol = ui->volumesComboBox->currentText();</span> -<span class="comment"> // int index2 = ui->diskComboBox->currentIndex();</span> +<span class="comment"> // QString vol = volumesComboBox->currentText();</span> +<span class="comment"> // int index2 = diskComboBox->currentIndex();</span> <span class="comment"> // switch(index2) {</span> <span class="comment"> // case 0:</span> <span class="comment"> // //total</span> -<span class="comment"> // ui->diskSpaceLineEdit->setText( QString::number(mi.totalDiskSpace(vol)));</span> +<span class="comment"> // diskSpaceLineEdit->setText( QString::number(mi.totalDiskSpace(vol)));</span> <span class="comment"> // break;</span> <span class="comment"> // case 1:</span> <span class="comment"> // //available</span> -<span class="comment"> // ui->diskSpaceLineEdit->setText( QString::number(mi.availableDiskSpace(vol)));</span> +<span class="comment"> // diskSpaceLineEdit->setText( QString::number(mi.availableDiskSpace(vol)));</span> <span class="comment"> // break;</span> <span class="comment"> // case 2:</span> <span class="comment"> // //type</span> <span class="comment"> // QSystemStorageInfo::VolumeType volType;</span> <span class="comment"> // volType = mi.getVolumeType(vol);</span> <span class="comment"> // if(volType == QSystemStorageInfo::Internal) {</span> -<span class="comment"> // ui->diskSpaceLineEdit->setText( "Internal");</span> +<span class="comment"> // diskSpaceLineEdit->setText( "Internal");</span> <span class="comment"> // } else</span> <span class="comment"> // if(volType == QSystemStorageInfo::Removable) {</span> -<span class="comment"> // ui->diskSpaceLineEdit->setText( "Removable");</span> +<span class="comment"> // diskSpaceLineEdit->setText( "Removable");</span> <span class="comment"> // }</span> <span class="comment"> // if(volType == QSystemStorageInfo::Cdrom) {</span> -<span class="comment"> // ui->diskSpaceLineEdit->setText( "Cdrom");</span> +<span class="comment"> // diskSpaceLineEdit->setText( "Cdrom");</span> <span class="comment"> // }</span> <span class="comment"> // break;</span> <span class="comment"> // };</span> @@ -436,10 +429,10 @@ bool saverEnabled = saver->screenSaverInhibited(); - connect( ui->saverInhibitedCheckBox, SIGNAL(clicked(bool)), + connect( saverInhibitedCheckBox, SIGNAL(clicked(bool)), this,SLOT(setSaverEnabled(bool))); - ui->saverInhibitedCheckBox->setChecked(saverEnabled); + saverInhibitedCheckBox->setChecked(saverEnabled); } void Dialog::setSaverEnabled(bool b) @@ -458,7 +451,7 @@ void Dialog::updateBatteryStatus(int level) { - ui->batteryLevelBar->setValue(level); + batteryLevelBar->setValue(level); } void Dialog::updatePowerState(QSystemDeviceInfo::PowerState newState) @@ -467,16 +460,16 @@ switch (newState) { case QSystemDeviceInfo::BatteryPower: { - ui->radioButton_2->setChecked(true); + radioButton_2->setChecked(true); } break; case QSystemDeviceInfo::WallPower: { - ui->radioButton_3->setChecked(true); + radioButton_3->setChecked(true); } break; case QSystemDeviceInfo::WallPowerChargingBattery: - ui->radioButton_4->setChecked(true); + radioButton_4->setChecked(true); break; }; } @@ -520,32 +513,32 @@ void Dialog::networkSignalStrengthChanged(QSystemNetworkInfo::NetworkMode mode , int strength) { if(mode == QSystemNetworkInfo::WlanMode) { - if(ui->netStatusComboBox->currentText() == "Wlan") { - ui->signalLevelProgressBar->setValue(strength); + if(netStatusComboBox->currentText() == "Wlan") { + signalLevelProgressBar->setValue(strength); } } if(mode == QSystemNetworkInfo::EthernetMode) { - if(ui->netStatusComboBox->currentText() == "Ethernet") { - ui->signalLevelProgressBar->setValue(strength); + if(netStatusComboBox->currentText() == "Ethernet") { + signalLevelProgressBar->setValue(strength); } } if(mode == QSystemNetworkInfo::GsmMode) { - if(ui->netStatusComboBox->currentText() == "Gsm") { - ui->signalLevelProgressBar->setValue(strength); + if(netStatusComboBox->currentText() == "Gsm") { + signalLevelProgressBar->setValue(strength); } } if(mode == QSystemNetworkInfo::CdmaMode) { - if(ui->netStatusComboBox->currentText() == "Cdma") { - ui->signalLevelProgressBar->setValue(strength); + if(netStatusComboBox->currentText() == "Cdma") { + signalLevelProgressBar->setValue(strength); } } if(mode == QSystemNetworkInfo::WcdmaMode) { - if(ui->netStatusComboBox->currentText() == "Wcdma") { - ui->signalLevelProgressBar->setValue(strength); + if(netStatusComboBox->currentText() == "Wcdma") { + signalLevelProgressBar->setValue(strength); } } @@ -554,32 +547,32 @@ void Dialog::networkNameChanged(QSystemNetworkInfo::NetworkMode mode,const QString &text) { if(mode == QSystemNetworkInfo::WlanMode) { - if(ui->netStatusComboBox->currentText() == "Wlan") { - ui->operatorNameLabel->setText(text); + if(netStatusComboBox->currentText() == "Wlan") { + operatorNameLabel->setText(text); } } if(mode == QSystemNetworkInfo::EthernetMode) { - if(ui->netStatusComboBox->currentText() == "Ethernet") { - ui->operatorNameLabel->setText(text); + if(netStatusComboBox->currentText() == "Ethernet") { + operatorNameLabel->setText(text); } } if(mode == QSystemNetworkInfo::GsmMode) { - if(ui->netStatusComboBox->currentText() == "Gsm") { - ui->operatorNameLabel->setText(text); + if(netStatusComboBox->currentText() == "Gsm") { + operatorNameLabel->setText(text); } } if(mode == QSystemNetworkInfo::CdmaMode) { - if(ui->netStatusComboBox->currentText() == "Cdma") { - ui->operatorNameLabel->setText(text); + if(netStatusComboBox->currentText() == "Cdma") { + operatorNameLabel->setText(text); } } if(mode == QSystemNetworkInfo::WcdmaMode) { - if(ui->netStatusComboBox->currentText() == "Wcdma") { - ui->operatorNameLabel->setText(text); + if(netStatusComboBox->currentText() == "Wcdma") { + operatorNameLabel->setText(text); } } @@ -588,31 +581,31 @@ void Dialog::networkStatusChanged(QSystemNetworkInfo::NetworkMode mode , QSystemNetworkInfo::NetworkStatus status) { if(mode == QSystemNetworkInfo::WlanMode) { - if(ui->netStatusComboBox->currentText() == "Wlan") { + if(netStatusComboBox->currentText() == "Wlan") { displayNetworkStatus(status); } } if(mode == QSystemNetworkInfo::EthernetMode) { - if(ui->netStatusComboBox->currentText() == "Ethernet") { + if(netStatusComboBox->currentText() == "Ethernet") { displayNetworkStatus(status); } } if(mode == QSystemNetworkInfo::GsmMode) { - if(ui->netStatusComboBox->currentText() == "Gsm") { + if(netStatusComboBox->currentText() == "Gsm") { displayNetworkStatus(status); } } if(mode == QSystemNetworkInfo::CdmaMode) { - if(ui->netStatusComboBox->currentText() == "Cdma") { + if(netStatusComboBox->currentText() == "Cdma") { displayNetworkStatus(status); } } if(mode == QSystemNetworkInfo::WcdmaMode) { - if(ui->netStatusComboBox->currentText() == "Wcdma") { + if(netStatusComboBox->currentText() == "Wcdma") { displayNetworkStatus(status); } } @@ -651,12 +644,12 @@ stat = "Roaming"; break; }; - ui->cellNetworkStatusLabel->setText(stat); + cellNetworkStatusLabel->setText(stat); }</pre> <p /><address><hr /><div align="center"> <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/sysinfo-dialog-h.html b/doc/html/sysinfo-dialog-h.html index af39e2bd5f..3ff1896285 100644 --- a/doc/html/sysinfo-dialog-h.html +++ b/doc/html/sysinfo-dialog-h.html @@ -57,16 +57,17 @@ #ifndef DIALOG_H #define DIALOG_H - #include <QDialog> + #include <QWidget> #include <qsysteminfo.h> - + #ifdef Q_OS_SYMBIAN + #include "ui_dialog_s60.h" + #else + #include "ui_dialog.h" + #endif QTM_USE_NAMESPACE - namespace Ui { - class Dialog; - } - - class Dialog : public QDialog { + class Dialog : public QWidget, public Ui_Dialog + { Q_OBJECT public: Dialog(); @@ -76,7 +77,6 @@ void changeEvent(QEvent *e); private: - Ui::Dialog *ui; void setupGeneral(); void setupDevice(); void setupDisplay(); @@ -114,6 +114,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/sysinfo-main-cpp.html b/doc/html/sysinfo-main-cpp.html index 3d1b760c47..71ab63f15b 100644 --- a/doc/html/sysinfo-main-cpp.html +++ b/doc/html/sysinfo-main-cpp.html @@ -74,6 +74,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/sysinfo-sysinfo-pro.html b/doc/html/sysinfo-sysinfo-pro.html index 5d950f4010..864b27bb60 100644 --- a/doc/html/sysinfo-sysinfo-pro.html +++ b/doc/html/sysinfo-sysinfo-pro.html @@ -26,7 +26,8 @@ INCLUDEPATH += ../../src/systeminfo include(../examples.pri) - qtAddLibrary(QtSystemInfo) + CONFIG += mobility + MOBILITY = systeminfo CONFIG += console @@ -53,6 +54,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/sysinfo.html b/doc/html/sysinfo.html index 54fb05ba20..c261301c54 100644 --- a/doc/html/sysinfo.html +++ b/doc/html/sysinfo.html @@ -25,6 +25,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/systeminfo.html b/doc/html/systeminfo.html index 6ad2e96e35..4b06b02155 100644 --- a/doc/html/systeminfo.html +++ b/doc/html/systeminfo.html @@ -92,6 +92,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/trademarks.html b/doc/html/trademarks.html index 99693e5151..c1069e8212 100644 --- a/doc/html/trademarks.html +++ b/doc/html/trademarks.html @@ -30,6 +30,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/versit.html b/doc/html/versit.html index 86791b3ca6..b69bc06ea5 100644 --- a/doc/html/versit.html +++ b/doc/html/versit.html @@ -166,6 +166,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/writemessage-main-cpp.html b/doc/html/writemessage-main-cpp.html index a5c7350656..8719ad6697 100644 --- a/doc/html/writemessage-main-cpp.html +++ b/doc/html/writemessage-main-cpp.html @@ -78,6 +78,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/writemessage-messagesender-cpp.html b/doc/html/writemessage-messagesender-cpp.html index 1316c77aba..a5cda7d91c 100644 --- a/doc/html/writemessage-messagesender-cpp.html +++ b/doc/html/writemessage-messagesender-cpp.html @@ -233,6 +233,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/writemessage-messagesender-h.html b/doc/html/writemessage-messagesender-h.html index 46094f1e26..03303c3bc2 100644 --- a/doc/html/writemessage-messagesender-h.html +++ b/doc/html/writemessage-messagesender-h.html @@ -102,6 +102,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/writemessage-writemessage-pro.html b/doc/html/writemessage-writemessage-pro.html index 904f5f1f20..35513a71bf 100644 --- a/doc/html/writemessage-writemessage-pro.html +++ b/doc/html/writemessage-writemessage-pro.html @@ -20,7 +20,8 @@ include(../examples.pri) - qtAddLibrary(QtMessaging) + CONFIG += mobility + MOBILITY = messaging INCLUDEPATH += ../../src/messaging symbian|win32 { @@ -47,6 +48,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/writemessage.html b/doc/html/writemessage.html index 4ea842768a..396f854237 100644 --- a/doc/html/writemessage.html +++ b/doc/html/writemessage.html @@ -25,6 +25,6 @@ <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> <td width="20%" align="center"><a href="trademarks.html">Trademarks</a></td> -<td align="right"><div align="right">Qt Mobility Project 1.0.0 (Technical Preview)</div></td> +<td align="right"><div align="right">Qt Mobility Project 1.0.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/src/contacts.qdoc b/doc/src/contacts.qdoc index 7d1b9a0999..84dbc727a9 100644 --- a/doc/src/contacts.qdoc +++ b/doc/src/contacts.qdoc @@ -327,6 +327,7 @@ serialization of a QContact into a vCard document, and vice versa. \list \o \l{samplephonebook}{Sample Phonebook} + \o \l{incomingcalls}{Incoming Call Simulator} \endlist */ diff --git a/doc/src/examples.qdoc b/doc/src/examples.qdoc index 352d7b5ebc..3eed9ca6ee 100644 --- a/doc/src/examples.qdoc +++ b/doc/src/examples.qdoc @@ -44,7 +44,7 @@ \title Qt Mobility Examples Qt Mobility comes with a variety of examples that cover the entire range of the Qt Mobility - APIs. + APIs. Note that some examples require Qt declarative which can by obtain via \l {http://qt.gitorious.org/qt}. \section2 Bearer Management @@ -57,7 +57,7 @@ \list \o \l{samplephonebook}{Sample Phonebook} - \o \l{incomingcalls}{Incoming Calls} + \o \l{incomingcalls}{Incoming Call Simulator} \endlist \section2 Location @@ -99,7 +99,7 @@ \list \o \l{bluetoothtransferplugin}{Bluetooth Transfer Plugin} - \o \l{declarative}{Declarative} + \o \l{declarative}{Qt Declarative based service framework example} \o \l{filemanagerplugin}{File Manager Plugin} \o \l{servicebrowser}{Service Browser}\raisedaster \endlist diff --git a/doc/src/examples/incomingcalls.qdoc b/doc/src/examples/incomingcalls.qdoc new file mode 100644 index 0000000000..af049bda85 --- /dev/null +++ b/doc/src/examples/incomingcalls.qdoc @@ -0,0 +1,73 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the Qt Mobility Components. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +** +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! + \example incomingcalls + \title Incoming Call Simulator + + \tableofcontents + + \section1 Incoming Calls + + This example shows how to access contact information asynchronously using the \l{Contacts}{Contacts API}. + It generates a large number of contacts automatically, saves them to an in-memory, anonymous contacts store, + and allows the user to view them in a model view. It then simulates incoming calls from random phone numbers, + and displays information about the contact calling if the random phone number matches a phone number of a + generated contact. + + \section2 Motivation + This application was written to provide an example to developers of how to use the Qt Contacts API. + It uses an asynchronous method to retrieve details of contacts on demand, and displays them in a model view. + It also provides an example of simple string matching on contact phone numbers to perform identification. + + \section2 Use Case + A real address book may contain hundreds or even thousands of contacts. Being able to load a small portion + of those contacts on-demand as required (for example, those visible in the UI currently, plus some cached), + as opposed to the entire dataset, is a vital requirement. + + \section2 Interface + The application is not very interactive. The only allowable user interaction is the ability to scroll around + the list of contacts, and to view the details of contacts from which a simulated phone call is coming. + + \section2 Known Issues + The example is not intended to be feature complete. Also, the example model view and result caching engine + performs superfluous asynchronous requests (i.e., for data already contained in the contact cache). +*/ diff --git a/doc/src/examples/quickstart.qdoc b/doc/src/examples/quickstart.qdoc index e8059515cb..b86aa48da5 100644 --- a/doc/src/examples/quickstart.qdoc +++ b/doc/src/examples/quickstart.qdoc @@ -66,6 +66,11 @@ system's current country code. All the domain APIs are wrapped within the \c QtMobility namespace and thus developers either need to declare \c {using namespace QtMobility} or qualify their symbols e.g. \c {QtMobility::QSystemInfo s}. +(\bold{Note}: If you are on the Symbian platform you will +need to define the actual header file, in this case +<qsysteminfo.h> rather than using the standard header form +<QSystemInfo>, this is a known bug that is to be +addressed in a future release) In step 3, to specify that our project is using System Information we declare in the project file: @@ -88,29 +93,32 @@ corresponding values that can be assigned to \o Domain \o Value \row - \o Bearer Mangement + \o \l {Bearer Management} \o bearer \row - \o Contacts + \o \l {Contacts} \o contacts \row - \o Location + \o \l {Location} \o location \row - \o Multimedia + \o \l {Multimedia} \o multimedia \row - \o Messaging + \o \l {Messaging} \o messaging \row - \o Publish And Subscribe + \o \l {Publish And Subscribe} \o publishsubscribe \row - \o Service Framework + \o \l {Qt Service Framework} {Service Framework} \o serviceframework \row - \o System Information + \o \l {System Information} \o systeminfo +\row + \o \l {Future Additional APIs}{Versit} + \o versit \endtable And we're done. If you are using the command line simply @@ -122,4 +130,24 @@ enter: to generate the executable which can then be run. +If you are developing for symbian, +to make a debug build for the emulator run: +\code + qmake + make debug-winscw +\endcode + + +To make a release build and SIS package for +a device run: +\code + qmake + make release-gcce + make sis +\endcode + +For further details on how to build applications for +symbian see \l {http://qt.nokia.com/doc/4.6/symbian-with-qt-introduction.html} +{The Symbian Platform - Introduction to Qt}, \l {http://developer.symbian.org/wiki/index.php/Qt_Quick_Start} +{Qt Quick Start} and the \c {symbian\install.txt} */ diff --git a/doc/src/examples/undocumented.qdoc b/doc/src/examples/undocumented.qdoc index 7d158ec182..c1d13168a5 100644 --- a/doc/src/examples/undocumented.qdoc +++ b/doc/src/examples/undocumented.qdoc @@ -60,11 +60,6 @@ */ /*! - \example incomingcalls - \title Incoming Calls Example -*/ - -/*! \example keepintouch \title Keep in Touch Example */ diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc index 8b9cbeaea9..7872242e09 100644 --- a/doc/src/index.qdoc +++ b/doc/src/index.qdoc @@ -41,7 +41,7 @@ /*! \group mobility - \title Qt Mobility Project APIs (Technical Preview) + \title Qt Mobility Project APIs Qt Mobility Project supplies a set of new APIs for Qt enabling a range of mobile-centric technologies and features on mobile and non-mobile platforms. @@ -54,7 +54,7 @@ \page index.html \startpage index.html Qt Reference Documentation - \title Qt Mobility Project APIs (Technical Preview) Overview + \title Qt Mobility Project APIs Overview \brief An overview of the Qt Mobility Project APIs. @@ -117,7 +117,7 @@ \section2 Known Issues For a list of known issues and an additional details on feature supported see - \l {Release Notes of the QtMobility Project (Technology Preview)}. + \l {Release Notes of the QtMobility Project}. For a overview of Platform Compatability see \l {Platform Compatability}. @@ -240,7 +240,7 @@ For more details see the \l {System Information} {System Information API overview}. - \section1 Future Additions + \section1 Future Additions and Considerations Two additional APIs are included which show future additional APIs. These are pre-release versions and the API will likely change before they are @@ -258,7 +258,9 @@ \l{future.html#Camera-Support}{Camera} will be a part of the Multimedia API. - + The QtMobility API's are placed into the QtMobility namespace. This is done to facilitate + the future migration of Mobility API's into Qt. See the \l {Quickstart Example}{Quickstart guide} for an example on how + the namespace impacts on application development. \section1 Platform Compatability diff --git a/doc/src/installation.qdoc b/doc/src/installation.qdoc index 4957cc52f3..8e80f3fac1 100644 --- a/doc/src/installation.qdoc +++ b/doc/src/installation.qdoc @@ -235,6 +235,42 @@ mobility libraries into $PWD/install. nmake install \endcode +\section2 Building For Symbian On Windows + Building Qt Mobility for Symbian is not necessary as the + package contains pre-built binaries for the SDK and + SIS file for the device. See the \c {symbian\install.txt} + file on how to deploy these. + + If you wish to build QtMobility yourself, + run configure in the package directory. (-prefix + cannot be used since the libraries are installed + into the SDK directory) + + \code + cd c:\QtMobility\%DISTNAME% + configure + \endcode + + Type \c {configure -help} to get a list of all available options. + + To create and deploy the libraries and tools + for the emulator run: +\code + make debug-winscw +\endcode + + To create the libraries and tools for a device + run: +\code + make release-gcce +\endcode + + (Aside: \c {make install} has no meaning for building + on symbian) + The libraries will be deployed into the SDK and will + be ready to use for compiling applications for the + emulator and/or device. + \section2 Building Individual Qt Mobility Domains Qt Mobility is comprised of several domains but all of diff --git a/doc/src/qtmobility-known-issues.qdoc b/doc/src/qtmobility-known-issues.qdoc index dde04eec12..60348d2eaf 100644 --- a/doc/src/qtmobility-known-issues.qdoc +++ b/doc/src/qtmobility-known-issues.qdoc @@ -48,7 +48,7 @@ /*! \page qtmobility-known-issues.html \group mobility - \title Release Notes of the QtMobility Project (Technology Preview) + \title Release Notes of the QtMobility Project An up-to-date list of known issues with the release can be found via the \l {QtMobility Project Bug Tracker} on the Qt website which provides additional information about known issues and tasks related to Qt and the QtMobility Project. @@ -141,7 +141,6 @@ Support is present for the following System Info API classes \section2 Issues Affecting All Platforms \list - \o For this release all QtMobility library names have a \bold _tp suffix \o Messaging filtering and Sorting functions are not fully optimized. \o Versit support for Contacts API is ALPHA, see \c {src/versit/README} \o Not all example applications will display(fit) well on small screens. @@ -152,6 +151,14 @@ Support is present for the following System Info API classes \section2 Symbian/S60 Specific +Currently it is not possible to use Qt convenience header includes: + +\code + #include <QSystemInfo> //does not work on Symbian + //use + #include <qsysteminfo.h> +\endcode + \section3 Bearer Management No specific issues to highlight. diff --git a/doc/src/qtmobility.qdocconf b/doc/src/qtmobility.qdocconf index 49b2672181..223916408f 100644 --- a/doc/src/qtmobility.qdocconf +++ b/doc/src/qtmobility.qdocconf @@ -175,7 +175,7 @@ HTML.footer = "<p /><address><hr /><div align=\"center\">\n" \ "<table width=\"100%\" cellspacing=\"0\" border=\"0\"><tr class=\"address\">\n" \ "<td align=\"left\">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td>\n" \ "<td width=\"20%\" align=\"center\"><a href=\"trademarks.html\">Trademarks</a></td>\n" \ - "<td align=\"right\"><div align=\"right\">Qt Mobility Project 1.0.0 (Technical Preview)</div></td>\n" \ + "<td align=\"right\"><div align=\"right\">Qt Mobility Project 1.0.0</div></td>\n" \ "</tr></table></div></address>" macro.raisedaster.HTML = "<sup>*</sup>" diff --git a/doc/src/sfw_s60.qdoc b/doc/src/sfw_s60.qdoc index ee4283c08f..df810c6a5a 100644 --- a/doc/src/sfw_s60.qdoc +++ b/doc/src/sfw_s60.qdoc @@ -50,33 +50,14 @@ Registration phase is a little different compared to other platforms because of the authenticity of the provider is done during (un)registering phase based on the verification of VID/SID (vendor ID or secure ID). A tiny installer application must be implemented -by the service provider. Installer application handles registering (and unregistering) -of the service. Minimalistic example code for the installer is shown below. The full example -of the installer can be found under \c {examples/serviceinstaller_sfw_symbian}. +by the service provider. Installer application is responsible for the registering (and the unregistering) +of the service. The example code for the installer is shown below. The whole installer project can be found under +\c {examples/serviceinstaller_sfw_symbian}. -\code -int main(int argc, char *argv[]) -{ - QCoreApplication app(argc, argv); +\snippet examples/serviceinstaller_sfw_symbian/exampleinstaller/exampleinstaller.cpp 0 - QServiceManager s; - s.addService("c:\\private\\E00b7e42\\xmldata\\filemanagerservice.xml"); - s.addService("c:\\private\\E00b7e42\\xmldata\\bluetoothtransferservice.xml"); - - return app.exec(); -} -\endcode - -The package file must be updated a little to run the installer on installation. Add FR and RB keywords to -the end of the line which deploys installer.exe to device as follow: - -\code -"/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/release/$(PLATFORM)/$(TARGET)/exampleinstaller.exe" - "!:\sys\bin\exampleinstaller.exe",FR,RB -\endcode - -Those keywords defines that the installer application is run and the service is registered during the installation. - -See more about the package file options: \l {http://wiki.forum.nokia.com/index.php/Advanced_Package_File_Options} +If you want to create your own installer take a copy from the installer project (\c {examples/serviceinstaller_sfw_symbian}) +and modify only the necessary parts e.g a target for your installer and define plugins which are deployed etc. If the installer defines the VID (non-zero value) then the VID is stored to the database, otherwise SID is used. When unregistering the plugin the VID/SID verification is done to ensure that only the application which actually @@ -99,8 +80,8 @@ be thumbered (e.g. remove, move or replace) without Allfiles capability which is capabilities: \l http://wiki.forum.nokia.com/index.php/Capabilities). That makes it impossible for example to replace the whole database with the new one which might contain malicious services. -Note! It doesn't matter which one scope is used in Symbian because both are mapped to the same database anyway. - +Note! It doesn't matter which scope is used on Symbian as \l {QServiceManager::UserScope} and \l {QServiceManager::SystemScope} +are mapped to the same database. \section1 Directory structure diff --git a/doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.pro b/doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.pro index 09e3af145f..acd0c1fd1e 100644 --- a/doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.pro +++ b/doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.pro @@ -14,7 +14,9 @@ INCLUDEPATH += ../../../../src/contacts \ DESTDIR = $$QT_MOBILITY_BUILD_TREE/bin/examples QMAKE_RPATHDIR+=$$OUTPUT_DIR/lib -qtAddLibrary(QtContacts) + +CONFIG += mobility +MOBILITY = contacts SOURCES += qtcontactsdocsample.cpp HEADERS += requestexample.h diff --git a/examples/audiorecorder/audiorecorder.pro b/examples/audiorecorder/audiorecorder.pro index 83358990b9..0475ec3490 100644 --- a/examples/audiorecorder/audiorecorder.pro +++ b/examples/audiorecorder/audiorecorder.pro @@ -6,7 +6,8 @@ contains(QT_CONFIG, multimedia): QT += multimedia INCLUDEPATH += ../../src/multimedia include(../examples.pri) -qtAddLibrary(QtMedia) +CONFIG += mobility +MOBILITY = multimedia QMAKE_RPATHDIR += $$DESTDIR diff --git a/examples/battery-charge/battery-publisher/battery-publisher.pro b/examples/battery-charge/battery-publisher/battery-publisher.pro index 9ce75dc594..063b2e30f5 100644 --- a/examples/battery-charge/battery-publisher/battery-publisher.pro +++ b/examples/battery-charge/battery-publisher/battery-publisher.pro @@ -11,4 +11,5 @@ SOURCES = main.cpp \ FORMS = batterypublisher.ui include(../../examples.pri) -qtAddLibrary(QtPublishSubscribe) +CONFIG += mobility +MOBILITY = publishsubscribe diff --git a/examples/battery-charge/battery-subscriber/battery-subscriber.pro b/examples/battery-charge/battery-subscriber/battery-subscriber.pro index 7d077f7139..54b9e806bc 100644 --- a/examples/battery-charge/battery-subscriber/battery-subscriber.pro +++ b/examples/battery-charge/battery-subscriber/battery-subscriber.pro @@ -4,7 +4,8 @@ QT += declarative INCLUDEPATH += ../../../src/publishsubscribe DEPENDPATH += ../../../src/publishsubscribe include(../../examples.pri) -qtAddLibrary(QtPublishSubscribe) +CONFIG += mobility +MOBILITY = publishsubscribe SOURCES = main.cpp RESOURCES = battery-subscriber.qrc OTHER_FILES += battery-meter.qml diff --git a/examples/bearercloud/bearercloud.pro b/examples/bearercloud/bearercloud.pro index 308ddda432..60ec396785 100644 --- a/examples/bearercloud/bearercloud.pro +++ b/examples/bearercloud/bearercloud.pro @@ -15,16 +15,10 @@ INCLUDEPATH += ../../src/bearer include(../examples.pri) -qtAddLibrary(QtBearer) +CONFIG += mobility +MOBILITY = bearer CONFIG += console -include(../examples.pri) - +symbian:TARGET.CAPABILITY = NetworkServices NetworkControl ReadUserData -macx: { - contains(QT_CONFIG,qt_framework):LIBS += -framework QtBearer - INCLUDEPATH += ../../ - contains(CONFIG, debug) { - } -} diff --git a/examples/bearermonitor/bearermonitor.pro b/examples/bearermonitor/bearermonitor.pro index c8fb3c2c14..acbee71fc4 100644 --- a/examples/bearermonitor/bearermonitor.pro +++ b/examples/bearermonitor/bearermonitor.pro @@ -17,16 +17,12 @@ INCLUDEPATH += ../../src/bearer include(../examples.pri) -qtAddLibrary(QtBearer) +CONFIG += mobility +MOBILITY = bearer + win32:!wince*:LIBS += -lWs2_32 wince*:LIBS += -lWs2 CONFIG += console -include(../examples.pri) - -macx: { - contains(QT_CONFIG,qt_framework):LIBS += -framework QtBearer - contains(CONFIG, debug) { - } -} +symbian:TARGET.CAPABILITY = NetworkServices NetworkControl ReadUserData diff --git a/examples/bluetoothtransferplugin/bluetoothtransferplugin.pro b/examples/bluetoothtransferplugin/bluetoothtransferplugin.pro index 7329503c0c..b483c018d8 100644 --- a/examples/bluetoothtransferplugin/bluetoothtransferplugin.pro +++ b/examples/bluetoothtransferplugin/bluetoothtransferplugin.pro @@ -9,7 +9,8 @@ TARGET = serviceframework_bluetoothtransferplugin DESTDIR = . include(../examples.pri) -qtAddLibrary(QtServiceFramework) +CONFIG += mobility +MOBILITY = serviceframework symbian { load(data_caging_paths) diff --git a/examples/cameracapture/cameracapture.pro b/examples/cameracapture/cameracapture.pro index f27c764163..9ec7c9e094 100644 --- a/examples/cameracapture/cameracapture.pro +++ b/examples/cameracapture/cameracapture.pro @@ -4,7 +4,8 @@ TARGET = cameracapture INCLUDEPATH+=../../src/multimedia include(../examples.pri) -qtAddLibrary(QtMedia) +CONFIG += mobility +MOBILITY = multimedia HEADERS = cameracapture.h \ settings.h diff --git a/examples/declarative/demo/demo.pro b/examples/declarative/demo/demo.pro index c6fd190e84..45ee0d9eae 100644 --- a/examples/declarative/demo/demo.pro +++ b/examples/declarative/demo/demo.pro @@ -11,7 +11,8 @@ HEADERS += ../sfwexample.h SOURCES += ../sfwexample.cpp \ ../main.cpp -qtAddLibrary(QtServiceFramework) +CONFIG += mobility +MOBILITY = serviceframework symbian { TARGET.CAPABILITY = ALL -TCB diff --git a/examples/declarative/landlinedialer/landlinedialer.pro b/examples/declarative/landlinedialer/landlinedialer.pro index d65b35bb84..6459d4c04f 100644 --- a/examples/declarative/landlinedialer/landlinedialer.pro +++ b/examples/declarative/landlinedialer/landlinedialer.pro @@ -10,7 +10,8 @@ QT += gui HEADERS += landlinedialer.h landlinedialerplugin.h SOURCES += landlinedialer.cpp landlinedialerplugin.cpp -qtAddLibrary(QtServiceFramework) +CONFIG += mobility +MOBILITY = serviceframework symbian { TARGET.CAPABILITY = ALL -TCB diff --git a/examples/declarative/voipdialer/voipdialer.pro b/examples/declarative/voipdialer/voipdialer.pro index 099f152afc..372e5fb87c 100644 --- a/examples/declarative/voipdialer/voipdialer.pro +++ b/examples/declarative/voipdialer/voipdialer.pro @@ -10,7 +10,8 @@ QT += gui HEADERS += voipdialer.h voipdialerplugin.h SOURCES += voipdialer.cpp voipdialerplugin.cpp -qtAddLibrary(QtServiceFramework) +CONFIG += mobility +MOBILITY = serviceframework symbian { TARGET.CAPABILITY = ALL -TCB diff --git a/examples/examples.pro b/examples/examples.pro index 743c5ac700..a2d99a3065 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -34,8 +34,8 @@ SUBDIRS += samplephonebook \ #System Information !maemo:SUBDIRS += sysinfo -#Multimedia -SUBDIRS += player \ +#Multimedia - disabled on Symbian due to missing backend +!symbian:SUBDIRS += player \ cameracapture \ slideshow \ streamplayer \ diff --git a/examples/fetchgooglemaps/fetchgooglemaps.pro b/examples/fetchgooglemaps/fetchgooglemaps.pro index bb2534322a..21dff1ed6c 100644 --- a/examples/fetchgooglemaps/fetchgooglemaps.pro +++ b/examples/fetchgooglemaps/fetchgooglemaps.pro @@ -8,10 +8,18 @@ SOURCES = mapwindow.cpp \ main.cpp include(../examples.pri) -qtAddLibrary(QtLocation) +CONFIG += mobility +MOBILITY = location -logfile.path = $$DESTDIR -logfile.files = nmealog.txt -logfile.CONFIG = no_link no_dependencies explicit_dependencies no_build combine ignore_no_exist no_clean -INSTALLS += logfile -build_pass:ALL_DEPS+=install_logfile +symbian: { + addFiles.sources = nmealog.txt + DEPLOYMENT += addFiles + + TARGET.CAPABILITY = Location NetworkServices +} else { + logfile.path = $$DESTDIR + logfile.files = nmealog.txt + logfile.CONFIG = no_link no_dependencies explicit_dependencies no_build combine ignore_no_exist no_clean + INSTALLS += logfile + build_pass:ALL_DEPS+=install_logfile +} diff --git a/examples/filemanagerplugin/filemanagerplugin.pro b/examples/filemanagerplugin/filemanagerplugin.pro index 1d66a01ef8..7dd28fc68f 100644 --- a/examples/filemanagerplugin/filemanagerplugin.pro +++ b/examples/filemanagerplugin/filemanagerplugin.pro @@ -11,7 +11,8 @@ TARGET = serviceframework_filemanagerplugin DESTDIR = . include(../examples.pri) -qtAddLibrary(QtServiceFramework) +CONFIG += mobility +MOBILITY = serviceframework symbian { load(data_caging_paths) diff --git a/examples/incomingcalls/incomingcalls.pro b/examples/incomingcalls/incomingcalls.pro index 880ef6d8c9..6e89dddc42 100644 --- a/examples/incomingcalls/incomingcalls.pro +++ b/examples/incomingcalls/incomingcalls.pro @@ -13,7 +13,8 @@ INCLUDEPATH += . ../../src/contacts \ ../../src/contacts/filters -qtAddLibrary(QtContacts) +CONFIG += mobility +MOBILITY = contacts # Input SOURCES += main.cpp \ @@ -26,5 +27,4 @@ HEADERS += testmodelui.h \ qcontactlistmodel.h \ qcontactlistmodel_p.h -qtAddLibrary(QtContacts) include(../examples.pri) diff --git a/examples/keepintouch/keepintouch.pro b/examples/keepintouch/keepintouch.pro index 3ad6834c40..074da8d4f8 100644 --- a/examples/keepintouch/keepintouch.pro +++ b/examples/keepintouch/keepintouch.pro @@ -5,6 +5,9 @@ QT += gui include(../examples.pri) +CONFIG += mobility +MOBILITY = messaging contacts + qtAddLibrary(QtMessaging) INCLUDEPATH += ../../src/messaging diff --git a/examples/logfilepositionsource/clientapplication.cpp b/examples/logfilepositionsource/clientapplication.cpp index 1003aa408f..e29f57dcb3 100644 --- a/examples/logfilepositionsource/clientapplication.cpp +++ b/examples/logfilepositionsource/clientapplication.cpp @@ -39,13 +39,17 @@ ** ****************************************************************************/ #include <QtCore> +#include <QTextEdit> #include "logfilepositionsource.h" #include "clientapplication.h" -ClientApplication::ClientApplication(QObject *parent) - : QObject(parent) +ClientApplication::ClientApplication(QWidget *parent) + : QMainWindow(parent) { + textEdit = new QTextEdit; + setCentralWidget(textEdit); + LogFilePositionSource *source = new LogFilePositionSource(this); connect(source, SIGNAL(positionUpdated(QGeoPositionInfo)), this, SLOT(positionUpdated(QGeoPositionInfo))); @@ -55,6 +59,5 @@ ClientApplication::ClientApplication(QObject *parent) void ClientApplication::positionUpdated(const QGeoPositionInfo &info) { - qDebug() << "Position updated: Date/time =" << info.dateTime() - << "Coordinate =" << info.coordinate(); + textEdit->append(QString("Position updated: Date/time = %1, Coordinate = %2").arg(info.dateTime().toString()).arg(info.coordinate().toString())); } diff --git a/examples/logfilepositionsource/clientapplication.h b/examples/logfilepositionsource/clientapplication.h index 5035aa442c..513531a76a 100644 --- a/examples/logfilepositionsource/clientapplication.h +++ b/examples/logfilepositionsource/clientapplication.h @@ -42,22 +42,27 @@ #define CLIENTAPPLICATION_H #include <qmobilityglobal.h> -#include <QObject> +#include <QMainWindow> QTM_BEGIN_NAMESPACE class QGeoPositionInfo; QTM_END_NAMESPACE +class QTextEdit; + QTM_USE_NAMESPACE -class ClientApplication : public QObject +class ClientApplication : public QMainWindow { Q_OBJECT public: - ClientApplication(QObject *parent = 0); + ClientApplication(QWidget *parent = 0); private slots: void positionUpdated(const QGeoPositionInfo &info); + +private: + QTextEdit *textEdit; }; diff --git a/examples/logfilepositionsource/logfilepositionsource.pro b/examples/logfilepositionsource/logfilepositionsource.pro index 05e15a4927..93dbe5adcb 100644 --- a/examples/logfilepositionsource/logfilepositionsource.pro +++ b/examples/logfilepositionsource/logfilepositionsource.pro @@ -12,8 +12,23 @@ CONFIG += console include(../examples.pri) qtAddLibrary(QtLocation) -logfileexample.path = $$DESTDIR -logfileexample.files = simplelog.txt -logfileexample.CONFIG = no_link no_dependencies explicit_dependencies no_build combine ignore_no_exist no_clean -INSTALLS += logfileexample -build_pass:ALL_DEPS+=install_logfileexample +symbian|wince*: { + symbian: { + addFiles.sources = simplelog.txt + DEPLOYMENT += addFiles + + TARGET.CAPABILITY = Location + } + wince*: { + addFiles.sources = ./simplelog.txt + addFiles.path = . + DEPLOYMENT += addFiles + } +} else { + logfileexample.path = $$DESTDIR + logfileexample.files = simplelog.txt + logfileexample.CONFIG = no_link no_dependencies explicit_dependencies no_build combine ignore_no_exist no_clean + INSTALLS += logfileexample + build_pass:ALL_DEPS+=install_logfileexample +} + diff --git a/examples/logfilepositionsource/main.cpp b/examples/logfilepositionsource/main.cpp index 77c87b4bcc..5ba0745ca8 100644 --- a/examples/logfilepositionsource/main.cpp +++ b/examples/logfilepositionsource/main.cpp @@ -38,15 +38,20 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include <QCoreApplication> +#include <QApplication> #include "clientapplication.h" int main(int argc, char *argv[]) { - QCoreApplication app(argc, argv); + QApplication app(argc, argv); ClientApplication client; +#ifdef Q_OS_SYMBIAN + client.showMaximized(); +#else + client.show(); +#endif return app.exec(); -}
\ No newline at end of file +} diff --git a/examples/player/player.pro b/examples/player/player.pro index 980e7ab579..dd55c07bad 100644 --- a/examples/player/player.pro +++ b/examples/player/player.pro @@ -4,7 +4,8 @@ TARGET = player INCLUDEPATH += ../../src/multimedia include(../examples.pri) -qtAddLibrary(QtMedia) +CONFIG += mobility +MOBILITY = multimedia HEADERS = \ player.h \ diff --git a/examples/publish-subscribe/publish-subscribe.pro b/examples/publish-subscribe/publish-subscribe.pro index e45c236827..05eca4ae16 100644 --- a/examples/publish-subscribe/publish-subscribe.pro +++ b/examples/publish-subscribe/publish-subscribe.pro @@ -9,6 +9,7 @@ symbian { crmlFiles.path = c:/resource/qt/crml DEPLOYMENT += crmlFiles + #This is Symbian Signed UID3. Needs to match with uidValue in example.qcrml. TARGET.UID3 = 0x2002AC79 } @@ -24,4 +25,6 @@ FORMS = publisherdialog.ui \ subscriberdialog.ui include(../examples.pri) -qtAddLibrary(QtPublishSubscribe) + +CONFIG += mobility +MOBILITY = publishsubscribe diff --git a/examples/querymessages/querymessages.pro b/examples/querymessages/querymessages.pro index 8d08b22c99..cab96e6829 100644 --- a/examples/querymessages/querymessages.pro +++ b/examples/querymessages/querymessages.pro @@ -5,7 +5,8 @@ QT += gui include(../examples.pri) -qtAddLibrary(QtMessaging) +CONFIG += mobility +MOBILITY = messaging INCLUDEPATH += ../../src/messaging symbian|win32 { diff --git a/examples/quickstart/main.cpp b/examples/quickstart/main.cpp index 723dbc905e..1e272e7522 100644 --- a/examples/quickstart/main.cpp +++ b/examples/quickstart/main.cpp @@ -43,7 +43,11 @@ #include <QApplication> #include <QLabel> +#ifdef Q_OS_SYMBIAN +#include <qsysteminfo.h> +#else #include <QSystemInfo> //(1) +#endif using namespace QtMobility; //(2) int main(int argc, char *argv[]) diff --git a/examples/radio/radio.pro b/examples/radio/radio.pro index 8029a46da3..2af065bfb7 100644 --- a/examples/radio/radio.pro +++ b/examples/radio/radio.pro @@ -4,7 +4,8 @@ CONFIG += example INCLUDEPATH += ../../src/multimedia include(../examples.pri) -qtAddLibrary(QtMedia) +CONFIG += mobility +MOBILITY = multimedia QMAKE_RPATHDIR += $$DESTDIR diff --git a/examples/recorder/recorder.pro b/examples/recorder/recorder.pro index 45410bf93d..6a4dfc5d59 100644 --- a/examples/recorder/recorder.pro +++ b/examples/recorder/recorder.pro @@ -4,7 +4,8 @@ TARGET = recorder INCLUDEPATH+=../../src/multimedia include(../examples.pri) -qtAddLibrary(QtMedia) +CONFIG += mobility +MOBILITY = multimedia HEADERS = recorder.h diff --git a/examples/s60installs/s60installs.pro b/examples/s60installs/s60installs.pro new file mode 100644 index 0000000000..441b598144 --- /dev/null +++ b/examples/s60installs/s60installs.pro @@ -0,0 +1,94 @@ +TEMPLATE = app +TARGET = S60Examples + +include($$QT_MOBILITY_BUILD_TREE/config.pri) + +TEMPLATE = subdirs + +#ServiceFramework examples +SUBDIRS += ../bluetoothtransferplugin \ + ../filemanagerplugin #\ +# ../servicebrowser + +#BearerManagement examples +SUBDIRS += ../bearermonitor \ + ../../tests/bearerex + +#Contacts examples +SUBDIRS += ../samplephonebook + +#Publish and Subscribe examples +SUBDIRS += ../publish-subscribe + +#System Information example +SUBDIRS += ../sysinfo + +#Messaging examples +SUBDIRS += ../querymessages\ + ../sendmessage\ + ../serviceactions \ + ../../tests/messagesex + +symbian { + + load(data_caging_paths) + + executables.sources = \ + bearermonitor.exe \ + BearerEx.exe \ + serviceframework_bluetoothtransferplugin.dll \ + serviceframework_filemanagerplugin.dll \ +# servicebrowser.exe \ + publish_subscribe.exe \ + querymessages.exe \ + sendmessage.exe \ + serviceactions.exe \ + messagingex.exe \ + samplephonebook.exe \ + sysinfo.exe + executables.path = /sys/bin + + pluginstubs.sources = ../bluetoothtransferplugin/qmakepluginstubs/serviceframework_bluetoothtransferplugin.qtplugin \ + ../filemanagerplugin/qmakepluginstubs/serviceframework_filemanagerplugin.qtplugin + pluginstubs.path = $${QT_PLUGINS_BASE_DIR} #/resource/qt/plugins + + executables.path = /sys/bin + DEPLOYMENT += executables \ + pluginstubs \ + reg_resource \ + resource + + reg_resource.sources = \ + $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/bearermonitor_reg.rsc \ + $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/BearerEx_reg.rsc \ +# $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/servicebrowser_reg.rsc \ + $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/publish_subscribe_reg.rsc \ + $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/querymessages_reg.rsc \ + $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/sendmessage_reg.rsc \ + $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/serviceactions_reg.rsc \ + $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/messagingex_reg.rsc \ + $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/samplephonebook_reg.rsc \ + $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/sysinfo_reg.rsc + + reg_resource.path = $$REG_RESOURCE_IMPORT_DIR + + resource.sources = \ + $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/bearermonitor.rsc \ + $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/BearerEx.rsc \ +# $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/servicebrowser.rsc \ + $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/publish_subscribe.rsc \ + $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/querymessages.rsc \ + $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/sendmessage.rsc \ + $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/serviceactions.rsc \ + $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/messagingex.rsc \ + $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/samplephonebook.rsc \ + $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/sysinfo.rsc + + resource.path = $$APP_RESOURCE_DIR + + mifs.sources = \ + $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/0xA000C611.mif + mifs.path = $$APP_RESOURCE_DIR + + #TARGET.CAPABILITY = ALL -TCB +} diff --git a/examples/samplephonebook/contactdetails_240_320.ui b/examples/samplephonebook/contactdetails_240_320.ui deleted file mode 100644 index 5cec324d4e..0000000000 --- a/examples/samplephonebook/contactdetails_240_320.ui +++ /dev/null @@ -1,226 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<ui version="4.0"> - <class>ContactDetails240By320</class> - <widget class="QDialog" name="ContactDetails240By320"> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>240</width> - <height>320</height> - </rect> - </property> - <property name="windowTitle"> - <string>Contact details</string> - </property> - <layout class="QVBoxLayout" name="verticalLayout"> - <item> - <widget class="QScrollArea" name="scrollArea"> - <property name="widgetResizable"> - <bool>true</bool> - </property> - <widget class="QWidget" name="scrollAreaWidgetContents"> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>218</width> - <height>264</height> - </rect> - </property> - <layout class="QVBoxLayout" name="verticalLayout_2"> - <item> - <layout class="QGridLayout" name="gridLayout"> - <property name="spacing"> - <number>3</number> - </property> - <item row="0" column="0"> - <widget class="QLabel" name="nameLabel"> - <property name="text"> - <string>Name:</string> - </property> - </widget> - </item> - <item row="0" column="1"> - <widget class="QLineEdit" name="nameEdit"/> - </item> - <item row="1" column="0"> - <widget class="QLabel" name="avatarLabel"> - <property name="text"> - <string>Avatar</string> - </property> - </widget> - </item> - <item row="1" column="1"> - <layout class="QHBoxLayout" name="horizontalLayout_2"> - <item> - <widget class="QPushButton" name="avatarButton"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Minimum" vsizetype="Minimum"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize"> - <size> - <width>0</width> - <height>30</height> - </size> - </property> - <property name="text"> - <string>Select</string> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="avatarPixmapLabel"> - <property name="text"> - <string/> - </property> - </widget> - </item> - </layout> - </item> - <item row="2" column="0"> - <widget class="QLabel" name="emailLabel"> - <property name="text"> - <string>Email:</string> - </property> - </widget> - </item> - <item row="2" column="1"> - <widget class="QLineEdit" name="emailEdit"/> - </item> - <item row="3" column="0"> - <widget class="QLabel" name="homePhoneLabel"> - <property name="text"> - <string>Home Phone:</string> - </property> - </widget> - </item> - <item row="3" column="1"> - <widget class="QLineEdit" name="homePhoneEdit"/> - </item> - <item row="4" column="0"> - <widget class="QLabel" name="workPhoneLabel"> - <property name="text"> - <string>Work Phone:</string> - </property> - </widget> - </item> - <item row="4" column="1"> - <widget class="QLineEdit" name="workPhoneEdit"/> - </item> - <item row="5" column="0"> - <widget class="QLabel" name="mobilePhoneLabel"> - <property name="text"> - <string>Mobile Phone:</string> - </property> - </widget> - </item> - <item row="5" column="1"> - <widget class="QLineEdit" name="mobilePhoneEdit"/> - </item> - <item row="6" column="0"> - <widget class="QLabel" name="groupsLabel"> - <property name="text"> - <string>Groups:</string> - </property> - </widget> - </item> - <item row="6" column="1"> - <layout class="QHBoxLayout" name="horizontalLayout_3"> - <item> - <widget class="QPushButton" name="groupsButton"> - <property name="text"> - <string>Group Details</string> - </property> - </widget> - </item> - <item> - <spacer name="horizontalSpacer_3"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>40</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - </layout> - </item> - <item row="7" column="0"> - <widget class="QLabel" name="addressLabel"> - <property name="text"> - <string>Address</string> - </property> - </widget> - </item> - <item row="7" column="1"> - <widget class="QPlainTextEdit" name="addressEdit"> - <property name="maximumSize"> - <size> - <width>16777215</width> - <height>60</height> - </size> - </property> - </widget> - </item> - </layout> - </item> - </layout> - </widget> - </widget> - </item> - <item> - <layout class="QHBoxLayout" name="horizontalLayout"> - <item> - <spacer name="horizontalSpacer"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>40</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item> - <widget class="QPushButton" name="saveButton"> - <property name="text"> - <string>Save</string> - </property> - </widget> - </item> - <item> - <widget class="QPushButton" name="cancelButton"> - <property name="text"> - <string>Cancel</string> - </property> - </widget> - </item> - <item> - <spacer name="horizontalSpacer_2"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>40</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - </layout> - </item> - </layout> - </widget> - <resources/> - <connections/> -</ui> diff --git a/examples/samplephonebook/contactdetailsform.cpp b/examples/samplephonebook/contactdetailsform.cpp deleted file mode 100644 index 3fad512804..0000000000 --- a/examples/samplephonebook/contactdetailsform.cpp +++ /dev/null @@ -1,55 +0,0 @@ - -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the Qt Mobility Components. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - - -#include "contactdetailsform.h" - -ContactDetailsForm::ContactDetailsForm(QWidget *parent) - :QDialog(parent) -{ - setupUi(this); -} - -ContactDetailsForm::~ContactDetailsForm() -{ -} - diff --git a/examples/samplephonebook/contactdetailsform.h b/examples/samplephonebook/contactdetailsform.h deleted file mode 100644 index 001da69ea8..0000000000 --- a/examples/samplephonebook/contactdetailsform.h +++ /dev/null @@ -1,54 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the Qt Mobility Components. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef CONTACTDETAILSFORM_H -#define CONTACTDETAILSFORM_H - -#include "ui_contactdetails_240_320.h" - -class ContactDetailsForm : public QDialog, Ui::ContactDetails240By320 -{ -public: - ContactDetailsForm(QWidget *parent); - ~ContactDetailsForm(); -}; -#endif // CONTACTDETAILSFORM_H - diff --git a/examples/samplephonebook/contacteditor.cpp b/examples/samplephonebook/contacteditor.cpp new file mode 100644 index 0000000000..71d6eb5b65 --- /dev/null +++ b/examples/samplephonebook/contacteditor.cpp @@ -0,0 +1,225 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the Qt Mobility Components. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +** +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "contacteditor.h" + +#include <QtGui> + +ContactEditor::ContactEditor(QWidget *parent) + : QWidget(parent) +{ + m_manager = 0; + m_contactId = QContactLocalId(0); + + m_saveBtn = new QPushButton("Save", this); + connect(m_saveBtn, SIGNAL(clicked()), this, SLOT(saveClicked())); + m_deleteBtn = new QPushButton("Delete", this); + connect(m_deleteBtn, SIGNAL(clicked()), this, SLOT(deleteClicked())); + m_cancelBtn = new QPushButton("Cancel", this); + connect(m_cancelBtn, SIGNAL(clicked()), this, SLOT(cancelClicked())); + + m_nameEdit = new QLineEdit(this); + m_phoneEdit = new QLineEdit(this); + m_emailEdit = new QLineEdit(this); + m_addrEdit = new QLineEdit(this); + m_avatarBtn = new QPushButton(this); + m_avatarBtn->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); + connect(m_avatarBtn, SIGNAL(clicked()), this, SLOT(avatarClicked())); + + m_detailsArea = new QScrollArea(this); + m_detailsArea->setWidgetResizable(true); + QFormLayout *detailsLayout = new QFormLayout; + detailsLayout->addRow("Name", m_nameEdit); + detailsLayout->addRow("Phone", m_phoneEdit); + detailsLayout->addRow("Email", m_emailEdit); + detailsLayout->addRow("Address", m_addrEdit); + detailsLayout->addRow("Avatar", m_avatarBtn); + detailsLayout->setFieldGrowthPolicy(QFormLayout::ExpandingFieldsGrow); + detailsLayout->setSizeConstraint(QLayout::SetMinAndMaxSize); + m_detailsArea->setLayout(detailsLayout); + + QHBoxLayout *btnLayout = new QHBoxLayout; + btnLayout->addWidget(m_saveBtn); + btnLayout->addWidget(m_deleteBtn); + btnLayout->addWidget(m_cancelBtn); + + QVBoxLayout *editLayout = new QVBoxLayout; + editLayout->addWidget(m_detailsArea); + editLayout->addLayout(btnLayout); + + setLayout(editLayout); +} + +ContactEditor::~ContactEditor() +{ +} + +void ContactEditor::setCurrentContact(QContactManager* manager, QContactLocalId currentId) +{ + m_manager = manager; + m_contactId = currentId; + m_newAvatarPath = QString(); + + if (manager == 0 || currentId == 0) { + // clear the UI and return. + m_nameEdit->setText(""); + m_phoneEdit->setText(""); + m_emailEdit->setText(""); + m_addrEdit->setText(""); + m_avatarBtn->setIcon(QIcon()); + + if (manager == 0) + m_saveBtn->setEnabled(false); + m_deleteBtn->setEnabled(false); + + return; + } + + // enable the UI. + m_saveBtn->setEnabled(true); + m_deleteBtn->setEnabled(true); + + // otherwise, build from the contact details. + QContact curr = manager->contact(m_contactId); + QContactName nm = curr.detail(QContactName::DefinitionName); + QContactPhoneNumber phn = curr.detail(QContactPhoneNumber::DefinitionName); + QContactEmailAddress em = curr.detail(QContactEmailAddress::DefinitionName); + QContactAddress adr = curr.detail(QContactAddress::DefinitionName); + QContactAvatar av = curr.detail(QContactAvatar::DefinitionName); + + QString saveNameField = nameField(); + if (!saveNameField.isEmpty()) + m_nameEdit->setText(nm.value(saveNameField)); + else + m_nameEdit->setText(QString()); + m_phoneEdit->setText(phn.value(QContactPhoneNumber::FieldNumber)); + m_emailEdit->setText(em.value(QContactEmailAddress::FieldEmailAddress)); + m_addrEdit->setText(adr.value(QContactAddress::FieldStreet)); // ugly hack. + m_avatarBtn->setIcon(QIcon(av.value(QContactAvatar::FieldAvatar))); +} + +QString ContactEditor::nameField() +{ + // return the field which the name data should be saved in. + if (!m_manager) + return QString(); + + QMap<QString, QContactDetailDefinition> defs = m_manager->detailDefinitions(QContactType::TypeContact); + QContactDetailDefinition nameDef = defs.value(QContactName::DefinitionName); + if (nameDef.fields().keys().contains(QContactName::FieldCustomLabel)) { + return QString(QLatin1String(QContactName::FieldCustomLabel)); + } else if (nameDef.fields().keys().contains(QContactName::FieldFirst)) { + return QString(QLatin1String(QContactName::FieldFirst)); + } else { + return QString(); + } +} + +void ContactEditor::avatarClicked() +{ + // put up a file dialog, and update the new avatar path. + QString fileName = QFileDialog::getOpenFileName(this, + tr("Select Avatar Image"), ".", tr("Image Files (*.png *.jpg *.bmp)")); + + m_newAvatarPath = fileName; + m_avatarBtn->setIcon(QIcon(m_newAvatarPath)); +} + +void ContactEditor::saveClicked() +{ + if (!m_manager) { + qWarning() << "No manager selected; cannot save."; + } else { + QContact curr; + if (m_contactId != QContactLocalId(0)) + curr = m_manager->contact(m_contactId); + QContactName nm = curr.detail(QContactName::DefinitionName); + QContactPhoneNumber phn = curr.detail(QContactPhoneNumber::DefinitionName); + QContactEmailAddress em = curr.detail(QContactEmailAddress::DefinitionName); + QContactAddress adr = curr.detail(QContactAddress::DefinitionName); + QContactAvatar av = curr.detail(QContactAvatar::DefinitionName); + + QString saveNameField = nameField(); + if (!saveNameField.isEmpty()) + nm.setValue(nameField(), m_nameEdit->text()); + phn.setNumber(m_phoneEdit->text()); + em.setEmailAddress(m_emailEdit->text()); + adr.setStreet(m_addrEdit->text()); + av.setAvatar(m_newAvatarPath); + + curr.saveDetail(&nm); + curr.saveDetail(&phn); + curr.saveDetail(&em); + curr.saveDetail(&adr); + curr.saveDetail(&av); + + bool success = m_manager->saveContact(&curr); + if (success) + QMessageBox::information(this, "Success!", "Contact saved successfully!"); + else + QMessageBox::information(this, "Failed!", "Failed to save contact!"); + } + + emit showListPage(); +} + +void ContactEditor::deleteClicked() +{ + if (!m_manager) { + qWarning() << "No manager selected; cannot delete."; + } else { + if (m_contactId == QContactLocalId(0)) + qWarning() << "Contact is invalid; cannot delete."; + + bool success = m_manager->removeContact(m_contactId); + if (success) + QMessageBox::information(this, "Success!", "Contact deleted successfully!"); + else + QMessageBox::information(this, "Failed!", "Failed to delete contact!"); + } + + emit showListPage(); +} + +void ContactEditor::cancelClicked() +{ + emit showListPage(); +} diff --git a/examples/samplephonebook/groupdetailsdialog.h b/examples/samplephonebook/contacteditor.h index dcebbe2382..2006c6c89b 100644 --- a/examples/samplephonebook/groupdetailsdialog.h +++ b/examples/samplephonebook/contacteditor.h @@ -39,50 +39,61 @@ ** ****************************************************************************/ -#ifndef GROUPDETAILSDIALOG_H -#define GROUPDETAILSDIALOG_H +#ifndef CONTACTEDITOR_H +#define CONTACTEDITOR_H -#include <QDialog> -#include "qcontact.h" +#include "qtcontacts.h" +#include <QWidget> +#include <QMap> +#include <QPlainTextEdit> + +QT_BEGIN_NAMESPACE +class QScrollArea; class QPushButton; -class QListWidget; -class QListWidgetItem; class QLineEdit; - -QTM_BEGIN_NAMESPACE -class QContactManager; -QTM_END_NAMESPACE +QT_END_NAMESPACE QTM_USE_NAMESPACE -class GroupDetailsDialog : public QDialog +class ContactEditor : public QWidget { Q_OBJECT public: - GroupDetailsDialog(QWidget *parent, QContactManager *contactManager, const QContact &contact); - QList<QContactLocalId> groups(); + ContactEditor(QWidget *parent = 0); + ~ContactEditor(); -private: - void repopulateGroupList(); +signals: + void showListPage(); public slots: - void show(); - void groupItemChanged(QListWidgetItem * item); + void setCurrentContact(QContactManager* manager, QContactLocalId currentId); private slots: - void okButtonClicked(); - void cancelButtonClicked(); + void saveClicked(); + void deleteClicked(); + void cancelClicked(); + void avatarClicked(); private: - QListWidget *listWidget; - QLineEdit *contactNameEdit; - QPushButton *cancelButton; - QPushButton *okButton; - QContactManager *cm; - QContact localContact; -}; + QString nameField(); -#endif // GROUPDETAILSDIALOG_H + QPushButton *m_saveBtn; + QPushButton *m_deleteBtn; + QPushButton *m_cancelBtn; + + QScrollArea *m_detailsArea; // contains the below elements. + QLineEdit *m_nameEdit; + QLineEdit *m_phoneEdit; + QLineEdit *m_emailEdit; + QLineEdit *m_addrEdit; + QPushButton *m_avatarBtn; + + // data + QContactManager *m_manager; + QContactLocalId m_contactId; + QString m_newAvatarPath; +}; +#endif // CONTACTEDITOR_H diff --git a/examples/samplephonebook/contactlistpage.cpp b/examples/samplephonebook/contactlistpage.cpp new file mode 100644 index 0000000000..1280110d7d --- /dev/null +++ b/examples/samplephonebook/contactlistpage.cpp @@ -0,0 +1,161 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the Qt Mobility Components. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +** +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "contactlistpage.h" + +#include <QtGui> + +ContactListPage::ContactListPage(QWidget *parent) + : QWidget(parent) +{ + m_manager = 0; + m_currentFilter = QContactFilter(); + + m_backendsLabel = new QLabel("Store:", this); + m_backendsLabel->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); + m_backendsCombo = new QComboBox(this); + QStringList availableManagers = QContactManager::availableManagers(); + m_backendsCombo->addItems(availableManagers); + connect(m_backendsCombo, SIGNAL(currentIndexChanged(QString)), this, SLOT(backendSelected())); + m_filterActiveLabel = new QLabel("Filter: Inactive"); + m_filterActiveLabel->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed)); + + m_contactsList = new QListWidget(this); + + m_addContactBtn = new QPushButton("Add", this); + connect(m_addContactBtn, SIGNAL(clicked()), this, SLOT(addContactClicked())); + m_editBtn = new QPushButton("Edit", this); + connect(m_editBtn, SIGNAL(clicked()), this, SLOT(editClicked())); + m_findBtn = new QPushButton("Find", this); + connect(m_findBtn, SIGNAL(clicked()), this, SLOT(findClicked())); + + QHBoxLayout *backendLayout = new QHBoxLayout; + backendLayout->addWidget(m_backendsLabel); + backendLayout->addWidget(m_backendsCombo); + backendLayout->addWidget(m_filterActiveLabel); + + QHBoxLayout *btnLayout = new QHBoxLayout; + btnLayout->addWidget(m_addContactBtn); + btnLayout->addWidget(m_editBtn); + btnLayout->addWidget(m_findBtn); + + QVBoxLayout *bookLayout = new QVBoxLayout; + bookLayout->addLayout(backendLayout); + bookLayout->addWidget(m_contactsList); + bookLayout->addLayout(btnLayout); + + setLayout(bookLayout); + + // force update to backend. + QTimer::singleShot(0, this, SLOT(backendSelected())); +} + +ContactListPage::~ContactListPage() +{ + QList<QContactManager*> initialisedManagers = m_initialisedManagers.values(); + while (!initialisedManagers.isEmpty()) { + QContactManager *deleteMe = initialisedManagers.takeFirst(); + delete deleteMe; + } +} + +void ContactListPage::backendSelected() +{ + QString backend = m_backendsCombo->currentText(); + + // first, check to see if they reselected the same backend. + if (m_manager && m_manager->managerName() == backend) + return; + + // the change is real. update. + if (m_initialisedManagers.contains(backend)) { + m_manager = m_initialisedManagers.value(backend); + } else { + m_manager = new QContactManager(backend); + m_initialisedManagers.insert(backend, m_manager); + } + + // signal that the manager has changed. + emit managerChanged(m_manager); + + // and... rebuild the list. + rebuildList(m_currentFilter); +} + +void ContactListPage::rebuildList(const QContactFilter& filter) +{ + // first, check to see whether the filter does anything + if (filter == QContactFilter()) + m_filterActiveLabel->setText("Filter: Inactive"); + else + m_filterActiveLabel->setText("Filter: Active"); + + QContact currContact; + m_currentFilter = filter; + m_contactsList->clear(); + m_idToListIndex.clear(); + QList<QContactLocalId> contactIds = m_manager->contacts(m_currentFilter); + foreach (const QContactLocalId& id, contactIds) { + QListWidgetItem *currItem = new QListWidgetItem; + currContact = m_manager->contact(id); + currItem->setData(Qt::DisplayRole, currContact.displayLabel()); + currItem->setData(Qt::UserRole, currContact.localId()); // also store the id of the contact. + m_idToListIndex.insert(currContact.localId(), m_contactsList->count()); + m_contactsList->addItem(currItem); + } +} + +void ContactListPage::addContactClicked() +{ + emit showEditorPage(QContactLocalId(0)); +} + +void ContactListPage::editClicked() +{ + if (m_contactsList->currentItem()) + emit showEditorPage(QContactLocalId(m_contactsList->currentItem()->data(Qt::UserRole).toUInt())); + // else, nothing selected; ignore. +} + +void ContactListPage::findClicked() +{ + emit showFilterPage(m_currentFilter); +} diff --git a/examples/samplephonebook/groupeditdialog.h b/examples/samplephonebook/contactlistpage.h index f27a4160a0..eadb3af469 100644 --- a/examples/samplephonebook/groupeditdialog.h +++ b/examples/samplephonebook/contactlistpage.h @@ -39,53 +39,63 @@ ** ****************************************************************************/ -#ifndef GROUPEDITDIALOG_H -#define GROUPEDITDIALOG_H +#ifndef CONTACTLISTPAGE_H +#define CONTACTLISTPAGE_H -#include <qmobilityglobal.h> -#include <QDialog> +#include "qtcontacts.h" -class QPushButton; +#include <QWidget> +#include <QList> +#include <QListWidgetItem> + +QT_BEGIN_NAMESPACE class QListWidget; -class QListWidgetItem; +class QPushButton; +class QComboBox; +class QLabel; class QLineEdit; - -QTM_BEGIN_NAMESPACE -class QContactManager; -QTM_END_NAMESPACE +QT_END_NAMESPACE QTM_USE_NAMESPACE -class GroupEditDialog : public QDialog +class ContactListPage : public QWidget { Q_OBJECT public: - GroupEditDialog(QWidget *parent, QContactManager *contactManager); + ContactListPage(QWidget *parent = 0); + ~ContactListPage(); -private: - void repopulateGroupList(); + void rebuildList(const QContactFilter& filter); -public slots: - void show(); +signals: + void showEditorPage(QContactLocalId contactId); + void showFilterPage(const QContactFilter& filter); + void managerChanged(QContactManager *manager); private slots: - void addButtonClicked(); - void saveButtonClicked(); - void deleteButtonClicked(); - void doneButtonClicked(); - void groupItemActivated(QListWidgetItem * item); - void groupItemChanged ( QListWidgetItem * current, QListWidgetItem * previous ); + void backendSelected(); + void addContactClicked(); + void editClicked(); + void findClicked(); private: - QListWidget *listWidget; - QLineEdit *groupNameEdit; - QPushButton *addButton; - QPushButton *saveButton; - QPushButton *deleteButton; - QPushButton *doneButton; - QContactManager *cm; -}; + // elements of the contact list "page" + QLabel *m_backendsLabel; + QComboBox *m_backendsCombo; + QLabel *m_filterActiveLabel; + + QListWidget *m_contactsList; + QPushButton *m_addContactBtn; + QPushButton *m_editBtn; + QPushButton *m_findBtn; -#endif // GROUPEDITDIALOG_H + // data + QContactManager *m_manager; + QMap<QContactLocalId, int> m_idToListIndex; + QMap<QString, QContactManager*> m_initialisedManagers; + + QContactFilter m_currentFilter; +}; +#endif // CONTACTLISTPAGE_H diff --git a/examples/samplephonebook/filterpage.cpp b/examples/samplephonebook/filterpage.cpp new file mode 100644 index 0000000000..faf9e6e8a7 --- /dev/null +++ b/examples/samplephonebook/filterpage.cpp @@ -0,0 +1,223 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the Qt Mobility Components. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +** +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "filterpage.h" + +#include <QtGui> + +FilterPage::FilterPage(QWidget* parent) + : QWidget(parent) +{ + m_valueCriteriaEdit = new QLineEdit(this); + m_fieldCriteriaCombo = new QComboBox(this); + m_criteriaTypeCombo = new QComboBox(this); + m_joinMethodCombo = new QComboBox(this); + m_cumulativeExpressionLabel = new QLabel(this); + m_cumulativeExpressionLabel->setText("Match All Contacts"); + + QStringList filterableFields; + filterableFields.append("Name"); + filterableFields.append("Phone Number"); + filterableFields.append("Email"); + m_fieldCriteriaCombo->addItems(filterableFields); + + QStringList criteriaTypes; + criteriaTypes.append("Exact Match"); + criteriaTypes.append("Starts With"); + criteriaTypes.append("Ends With"); + criteriaTypes.append("Contains"); + m_criteriaTypeCombo->addItems(criteriaTypes); + + QStringList joinTypes; + joinTypes.append("AND"); + joinTypes.append("OR"); + m_joinMethodCombo->addItems(joinTypes); + + QFormLayout *formLayout = new QFormLayout; + formLayout->addRow("Search String: ", m_valueCriteriaEdit); + formLayout->addRow("Search Field: ", m_fieldCriteriaCombo); + formLayout->addRow("Criteria Type: ", m_criteriaTypeCombo); + formLayout->addRow("Join Method: ", m_joinMethodCombo); + // TODO: add separator. + formLayout->addRow("Filter Expression: ", m_cumulativeExpressionLabel); + + m_add = new QPushButton("Add", this); + connect(m_add, SIGNAL(clicked()), this, SLOT(addClicked())); + m_clear = new QPushButton("Clear", this); + connect(m_clear, SIGNAL(clicked()), this, SLOT(clearClicked())); + m_done = new QPushButton("Filter", this); + connect(m_done, SIGNAL(clicked()), this, SLOT(doneClicked())); + + QHBoxLayout *btnLayout = new QHBoxLayout; + btnLayout->addWidget(m_add); + btnLayout->addWidget(m_clear); + btnLayout->addWidget(m_done); + + QVBoxLayout *pageLayout = new QVBoxLayout; + pageLayout->addLayout(formLayout); + pageLayout->addLayout(btnLayout); + + setLayout(pageLayout); +} + +FilterPage::~FilterPage() +{ +} + +void FilterPage::addClicked() +{ + QContactDetailFilter fil; + QString defName; + QString fieldName; + QString exprName; + QString exprMatch; + QString exprJoin; + switch (m_fieldCriteriaCombo->currentIndex()) { + case 0: + { + // name + defName = QString(QLatin1String(QContactDisplayLabel::DefinitionName)); + fieldName = QString(QLatin1String(QContactDisplayLabel::FieldLabel)); + + exprName = "Name"; + } + break; + + case 1: + { + // phone number + defName = QString(QLatin1String(QContactPhoneNumber::DefinitionName)); + fieldName = QString(QLatin1String(QContactPhoneNumber::FieldNumber)); + + exprName = "Phone Number"; + } + break; + + default: + { + // email address + defName = QString(QLatin1String(QContactEmailAddress::DefinitionName)); + fieldName = QString(QLatin1String(QContactEmailAddress::FieldEmailAddress)); + + exprName = "Email Address"; + } + break; + + } + fil.setDetailDefinitionName(defName, fieldName); + fil.setValue(m_valueCriteriaEdit->text()); + + QContactFilter::MatchFlags matchFlags; + switch (m_criteriaTypeCombo->currentIndex()) { + case 0: + { + matchFlags |= QContactFilter::MatchExactly; + exprMatch = "equals"; + } + break; + + case 1: + { + matchFlags |= QContactFilter::MatchStartsWith; + exprMatch = "starts with"; + } + break; + + case 2: + { + matchFlags |= QContactFilter::MatchEndsWith; + exprMatch = "ends with"; + } + break; + + default: + { + matchFlags |= QContactFilter::MatchContains; + exprMatch = "contains"; + } + break; + } + fil.setMatchFlags(matchFlags); + + // if OR then join with OR + if (m_joinMethodCombo->currentIndex() == 1) { + QContactUnionFilter ufil; + ufil << m_cumulativeFilter << fil; + QContactIntersectionFilter ifil; + ifil << ufil; + m_cumulativeFilter = ifil; + exprJoin = "OR"; + } else { + // otherwise, just AND. + QContactIntersectionFilter ifil(m_cumulativeFilter); + ifil << fil; + m_cumulativeFilter = ifil; + exprJoin = "AND"; + } + + // set the expression so far + if (!m_cumulativeExpression.isEmpty()) + m_cumulativeExpression += " " + exprJoin + " "; + m_cumulativeExpression += exprName + " " + exprMatch + " \"" + m_valueCriteriaEdit->text() + "\""; + + // and clear the UI ready for the next filter expression. + m_valueCriteriaEdit->setText(""); + m_fieldCriteriaCombo->setCurrentIndex(0); + m_criteriaTypeCombo->setCurrentIndex(0); + m_joinMethodCombo->setCurrentIndex(0); + m_cumulativeExpressionLabel->setText(m_cumulativeExpression); +} + +void FilterPage::clearClicked() +{ + m_cumulativeExpression = QString(); + m_valueCriteriaEdit->setText(""); + m_fieldCriteriaCombo->setCurrentIndex(0); + m_criteriaTypeCombo->setCurrentIndex(0); + m_joinMethodCombo->setCurrentIndex(0); + m_cumulativeExpressionLabel->setText("Match All Contacts"); + m_cumulativeFilter = QContactFilter(); +} + +void FilterPage::doneClicked() +{ + emit showListPage(m_cumulativeFilter); +} diff --git a/examples/samplephonebook/finddialog.h b/examples/samplephonebook/filterpage.h index 838f660c46..ab98d5fa56 100644 --- a/examples/samplephonebook/finddialog.h +++ b/examples/samplephonebook/filterpage.h @@ -39,46 +39,57 @@ ** ****************************************************************************/ -#ifndef FINDDIALOG_H -#define FINDDIALOG_H +#ifndef FILTERPAGE_H +#define FILTERPAGE_H -#include <QDialog> -#include "qcontactfilter.h" +#include "qtcontacts.h" + +#include <QWidget> +#include <QMap> +#include <QPlainTextEdit> QT_BEGIN_NAMESPACE -class QLineEdit; +class QScrollArea; +class QComboBox; class QPushButton; +class QLineEdit; class QLabel; -QT_END_NAMESPACE - -class FilterDialog; +QT_BEGIN_NAMESPACE QTM_USE_NAMESPACE -class FindDialog : public QDialog +class FilterPage : public QWidget { Q_OBJECT public: - FindDialog(QWidget *parent = 0); - QString getFindText() const; - QContactFilter getFindFilter() const; - bool isSimpleFilterEnabled() const; - void showEvent(QShowEvent *event); + FilterPage(QWidget *parent = 0); + ~FilterPage(); + +signals: + void showListPage(const QContactFilter& filter); public slots: - void findClicked(); - void filterClicked(); - void filterHidden(); + +private slots: + void addClicked(); + void clearClicked(); + void doneClicked(); private: - QPushButton *findButton; - QPushButton *filterButton; - FilterDialog *filterDialog; - QLineEdit *lineEdit; - QLabel *findLabel; - QString findText; - bool simpleFilter; + QLineEdit *m_valueCriteriaEdit; + QComboBox *m_fieldCriteriaCombo; + QComboBox *m_criteriaTypeCombo; + QComboBox *m_joinMethodCombo; + + QLabel *m_cumulativeExpressionLabel; + + QPushButton *m_add; + QPushButton *m_clear; + QPushButton *m_done; + + QString m_cumulativeExpression; + QContactFilter m_cumulativeFilter; }; -#endif +#endif // FILTERPAGE_H diff --git a/examples/samplephonebook/finddialog.cpp b/examples/samplephonebook/finddialog.cpp deleted file mode 100644 index b0a1d91667..0000000000 --- a/examples/samplephonebook/finddialog.cpp +++ /dev/null @@ -1,147 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the Qt Mobility Components. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "finddialog.h" -#include "../incomingcalls/filterdialog.h" -#include "../incomingcalls/filterdialog.cpp" -#include <QtGui> - -FindDialog::FindDialog(QWidget *parent) - : QDialog(parent), simpleFilter(true) -{ - QVBoxLayout *layout = new QVBoxLayout(this); - filterDialog = new FilterDialog(this); - - findLabel = new QLabel(tr("Contact name:")); - lineEdit = new QLineEdit; - - findButton = new QPushButton(tr("&Find")); - findText = ""; - - filterButton = new QPushButton(tr("Show Filter Details")); - - QHBoxLayout *simpleFindLayout = new QHBoxLayout; - simpleFindLayout->addWidget(findLabel); - simpleFindLayout->addWidget(lineEdit); - simpleFindLayout->addStretch(1); - simpleFindLayout->addWidget(findButton); - simpleFindLayout->addStretch(1); - - - QHBoxLayout *simpleFilterLayout = new QHBoxLayout; - simpleFilterLayout->addStretch(1); - simpleFilterLayout->addWidget(filterButton); - simpleFilterLayout->addStretch(1); - layout->addLayout(simpleFindLayout); - layout->addLayout(simpleFilterLayout); - layout->addWidget(filterDialog); - - setLayout(layout); - setWindowTitle(tr("Find a Contact")); - connect(findButton, SIGNAL(clicked()), this, SLOT(findClicked())); - connect(findButton, SIGNAL(clicked()), this, SLOT(accept())); - connect(filterButton, SIGNAL(clicked()), this, SLOT(filterClicked())); - connect(filterDialog, SIGNAL(hidden()), this, SLOT(filterHidden())); - - lineEdit->setFocus(); -} - -void FindDialog::findClicked() -{ - QString text = lineEdit->text(); - - if (text.isEmpty()) { - QMessageBox::information(this, tr("Empty Field"), - tr("Please enter a name.")); - return; - } else { - findText = text; - lineEdit->clear(); - hide(); - } -} - -void FindDialog::filterClicked() -{ - simpleFilter = false; - lineEdit->hide(); - findButton->hide(); - findLabel->hide(); - filterButton->hide(); - filterDialog->showDialog(); -} - -void FindDialog::showEvent(QShowEvent *event) -{ - QDialog::showEvent(event); - simpleFilter = true; - filterButton->show(); - filterDialog->hide(); - lineEdit->show(); - findButton->show(); - findLabel->show(); - lineEdit->setFocus(); -} - -void FindDialog::filterHidden() -{ - // was the dialog accepted? - if (filterDialog->status() == 1) { - accept(); - }else{ - reject(); - } -} - -bool FindDialog::isSimpleFilterEnabled() const -{ - return simpleFilter; -} - -QString FindDialog::getFindText() const -{ - return findText; -} - -QContactFilter FindDialog::getFindFilter() const -{ - return filterDialog->filter(); -} diff --git a/examples/samplephonebook/groupdetailsdialog.cpp b/examples/samplephonebook/groupdetailsdialog.cpp deleted file mode 100644 index ee50858bb8..0000000000 --- a/examples/samplephonebook/groupdetailsdialog.cpp +++ /dev/null @@ -1,198 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the Qt Mobility Components. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "groupdetailsdialog.h" - -#include <QtGui> -#include "qcontact.h" -#include "qcontactmanager.h" - -#include "qcontactrelationship.h" -#include "qcontacttype.h" -#include "qcontactdetailfilter.h" - -GroupDetailsDialog::GroupDetailsDialog(QWidget *parent, QContactManager *contactManager, const QContact &contact) - : QDialog(parent), cm(contactManager) -{ - Q_ASSERT(contactManager); - setWindowTitle(tr("Group Details")); - - QFormLayout *layout = new QFormLayout; - -qDebug() << "constructed group details dialog for contact:" << contact.displayLabel(); -qDebug() << " id =" << contact.id().managerUri() << ":" << contact.id().localId(); - - localContact = contact; - contactNameEdit = new QLineEdit(this); - contactNameEdit->setReadOnly(true); - contactNameEdit->setText(contact.displayLabel()); - listWidget = new QListWidget(this); - okButton = new QPushButton(tr("&Ok"), this); - cancelButton = new QPushButton(tr("&Cancel"), this); - - layout->addRow(tr("Contact Name"), contactNameEdit); - layout->addRow(listWidget); - - QHBoxLayout *buttonLayout = new QHBoxLayout; - buttonLayout->addWidget(okButton); - buttonLayout->addWidget(cancelButton); - layout->addRow(buttonLayout); - - setLayout(layout); - - repopulateGroupList(); - - connect(okButton, SIGNAL(clicked()), - this, SLOT(okButtonClicked())); - connect(cancelButton, SIGNAL(clicked()), - this, SLOT(cancelButtonClicked())); - connect(listWidget, SIGNAL(itemChanged(QListWidgetItem *)), - this, SLOT(groupItemChanged(QListWidgetItem *))); -} - - -void GroupDetailsDialog::repopulateGroupList() -{ - listWidget->clear(); - - QContactDetailFilter groupFilter; - groupFilter.setDetailDefinitionName(QContactType::DefinitionName, QContactType::FieldType); - groupFilter.setValue(QString(QLatin1String(QContactType::TypeGroup))); - QList<QContactLocalId> grpList = cm->contacts(groupFilter); - for (int index=0; index < grpList.count(); index++){ - QContact grp = cm->contact(grpList[index]); - QListWidgetItem *item = new QListWidgetItem(grp.displayLabel(), listWidget); - item->setFlags(item->flags() | Qt::ItemIsUserCheckable); - bool foundInGroup = false; - - QContactId groupId; - groupId.setManagerUri(cm->managerUri()); - groupId.setLocalId(grpList[index]); - QList<QContactRelationship> thisGroupsRels = cm->relationships(QContactRelationship::HasMember, groupId, QContactRelationshipFilter::First); - foreach (const QContactRelationship& currRel, thisGroupsRels) { - if (currRel.second() == localContact.id()) { - foundInGroup = true; - break; - } - } - if (foundInGroup) - item->setCheckState(Qt::Checked); - else - item->setCheckState(Qt::Unchecked); - // store the group ID as Qt::UserRole + 1 - item->setData(Qt::UserRole + 1, grpList[index]); - } - -} - -QList<QContactLocalId> GroupDetailsDialog::groups() -{ - QContactId localContactUri = localContact.id(); - QList<QContactRelationship> relationships = cm->relationships(QContactRelationship::HasMember, localContactUri); - QList<QContactLocalId> ret; - foreach (const QContactRelationship& currRel, relationships) { - if (currRel.second() == localContactUri) { - ret.append(currRel.first().localId()); - } - } - return ret; -} - -void GroupDetailsDialog::groupItemChanged(QListWidgetItem * item) -{ - QContactLocalId id = item->data(Qt::UserRole + 1).toUInt(); // id of the group. - QContactId localContactUri = localContact.id(); - QContactId groupId; - groupId.setManagerUri(cm->managerUri()); - groupId.setLocalId(id); - QList<QContactRelationship> relationships = cm->relationships(QContactRelationship::HasMember, localContactUri, QContactRelationshipFilter::Second); - QList<QContactLocalId> currentGroups; - foreach (const QContactRelationship& currRel, relationships) { - currentGroups.append(currRel.first().localId()); - } - -qDebug() << "groups that localcontact is part of:"; -foreach (const QContactLocalId& dbgid, currentGroups) qDebug() << dbgid; - if (item->checkState() == Qt::Checked) { -qDebug() << "item is now checked!"; -qDebug() << "already =" << currentGroups.contains(id); - if (!currentGroups.contains(id)) { -qDebug() << "groupId =" << id; -qDebug() << "localContactId =" << localContactUri.managerUri() << ":" << localContactUri.localId(); - // add it to the group. - QContactRelationship newRelationship; - newRelationship.setFirst(groupId); - newRelationship.setRelationshipType(QContactRelationship::HasMember); - newRelationship.setSecond(localContactUri); - bool success = cm->saveRelationship(&newRelationship); -qDebug() << "succeed adding?" << success; - } - } else { -qDebug() << "item is now unchecked!"; -qDebug() << "already =" << currentGroups.contains(id); - if (currentGroups.contains(id)) { - // remove any membership in that group - QContactRelationship currRel; - currRel.setFirst(groupId); - currRel.setRelationshipType(QContactRelationship::HasMember); - currRel.setSecond(localContactUri); - bool success = cm->removeRelationship(currRel); -qDebug() << "succeed removing?" << success; - } - } -} - -void GroupDetailsDialog::show() -{ - repopulateGroupList(); -} - - -void GroupDetailsDialog::okButtonClicked() -{ - accept(); -} - - -void GroupDetailsDialog::cancelButtonClicked() -{ - reject(); -} diff --git a/examples/samplephonebook/groupeditdialog.cpp b/examples/samplephonebook/groupeditdialog.cpp deleted file mode 100644 index 5acf2e73f4..0000000000 --- a/examples/samplephonebook/groupeditdialog.cpp +++ /dev/null @@ -1,216 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the Qt Mobility Components. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "groupeditdialog.h" - -#include <QtGui> -#include "qcontact.h" -#include "qcontactmanager.h" -#include "qcontactdetailfilter.h" -#include "qcontactname.h" - -GroupEditDialog::GroupEditDialog(QWidget *parent, QContactManager *contactManager) - : QDialog(parent), cm(contactManager) -{ - Q_ASSERT(contactManager); - setWindowTitle(tr("Groups Edit")); - - QFormLayout *layout = new QFormLayout; - - groupNameEdit = new QLineEdit(this); - listWidget = new QListWidget(this); - addButton = new QPushButton(tr("Add"), this); - saveButton = new QPushButton(tr("Save"), this); - deleteButton = new QPushButton(tr("Delete"), this); - doneButton = new QPushButton(tr("Done"), this); - - - layout->addRow(tr("Group Name"), groupNameEdit); - layout->addRow(listWidget); - - QHBoxLayout *row1Layout = new QHBoxLayout; - row1Layout->addWidget(addButton); - row1Layout->addWidget(saveButton); - row1Layout->addWidget(deleteButton); - layout->addRow(row1Layout); - - QHBoxLayout *row2Layout = new QHBoxLayout; - row2Layout->addStretch(1); - row2Layout->addWidget(doneButton); - layout->addRow(row2Layout); - - setLayout(layout); - - repopulateGroupList(); - - connect(addButton, SIGNAL(clicked()), - this, SLOT(addButtonClicked())); - connect(deleteButton, SIGNAL(clicked()), - this, SLOT(deleteButtonClicked())); - connect(saveButton, SIGNAL(clicked()), - this, SLOT(saveButtonClicked())); - connect(doneButton, SIGNAL(clicked()), - this, SLOT(doneButtonClicked())); - connect(listWidget, SIGNAL(itemActivated(QListWidgetItem *)), - this, SLOT(groupItemActivated(QListWidgetItem *))); - connect(listWidget, SIGNAL(currentItemChanged (QListWidgetItem *, QListWidgetItem *)), - this, SLOT(groupItemChanged (QListWidgetItem *, QListWidgetItem *))); -} - - -void GroupEditDialog::repopulateGroupList() -{ - listWidget->clear(); - QContactDetailFilter groupFilter; - groupFilter.setDetailDefinitionName(QContactType::DefinitionName, QContactType::FieldType); - groupFilter.setValue(QString(QLatin1String(QContactType::TypeGroup))); - QList<QContactLocalId> grpList = cm->contacts(groupFilter); - for (int index=0; index < grpList.count(); index++){ - QContact grp = cm->contact(grpList[index]); - QListWidgetItem *item = new QListWidgetItem(grp.displayLabel(), listWidget); - // store the group ID as Qt::UserRole + 1 - item->setData(Qt::UserRole + 1, grpList[index]); - } - -} - -void GroupEditDialog::show() -{ - repopulateGroupList(); -} - -void GroupEditDialog::addButtonClicked() -{ - if (!groupNameEdit->text().isEmpty()){ - QContact grp; - grp.setType(QContactType::TypeGroup); - bool result; - QContactName groupName; - groupName.setCustomLabel(groupNameEdit->text()); - grp.saveDetail(&groupName); - result = cm->saveContact(&grp); - - if (!result){ - QMessageBox::information(this, tr("Group Add"), - tr("Failed to add Group '%1'.").arg(grp.displayLabel())); - }else{ - repopulateGroupList(); - // select the added group name - for (int index = 0; index < listWidget->count();index++){ - if (listWidget->item(index)->data(Qt::UserRole + 1).toUInt() == grp.id().localId()){ - listWidget->setCurrentItem(listWidget->item(index)); - break; - } - } - } - - }else{ - QMessageBox::information(this, tr("Empty Field"), - tr("Please enter a name.")); - groupNameEdit->setFocus(); - } -} - -void GroupEditDialog::saveButtonClicked() -{ - if (listWidget->currentItem()){ - QContactLocalId grpID = listWidget->currentItem()->data(Qt::UserRole + 1).toUInt(); - QContact grp = cm->contact(grpID); - bool result = false; - if (!grp.isEmpty()){ - QContactName groupName; - groupName.setCustomLabel(groupNameEdit->text()); - grp.saveDetail(&groupName); - result = cm->saveContact(&grp); - } - if (!result){ - QMessageBox::information(this, tr("Save Group"), - tr("Failed to save Group '%1'.").arg(listWidget->currentItem()->text())); - }else{ - repopulateGroupList(); - // select the group name again - for (int index = 0; index < listWidget->count();index++){ - if (listWidget->item(index)->data(Qt::UserRole + 1).toUInt() == grp.id().localId()){ - listWidget->setCurrentItem(listWidget->item(index)); - break; - } - } - } - } -} - -void GroupEditDialog::deleteButtonClicked() -{ - if (listWidget->currentItem()){ - int lastCurrentRow = listWidget->currentRow(); - QContactLocalId grpID = listWidget->currentItem()->data(Qt::UserRole + 1).toUInt(); - if (!cm->removeContact(grpID)){ - QMessageBox::information(this, tr("Remove Group"), - tr("Failed to removed Group '%1'.").arg(listWidget->currentItem()->text())); - }else{ - repopulateGroupList(); - if (lastCurrentRow < listWidget->count()){ - listWidget->setCurrentRow(lastCurrentRow); - }else { - if (listWidget->count()) - listWidget->setCurrentRow(listWidget->count() - 1); - } - } - } -} - -void GroupEditDialog::doneButtonClicked() -{ - accept(); -} - -void GroupEditDialog::groupItemActivated(QListWidgetItem * item) -{ - if (item) - groupNameEdit->setText(listWidget->currentItem()->text()); - else - groupNameEdit->clear(); -} - -void GroupEditDialog::groupItemChanged ( QListWidgetItem * current, QListWidgetItem * /*previous*/ ) -{ - groupItemActivated(current); -} diff --git a/examples/samplephonebook/maindialog_240_320.ui b/examples/samplephonebook/maindialog_240_320.ui deleted file mode 100644 index 0c776b4534..0000000000 --- a/examples/samplephonebook/maindialog_240_320.ui +++ /dev/null @@ -1,183 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<ui version="4.0"> - <class>MainDialog240By320</class> - <widget class="QWidget" name="MainDialog240By320"> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>263</width> - <height>320</height> - </rect> - </property> - <property name="palette"> - <palette> - <active> - <colorrole role="Button"> - <brush brushstyle="SolidPattern"> - <color alpha="255"> - <red>232</red> - <green>231</green> - <blue>230</blue> - </color> - </brush> - </colorrole> - <colorrole role="Base"> - <brush brushstyle="SolidPattern"> - <color alpha="255"> - <red>255</red> - <green>255</green> - <blue>255</blue> - </color> - </brush> - </colorrole> - </active> - <inactive> - <colorrole role="Button"> - <brush brushstyle="SolidPattern"> - <color alpha="255"> - <red>232</red> - <green>231</green> - <blue>230</blue> - </color> - </brush> - </colorrole> - <colorrole role="Base"> - <brush brushstyle="SolidPattern"> - <color alpha="255"> - <red>255</red> - <green>255</green> - <blue>255</blue> - </color> - </brush> - </colorrole> - </inactive> - <disabled> - <colorrole role="Button"> - <brush brushstyle="SolidPattern"> - <color alpha="255"> - <red>145</red> - <green>144</green> - <blue>144</blue> - </color> - </brush> - </colorrole> - <colorrole role="Base"> - <brush brushstyle="SolidPattern"> - <color alpha="255"> - <red>185</red> - <green>185</green> - <blue>185</blue> - </color> - </brush> - </colorrole> - </disabled> - </palette> - </property> - <property name="windowTitle"> - <string>Dialog</string> - </property> - <layout class="QVBoxLayout" name="verticalLayout"> - <item> - <widget class="QListWidget" name="contactListWidget"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Expanding"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - </widget> - </item> - <item> - <layout class="QHBoxLayout" name="horizontalLayout"> - <item> - <widget class="QPushButton" name="openButton"> - <property name="text"> - <string>Open</string> - </property> - </widget> - </item> - <item> - <widget class="QPushButton" name="addButton"> - <property name="text"> - <string>Add</string> - </property> - </widget> - </item> - <item> - <widget class="QPushButton" name="deleteButton"> - <property name="text"> - <string>Delete</string> - </property> - </widget> - </item> - </layout> - </item> - <item> - <layout class="QHBoxLayout" name="horizontalLayout_2"> - <item> - <widget class="QPushButton" name="findButton"> - <property name="text"> - <string>Find</string> - </property> - </widget> - </item> - <item> - <widget class="QPushButton" name="importButton"> - <property name="toolTip"> - <string>Import contact from vCard file</string> - </property> - <property name="text"> - <string>Import</string> - </property> - </widget> - </item> - <item> - <widget class="QPushButton" name="exportButton"> - <property name="toolTip"> - <string>Export contact as vCard file</string> - </property> - <property name="text"> - <string>Export</string> - </property> - </widget> - </item> - </layout> - </item> - <item> - <layout class="QHBoxLayout" name="horizontalLayout_3"> - <item> - <widget class="QLabel" name="label_7"> - <property name="text"> - <string>Current Backend:</string> - </property> - </widget> - </item> - <item> - <widget class="QComboBox" name="contactEngineComboBox"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - </widget> - </item> - </layout> - </item> - <item> - <layout class="QHBoxLayout" name="horizontalLayout_4"> - <item> - <widget class="QLabel" name="contactStatusLabel"> - <property name="text"> - <string>Contact 0 of 0 (Unsaved)</string> - </property> - </widget> - </item> - </layout> - </item> - </layout> - </widget> - <resources/> - <connections/> -</ui> diff --git a/examples/samplephonebook/maindialog_640_480.ui b/examples/samplephonebook/maindialog_640_480.ui deleted file mode 100644 index ed60c56b44..0000000000 --- a/examples/samplephonebook/maindialog_640_480.ui +++ /dev/null @@ -1,350 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<ui version="4.0"> - <class>MainDialog640By480</class> - <widget class="QWidget" name="MainDialog640By480"> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>640</width> - <height>480</height> - </rect> - </property> - <property name="palette"> - <palette> - <active> - <colorrole role="Button"> - <brush brushstyle="SolidPattern"> - <color alpha="255"> - <red>232</red> - <green>231</green> - <blue>230</blue> - </color> - </brush> - </colorrole> - <colorrole role="Base"> - <brush brushstyle="SolidPattern"> - <color alpha="255"> - <red>255</red> - <green>255</green> - <blue>255</blue> - </color> - </brush> - </colorrole> - </active> - <inactive> - <colorrole role="Button"> - <brush brushstyle="SolidPattern"> - <color alpha="255"> - <red>232</red> - <green>231</green> - <blue>230</blue> - </color> - </brush> - </colorrole> - <colorrole role="Base"> - <brush brushstyle="SolidPattern"> - <color alpha="255"> - <red>255</red> - <green>255</green> - <blue>255</blue> - </color> - </brush> - </colorrole> - </inactive> - <disabled> - <colorrole role="Button"> - <brush brushstyle="SolidPattern"> - <color alpha="255"> - <red>130</red> - <green>129</green> - <blue>129</blue> - </color> - </brush> - </colorrole> - <colorrole role="Base"> - <brush brushstyle="SolidPattern"> - <color alpha="255"> - <red>170</red> - <green>170</green> - <blue>170</blue> - </color> - </brush> - </colorrole> - </disabled> - </palette> - </property> - <property name="windowTitle"> - <string>Dialog</string> - </property> - <layout class="QGridLayout" name="gridLayout"> - <item row="0" column="0" rowspan="4"> - <widget class="QListWidget" name="contactListWidget"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Expanding"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - </widget> - </item> - <item row="0" column="1" rowspan="3"> - <layout class="QVBoxLayout" name="verticalLayout_2"> - <item> - <layout class="QHBoxLayout" name="horizontalLayout"> - <item> - <widget class="QLabel" name="contactLabel"> - <property name="text"> - <string>Name:</string> - </property> - </widget> - </item> - <item> - <widget class="QLineEdit" name="nameEdit"/> - </item> - </layout> - </item> - <item> - <layout class="QHBoxLayout" name="horizontalLayout_2"> - <item> - <widget class="QLabel" name="avatarLabel"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Ignored" vsizetype="Ignored"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>Avatar:</string> - </property> - </widget> - </item> - <item> - <widget class="QPushButton" name="avatarButton"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Minimum" vsizetype="Minimum"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize"> - <size> - <width>0</width> - <height>30</height> - </size> - </property> - <property name="text"> - <string>Select</string> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="avatarPixmapLabel"> - <property name="text"> - <string/> - </property> - </widget> - </item> - </layout> - </item> - <item> - <layout class="QHBoxLayout" name="horizontalLayout_3"> - <item> - <widget class="QLabel" name="emailLabel"> - <property name="text"> - <string>Email:</string> - </property> - </widget> - </item> - <item> - <widget class="QLineEdit" name="emailEdit"/> - </item> - </layout> - </item> - <item> - <layout class="QHBoxLayout" name="horizontalLayout_4"> - <item> - <widget class="QLabel" name="homePhoneLabel"> - <property name="text"> - <string>Home Phone:</string> - </property> - </widget> - </item> - <item> - <widget class="QLineEdit" name="homePhoneEdit"/> - </item> - </layout> - </item> - <item> - <layout class="QHBoxLayout" name="horizontalLayout_5"> - <item> - <widget class="QLabel" name="workPhoneLabel"> - <property name="text"> - <string>Work Phone:</string> - </property> - </widget> - </item> - <item> - <widget class="QLineEdit" name="workPhoneEdit"/> - </item> - </layout> - </item> - <item> - <layout class="QHBoxLayout" name="horizontalLayout_8"> - <item> - <widget class="QLabel" name="mobilePhoneLabel"> - <property name="text"> - <string>Mobile Phone:</string> - </property> - </widget> - </item> - <item> - <widget class="QLineEdit" name="mobilePhoneEdit"/> - </item> - </layout> - </item> - <item> - <layout class="QHBoxLayout" name="horizontalLayout_9"> - <item> - <widget class="QLabel" name="groupLabel"> - <property name="text"> - <string>Groups:</string> - </property> - </widget> - </item> - <item> - <widget class="QPushButton" name="groupsButton"> - <property name="text"> - <string>Group Details</string> - </property> - </widget> - </item> - </layout> - </item> - <item> - <layout class="QHBoxLayout" name="horizontalLayout_7"> - <item> - <widget class="QLabel" name="addressLabel"> - <property name="text"> - <string>Address</string> - </property> - </widget> - </item> - <item> - <widget class="QPlainTextEdit" name="addressEdit"/> - </item> - </layout> - </item> - </layout> - </item> - <item row="0" column="2"> - <spacer name="verticalSpacer"> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>52</height> - </size> - </property> - </spacer> - </item> - <item row="1" column="2"> - <layout class="QVBoxLayout" name="verticalLayout"> - <item> - <widget class="QPushButton" name="addButton"> - <property name="text"> - <string>Add</string> - </property> - </widget> - </item> - <item> - <widget class="QPushButton" name="saveButton"> - <property name="text"> - <string>Save</string> - </property> - </widget> - </item> - <item> - <widget class="QPushButton" name="deleteButton"> - <property name="text"> - <string>Delete</string> - </property> - </widget> - </item> - <item> - <widget class="QPushButton" name="findButton"> - <property name="text"> - <string>Find</string> - </property> - </widget> - </item> - <item> - <widget class="QPushButton" name="importButton"> - <property name="toolTip"> - <string>Import contact from vCard file</string> - </property> - <property name="text"> - <string>Import</string> - </property> - </widget> - </item> - <item> - <widget class="QPushButton" name="exportButton"> - <property name="toolTip"> - <string>Export contact as vCard file</string> - </property> - <property name="text"> - <string>Export</string> - </property> - </widget> - </item> - <item> - <widget class="QPushButton" name="quitButton"> - <property name="text"> - <string>Quit</string> - </property> - </widget> - </item> - </layout> - </item> - <item row="2" column="2"> - <spacer name="verticalSpacer_2"> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>112</height> - </size> - </property> - </spacer> - </item> - <item row="3" column="1" colspan="2"> - <layout class="QHBoxLayout" name="horizontalLayout_6"> - <item> - <widget class="QLabel" name="currentBackendLabel"> - <property name="text"> - <string>Current Backend:</string> - </property> - </widget> - </item> - <item> - <widget class="QComboBox" name="contactEngineComboBox"/> - </item> - <item> - <widget class="QLabel" name="contactStatusLabel"> - <property name="text"> - <string>Contact 0 of 0 (Unsaved)</string> - </property> - </widget> - </item> - </layout> - </item> - </layout> - </widget> - <resources/> - <connections/> -</ui> diff --git a/examples/samplephonebook/maindialogform_240_320.cpp b/examples/samplephonebook/maindialogform_240_320.cpp deleted file mode 100644 index f9a81b9a71..0000000000 --- a/examples/samplephonebook/maindialogform_240_320.cpp +++ /dev/null @@ -1,56 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the Qt Mobility Components. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - - -#include "maindialogform_240_320.h" - - -MainDialogForm240By320::MainDialogForm240By320(QWidget *parent) - :QWidget(parent) -{ - setupUi(this); -} - - -MainDialogForm240By320::~MainDialogForm240By320() -{ -} - diff --git a/examples/samplephonebook/maindialogform_240_320.h b/examples/samplephonebook/maindialogform_240_320.h deleted file mode 100644 index 0906105e97..0000000000 --- a/examples/samplephonebook/maindialogform_240_320.h +++ /dev/null @@ -1,49 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the Qt Mobility Components. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "ui_maindialog_240_320.h" - -class MainDialogForm240By320 : public QWidget, Ui::MainDialog240By320 -{ -public: - MainDialogForm240By320(QWidget *parent); - ~MainDialogForm240By320(); -}; diff --git a/examples/samplephonebook/maindialogform_640_480.cpp b/examples/samplephonebook/maindialogform_640_480.cpp deleted file mode 100644 index d572cdb686..0000000000 --- a/examples/samplephonebook/maindialogform_640_480.cpp +++ /dev/null @@ -1,56 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the Qt Mobility Components. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - - -#include "maindialogform_640_480.h" - - -MainDialogForm640By480::MainDialogForm640By480(QWidget *parent) - :QWidget(parent) -{ - setupUi(this); -} - - -MainDialogForm640By480::~MainDialogForm640By480() -{ -} - diff --git a/examples/samplephonebook/maindialogform_640_480.h b/examples/samplephonebook/maindialogform_640_480.h deleted file mode 100644 index fc486b6311..0000000000 --- a/examples/samplephonebook/maindialogform_640_480.h +++ /dev/null @@ -1,50 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the Qt Mobility Components. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - - -#include "ui_maindialog_640_480.h" - -class MainDialogForm640By480 : public QWidget, Ui::MainDialog640By480 -{ -public: - MainDialogForm640By480(QWidget *parent); - ~MainDialogForm640By480(); -}; diff --git a/examples/samplephonebook/phonebook.cpp b/examples/samplephonebook/phonebook.cpp index 954a9982b0..088fb596d0 100644 --- a/examples/samplephonebook/phonebook.cpp +++ b/examples/samplephonebook/phonebook.cpp @@ -40,706 +40,67 @@ ****************************************************************************/ #include "phonebook.h" -#include "serialiser.h" -#include "contactdetailsform.h" -#include "maindialogform_640_480.h" -#include "maindialogform_240_320.h" -#include "groupeditdialog.h" -#include "groupdetailsdialog.h" -#include <QDesktopWidget> +#include "contactlistpage.h" +#include "contacteditor.h" +#include "filterpage.h" #include <QtGui> PhoneBook::PhoneBook(QWidget *parent) - : QWidget(parent), dialog(0), addingContact(false), editingContact(false) + : QWidget(parent) { + m_editorPage = new ContactEditor(this); + connect(m_editorPage, SIGNAL(showListPage()), this, SLOT(activateList())); - QVBoxLayout *layout = new QVBoxLayout; + m_filterPage = new FilterPage(this); + connect(m_filterPage, SIGNAL(showListPage(QContactFilter)), this, SLOT(activateList(QContactFilter))); - QDesktopWidget screenWidget; + m_listPage = new ContactListPage(this); + connect(m_listPage, SIGNAL(showEditorPage(QContactLocalId)), this, SLOT(activateEditor(QContactLocalId))); + connect(m_listPage, SIGNAL(showFilterPage(QContactFilter)), this, SLOT(activateFind())); + connect(m_listPage, SIGNAL(managerChanged(QContactManager*)), this, SLOT(managerChanged(QContactManager*))); - if (QApplication::desktop()->width() > 480){ - smallScreenSize = false; - mainDialogForm640By480 = new MainDialogForm640By480(this); - mainForm = mainDialogForm640By480; - detailsForm = mainForm; - layout->addWidget(mainForm); - setLayout(layout); - }else{ - smallScreenSize = true; - mainDialogForm240By320 = new MainDialogForm240By320(this); - contactDetailsForm = new ContactDetailsForm(mainDialogForm240By320); - mainForm = mainDialogForm240By320; - detailsForm = contactDetailsForm; - layout->addWidget(mainForm); - setLayout(layout); - showMaximized(); - } + m_stackedWidget = new QStackedWidget(this); + m_stackedWidget->addWidget(m_listPage); + m_stackedWidget->addWidget(m_editorPage); + m_stackedWidget->addWidget(m_filterPage); + m_stackedWidget->setCurrentIndex(0); + QVBoxLayout *centralLayout = new QVBoxLayout; + centralLayout->addWidget(m_stackedWidget); - addButton = qFindChild<QPushButton*>(mainForm, "addButton"); - openButton = qFindChild<QPushButton*>(mainForm, "openButton"); - removeButton = qFindChild<QPushButton*>(mainForm, "deleteButton"); - findButton = qFindChild<QPushButton*>(mainForm, "findButton"); - importButton = qFindChild<QPushButton*>(mainForm, "importButton"); - exportButton = qFindChild<QPushButton*>(mainForm, "exportButton"); - avatarButton = qFindChild<QPushButton*>(mainForm, "avatarButton"); - quitButton = qFindChild<QPushButton*>(mainForm, "quitButton"); - if(!avatarButton) - avatarButton = qFindChild<QPushButton*>(detailsForm, "avatarButton"); - saveButton = qFindChild<QPushButton*>(mainForm, "saveButton"); - if(!saveButton) - saveButton = qFindChild<QPushButton*>(detailsForm, "saveButton"); - cancelButton = qFindChild<QPushButton*>(detailsForm, "cancelButton"); - groupsButton = qFindChild<QPushButton*>(detailsForm, "groupsButton"); - - avatarButton->installEventFilter(this); - - removeButton->setEnabled(false); - findButton->setEnabled(false); - saveButton->setEnabled(true); - exportButton->setEnabled(false); - - nameLine = qFindChild<QLineEdit*>(detailsForm, "nameEdit"); - avatarPixmapLabel = qFindChild<QLabel*>(detailsForm, "avatarPixmapLabel"); - emailLine = qFindChild<QLineEdit*>(detailsForm, "emailEdit"); - homePhoneLine = qFindChild<QLineEdit*>(detailsForm, "homePhoneEdit"); - workPhoneLine = qFindChild<QLineEdit*>(detailsForm, "workPhoneEdit"); - mobilePhoneLine = qFindChild<QLineEdit*>(detailsForm, "mobilePhoneEdit"); - addressText = qFindChild<QPlainTextEdit*>(detailsForm, "addressEdit"); - contactsList = qFindChild<QListWidget*>(mainForm, "contactListWidget"); - currentIndexLabel = qFindChild<QLabel*>(mainForm, "contactStatusLabel"); - backendCombo = qFindChild<QComboBox*>(mainForm, "contactEngineComboBox"); - - QStringList availableManagers = QContactManager::availableManagers(); - foreach (const QString manager, availableManagers) - backendCombo->addItem(manager); - connect(backendCombo, SIGNAL(currentIndexChanged(QString)), this, SLOT(backendSelected(QString))); - - if(cancelButton) - connect(cancelButton, SIGNAL(clicked()), this, SLOT(cancelContact())); - if(openButton){ - connect(openButton, SIGNAL(clicked()), this, SLOT(openContact())); - openButton->setEnabled(false); - } - connect(avatarButton, SIGNAL(clicked()), this, SLOT(selectAvatar())); - connect(addButton, SIGNAL(clicked()), this, SLOT(addContact())); - connect(saveButton, SIGNAL(clicked()), this, SLOT(saveContact())); - connect(removeButton, SIGNAL(clicked()), this, SLOT(removeContact())); - connect(findButton, SIGNAL(clicked()), this, SLOT(findContact())); - connect(importButton, SIGNAL(clicked()), this, SLOT(importFromVCard())); - connect(exportButton, SIGNAL(clicked()), this, SLOT(exportAsVCard())); - if(quitButton) - connect(quitButton, SIGNAL(clicked()), this, SLOT(close())); - connect(groupsButton, SIGNAL(clicked()), this, SLOT(editGroupDetails())); - connect(contactsList, SIGNAL(currentRowChanged(int)), this, SLOT(contactSelected(int))); - if (smallScreenSize){ - connect(detailsForm, SIGNAL(accepted()), this, SLOT(saveContact())); - connect(detailsForm, SIGNAL(rejected()), this, SLOT(cancelContact())); - } - setWindowTitle(tr("Sample Phone Book")); - // instantiate a new contact manager - cm = 0; - backendSelected(backendCombo->currentText()); - + setLayout(centralLayout); } PhoneBook::~PhoneBook() { - foreach (const QContactManager* manager, managers.values()) - delete manager; -} - -void PhoneBook::backendChanged(const QList<QContactLocalId>& changes) -{ - // load all contacts from the updated backend - QContactDetailFilter contactFilter; - contactFilter.setDetailDefinitionName(QContactType::DefinitionName, QContactType::FieldType); - contactFilter.setValue(QString(QLatin1String(QContactType::TypeContact))); - QList<QContactLocalId> contactIds = cm->contacts(contactFilter); - contacts.clear(); - foreach (const QContactLocalId cid, contactIds) - contacts.append(cm->contact(cid)); -qDebug() << "backend changed, and now have" << contactIds.size() << "contacts which are TypeContact!"; - - // if there are no contacts in the backend any more, we add a new, unsaved contact - // otherwise, display the current one. Either way, need to repopulate the list. - populateList(cm->contact(changes.value(0))); // this may fail if the change was a removal. - if (!contacts.isEmpty()){ - displayContact(); - } else { - nameLine->setText(QString()); - emailLine->setText(QString()); - homePhoneLine->setText(QString()); - workPhoneLine->setText(QString()); - mobilePhoneLine->setText(QString()); - addressText->setPlainText(QString()); - avatarPixmapLabel->clear(); - updateButtons(); - } -} - -void PhoneBook::backendSelected(const QString& backend) -{ - currentIndex = -1; - - // first, disconnect any signals from the current manager - if (cm) - cm->disconnect(); - - // then, load the selected manager (or create it if it doesn't exist) - if (managers.value(backend, 0) != 0) { - cm = managers.value(backend); - } else { - cm = new QContactManager(backend); - managers.insert(backend, cm); - } - - // and connect the selected manager's signals to our slots - connect(cm, SIGNAL(contactsAdded(const QList<QContactLocalId>&)), this, SLOT(backendChanged(const QList<QContactLocalId>&))); - connect(cm, SIGNAL(contactsChanged(const QList<QContactLocalId>&)), this, SLOT(backendChanged(const QList<QContactLocalId>&))); - connect(cm, SIGNAL(contactsRemoved(const QList<QContactLocalId>&)), this, SLOT(backendChanged(const QList<QContactLocalId>&))); - - // and trigger an update. - backendChanged(QList<QContactLocalId>()); -} - -bool PhoneBook::eventFilter(QObject* watched, QEvent* event) -{ - if (watched == avatarButton && event->type() == QEvent::Resize) { - QResizeEvent *re = (QResizeEvent*)event; - QSize trim(20,20); - QSize newSize = re->size(); - newSize -= trim; - avatarButton->setIconSize(newSize); - return true; - } - - return false; -} - -void PhoneBook::contactSelected(int row) -{ - if (row < 0) - return; - - while (currentIndex > row) { - previous(); - } - - while (currentIndex < row) { - next(); - } -} - -void PhoneBook::populateList(const QContact& currentContact) -{ - // first, we sort the contacts according to display name - // then we populate the list widget. - QList<QContact> sorted; - if (contacts.size() > 0) { - sorted.append(contacts.at(0)); - contacts.removeFirst(); - } - - // sort the list. - foreach (const QContact& contact, contacts) { - bool inserted = false; - for (int i = 0; i < sorted.size(); i++) { - // first, retrieve the display labels from each contact - QContact sortedContact = sorted.at(i); - QContactDisplayLabel cdl = contact.detail(QContactDisplayLabel::DefinitionName); - QContactDisplayLabel sdl = sortedContact.detail(QContactDisplayLabel::DefinitionName); - - // compare the display labels, and insert into list. - if (cdl.label().toLower() < sdl.label().toLower()) { - sorted.insert(i, contact); - inserted = true; - break; - } - } - - if (!inserted) { - sorted.append(contact); - } - } - - // replace our member list. - contacts = sorted; - - // and repopulate the list widget. - contactsList->clear(); - foreach (const QContact& contact, contacts) { - new QListWidgetItem(contact.displayLabel(), contactsList); - } - - // now find out what our new current index is - currentIndex = 0; - for (int i = 0; i < contacts.size(); i++) { - if (contacts.at(i) == currentContact) { - currentIndex = i; - break; - } - } - - // and set the selection in the list widget. - contactsList->setCurrentRow(currentIndex); -} - -QContact PhoneBook::buildContact() const -{ - // builds the contact from the current index / current UI. - QContact c; - QContactName contactName = buildName(nameLine->text()); - c.saveDetail(&contactName); - - QContactEmailAddress emailAddress; - emailAddress.setEmailAddress(emailLine->text()); - c.saveDetail(&emailAddress); - - QContactPhoneNumber homePhone; - homePhone.setNumber(homePhoneLine->text()); - homePhone.setContexts(QStringList(QContactDetail::ContextHome)); - homePhone.setSubTypes(QStringList(QContactPhoneNumber::SubTypeLandline)); - homePhone.setSubTypes(QStringList(QContactPhoneNumber::SubTypeVoice)); - c.saveDetail(&homePhone); - - QContactPhoneNumber workPhone; - workPhone.setNumber(workPhoneLine->text()); - workPhone.setContexts(QStringList(QContactDetail::ContextWork)); - workPhone.setSubTypes(QStringList(QContactPhoneNumber::SubTypeLandline)); - workPhone.setSubTypes(QStringList(QContactPhoneNumber::SubTypeVoice)); - c.saveDetail(&workPhone); - - QContactPhoneNumber mobilePhone; - mobilePhone.setNumber(mobilePhoneLine->text()); - mobilePhone.setSubTypes(QStringList(QContactPhoneNumber::SubTypeMobile)); - c.saveDetail(&mobilePhone); - - // note that we abuse the "street" field in this example. - QContactAddress address; - address.setStreet(addressText->toPlainText()); - address.setSubTypes(QStringList() << QContactAddress::SubTypeDomestic << QContactAddress::SubTypeParcel << QContactAddress::SubTypePostal); - if (!address.street().isEmpty()) - c.saveDetail(&address); - - return c; -} - -/*! - * Build QContactName with one of the following set: - * 1. custom label, 2. first name, 3. last name - * If none is supported the returned QContactName is left empty. - */ -QContactName PhoneBook::buildName(const QString &name) const -{ - QContactName contactName; - QContactDetailDefinition nameDef = cm->detailDefinition(QContactName::DefinitionName, QContactType::TypeContact); - if(nameDef.fields().contains(QContactName::FieldCustomLabel)) { - contactName.setCustomLabel(name); - } else if(nameDef.fields().contains(QContactName::FieldFirst)) { - contactName.setFirst(name); - } else if(nameDef.fields().contains(QContactName::FieldLast)) { - contactName.setLast(name); - } - return contactName; -} - -void PhoneBook::displayContact() -{ - QContact c = contacts.value(currentIndex); - c = cm->contact(c.id().localId()); // this removes any unsaved information. - - QContactId contactUri = c.id(); - QList<QContactRelationship> relationships = cm->relationships(QContactRelationship::HasMember, contactUri); - QList<QContactLocalId> currentGroups; - foreach (const QContactRelationship& currRel, relationships) { - if (currRel.second() == contactUri) { - currentGroups.append(currRel.first().localId()); - } - } - contactGroups = currentGroups; - - // display the name - nameLine->setText(c.displayLabel()); - - // display the email address - emailLine->setText(c.detail(QContactEmailAddress::DefinitionName).value(QContactEmailAddress::FieldEmailAddress)); - - // display the phone numbers - QList<QContactDetail> phns = c.details(QContactPhoneNumber::DefinitionName); - bool foundHomePhone = false; - bool foundWorkPhone = false; - bool foundMobilePhone = false; - for (int i = 0; i < phns.size(); i++) { - QContactPhoneNumber current = phns.at(i); - if (current.subTypes().contains(QContactPhoneNumber::SubTypeMobile)) { - mobilePhoneLine->setText(current.number()); - foundMobilePhone = true; - } else if (current.contexts().contains(QContactDetail::ContextWork)) { - workPhoneLine->setText(current.number()); - foundWorkPhone = true; - } else { - homePhoneLine->setText(current.number()); - foundHomePhone = true; - } - } - - if (!foundHomePhone) - homePhoneLine->setText(""); - if (!foundWorkPhone) - workPhoneLine->setText(""); - if (!foundMobilePhone) - mobilePhoneLine->setText(""); - - // display the address - again, we abuse the street() field. - addressText->setPlainText((QContactAddress(c.detail(QContactAddress::DefinitionName))).street()); - - // and build the avatar filename and display it if it exists. - QString avatarFile = c.detail(QContactAvatar::DefinitionName).value(QContactAvatar::FieldAvatar); - if (avatarFile.isNull() || avatarFile.isEmpty()) { - avatarPixmapLabel->clear(); - } else { - QPixmap avatarPix(avatarFile); - avatarPixmapLabel->setPixmap(avatarPix.scaled(avatarPixmapLabel->size())); - } - - updateButtons(); - -} - -void PhoneBook::selectAvatar() -{ - //determine the list of file formats to pass to QFileDialog::getOpenFileName() - QString supportedImageFormats; - for (int formatIndex = 0; formatIndex < QImageReader::supportedImageFormats().count(); formatIndex++) { - supportedImageFormats += QLatin1String(" *.") + QImageReader::supportedImageFormats()[formatIndex]; - } - - QString selected = QFileDialog::getOpenFileName(detailsForm, "Select avatar image file", ".", tr("Images (%1)").arg(supportedImageFormats)); - if (!selected.isNull()) { - QContact curr = contacts.at(currentIndex); - QContactAvatar av = curr.detail(QContactAvatar::DefinitionName); - av.setAvatar(selected); - curr.saveDetail(&av); - contacts.replace(currentIndex, curr); - - QPixmap avatarPix; - if (avatarPix.load(selected)){ - avatarPixmapLabel->setPixmap(avatarPix.scaled(avatarPixmapLabel->size())); - }else{ - qWarning() << "Unable to load avatar" << selected; - qWarning() << "Supported image formats are " << supportedImageFormats << " ;" << QImageReader::supportedImageFormats(); - avatarPixmapLabel->clear(); - } - } -} - -void PhoneBook::addContact() -{ - if (addingContact) - saveContact(); - - QMessageBox msgBox(QMessageBox::Question, tr("Add Contact or Group"), tr("Add Contact or Group"), QMessageBox::NoButton, this); - QAbstractButton *addContactButton = msgBox.addButton(tr("Add Contact"), QMessageBox::YesRole); - (void*)msgBox.addButton(tr("Add Group"), QMessageBox::NoRole); - (void)msgBox.exec(); - if(msgBox.clickedButton() == addContactButton){ - addingContact = true; - lastIndex = currentIndex; - currentIndex = contacts.size(); - contacts.append(QContact()); - displayContact(); - nameLine->setFocus(); - if (smallScreenSize){ - contactDetailsForm->showMaximized(); - if (contactDetailsForm->exec() == QDialog::Accepted) - saveContact(); - } - }else{ - // Groups will be modified in QContactManager by dialog - GroupEditDialog grpDialog(this, cm); - if (smallScreenSize) - grpDialog.showMaximized(); - (void)grpDialog.exec(); - } -} - -void PhoneBook::saveContact() -{ - if (smallScreenSize && !(addingContact || editingContact)) - return; - - addingContact = false; - editingContact = false; - if (smallScreenSize){ - contactDetailsForm->accept(); - showMaximized(); - } - - QContact c = buildContact(); - c.setId(contacts.at(currentIndex).id()); - QContactAvatar av = contacts.at(currentIndex).detail(QContactAvatar::DefinitionName); - c.saveDetail(&av); - - if (!cm->saveContact(&c)) { - QString errorCode = "Unable to save the contact in the database; error code:" + QString::number(cm->error()); - QMessageBox::information(this, "Save Failed", errorCode); - return; - } } -void PhoneBook::updateButtons() +void PhoneBook::activateEditor(QContactLocalId contactId) { - QString currentState = "Unsaved"; - if (!contacts.count() || (contacts.at(currentIndex).id() == QContactId())) { - addButton->setEnabled(true); - findButton->setEnabled(false); - exportButton->setEnabled(false); - removeButton->setEnabled(false); - saveButton->setEnabled(addingContact || editingContact); - if(openButton) - openButton->setEnabled(false); - if (!smallScreenSize){ - nameLine->setEnabled(addingContact); - emailLine->setEnabled(addingContact); - homePhoneLine->setEnabled(addingContact); - workPhoneLine->setEnabled(addingContact); - mobilePhoneLine->setEnabled(addingContact); - addressText->setEnabled(addingContact); - avatarButton->setEnabled(addingContact); - } - } else { - addButton->setEnabled(!(addingContact || editingContact)); - findButton->setEnabled(true); - exportButton->setEnabled(true); - removeButton->setEnabled(true); - saveButton->setEnabled((mainForm == detailsForm) || addingContact || editingContact); - if(openButton) - openButton->setEnabled(true); - if (!smallScreenSize){ - nameLine->setEnabled(true); - emailLine->setEnabled(true); - homePhoneLine->setEnabled(true); - workPhoneLine->setEnabled(true); - mobilePhoneLine->setEnabled(true); - addressText->setEnabled(true); - avatarButton->setEnabled(true); - } - currentState = "Saved"; - } - importButton->setEnabled(!(addingContact || editingContact)); - - // update the UI depending on the current state. - int contactNumber = (contacts.isEmpty() ? 0 : currentIndex + 1); - QString currentIndexLabelString = tr("Contact %1 of %2 (%3)").arg(contactNumber).arg(contacts.size()).arg(currentState); - currentIndexLabel->setText(currentIndexLabelString); + m_editorPage->setCurrentContact(m_manager, contactId); + m_stackedWidget->setCurrentIndex(1); // list = 0, editor = 1, find = 2. } -void PhoneBook::removeContact() -{ - if (currentIndex < 0) - return; - QContact current = contacts.at(currentIndex); - QContactDisplayLabel cdl = current.detail(QContactDisplayLabel::DefinitionName); - QString contactName = cdl.label(); - int button = QMessageBox::question(this, - tr("Confirm Remove"), - tr("Are you sure you want to remove \"%1\"?").arg(contactName), - QMessageBox::Yes | QMessageBox::No); - - if (button == QMessageBox::Yes) { - cm->removeContact(contacts.at(currentIndex).id().localId()); - QMessageBox::information(this, tr("Remove Successful"), - tr("\"%1\" has been removed from your phone book.").arg(contactName)); - } - updateButtons(); +void PhoneBook::activateList(const QContactFilter& filter) +{ + m_currentFilter = filter; + activateList(); // call base now. } -void PhoneBook::next() +void PhoneBook::activateList() { - // we should display the next contact - currentIndex += 1; - displayContact(); + m_listPage->rebuildList(m_currentFilter); + m_stackedWidget->setCurrentIndex(0); // list = 0, editor = 1, find = 2. } -void PhoneBook::previous() +void PhoneBook::activateFind() { - // first, check to see if the current index is saved. - // if not, we delete it. - if (contacts.at(currentIndex).id() == QContactId()) { - contacts.removeAt(currentIndex); - } - - // we should display the previous contact - currentIndex -= 1; - displayContact(); + m_stackedWidget->setCurrentIndex(2); // list = 0, editor = 1, find = 2. } -void PhoneBook::findContact() +void PhoneBook::managerChanged(QContactManager *manager) { - - dialog = new FindDialog(this); - - if (smallScreenSize) - dialog->showMaximized(); - - if (dialog->exec() == QDialog::Accepted) { - bool found = false; - if (dialog->isSimpleFilterEnabled()){ - QString contactName = dialog->getFindText(); - // XXX TODO: use QContactManager::contactsWithDetail - for (int i = 0; i < contacts.size(); i++) { - QContact current = contacts.at(i); - QContactDisplayLabel cdl = current.detail(QContactDisplayLabel::DefinitionName); - if (cdl.label() == contactName) { - contactsList->setCurrentRow(i); - contactSelected(i); - found = true; - break; - } - } - if (!found) { - QMessageBox::information(this, tr("Contact Not Found"), - tr("Sorry, \"%1\" is not in your address book.").arg(contactName)); - } - }else{ - QList<QContactLocalId> matchedContacts = cm->contacts(dialog->getFindFilter()); - if (matchedContacts.count()){ - QStringList matchedContactNames; - QContact matchedContact; - contactsList->clearSelection(); - // find the names of contacts that match - for (int index = 0; index < matchedContacts.count(); index++){ - matchedContact = cm->contact(matchedContacts[index]); - if (!matchedContact.isEmpty()) - matchedContactNames.append("\"" + matchedContact.displayLabel() + "\""); - } - QMessageBox::information(this, tr("Contact(s) Found"), tr("Matched contact(s): %1").arg(matchedContactNames.join(","))); - }else{ - QMessageBox::information(this, tr("Contact not Found"), tr("No contacts in your addressbook match filter")); - } - } - } - delete dialog; - dialog = 0; - if (smallScreenSize) - showMaximized(); -} - -void PhoneBook::openContact() -{ - editingContact = true; - displayContact(); - if (smallScreenSize){ - nameLine->setFocus(); - if (contactDetailsForm->exec() == QDialog::Accepted) - saveContact(); - }else{ - detailsForm->show(); - } -} - -void PhoneBook::cancelContact() -{ - if (smallScreenSize && !(addingContact || editingContact)) - return; - - addingContact = false; - editingContact = false; - if (smallScreenSize){ - contactDetailsForm->reject(); - showMaximized(); - } - currentIndex = lastIndex; - updateButtons(); -} - -void PhoneBook::importFromVCard() -{ - QString importFile = QFileDialog::getOpenFileName(this, "Select vCard file to import", ".", "*.vcf"); - if (importFile.isNull()) - return; - - // import the vcard - QContact importedContact; - - // read in the file that we are importing - QFile file(importFile); - if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) { - QMessageBox::information(this, tr("Import Failed"), - tr("Sorry, unable to import \"%1\".").arg(importFile)); - return; - } - - QTextStream in(&file); - QStringList vcardLines; - while (!in.atEnd()) { - vcardLines << in.readLine(); - } - - if (vcardLines.isEmpty()) { - QMessageBox::information(this, tr("Import Failed"), - tr("Sorry, unable to import \"%1\".").arg(importFile)); - return; - } - file.close(); - - // convert it to a contact - probably need to write function to check that it's a valid vcard... - importedContact = Serialiser::convertVcard(vcardLines); - - // if the current contact is newly added (and not saved), we overwrite it - cm->saveContact(&importedContact); -} - -void PhoneBook::exportAsVCard() -{ - // convert the display name to a meaningful file name - QString newName = QFileDialog::getSaveFileName(this, "Export contact as...", ".", "*.vcf"); - if (newName.isNull()) { - // they clicked cancel. - return; - } - if (!newName.endsWith(".vcf")) { - newName += ".vcf"; - } - - QContact currentContact; - if (currentIndex >= contacts.size()) - currentContact = buildContact(); - else - currentContact = contacts.at(currentIndex); - QStringList vcardLines = Serialiser::convertContact(currentContact); - - QFile file(newName); - QContact current = contacts.at(currentIndex); - QContactDisplayLabel cdl = current.detail(QContactDisplayLabel::DefinitionName); - if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) { - QMessageBox::information(this, tr("Unable to export"), - tr("Unable to export contact \"%1\"!").arg(cdl.label())); - return; - } - - QTextStream out(&file); - foreach (const QString& line, vcardLines) - out << line << "\n"; - file.close(); - - QMessageBox::information(this, tr("Contact Exported"), - tr("Successfully exported contact \"%1\" as \"%2\"!").arg(cdl.label()).arg(newName)); -} - -void PhoneBook::editGroupDetails() -{ - QContact c = buildContact(); - c.setId(contacts.value(currentIndex).id()); - GroupDetailsDialog dlg(detailsForm, cm, c); - if (smallScreenSize) - dlg.showMaximized(); - - if (dlg.exec() == QDialog::Accepted) - contactGroups = dlg.groups(); - - if (currentIndex < contacts.size()) - contacts.replace(currentIndex, c); + m_manager = manager; + m_editorPage->setCurrentContact(m_manager, 0); // must reset the manager of the editor. } diff --git a/examples/samplephonebook/phonebook.h b/examples/samplephonebook/phonebook.h index fe09c2b0a9..a881f922fd 100644 --- a/examples/samplephonebook/phonebook.h +++ b/examples/samplephonebook/phonebook.h @@ -42,7 +42,6 @@ #ifndef PHONEBOOK_H #define PHONEBOOK_H -#include "finddialog.h" #include "qtcontacts.h" #include <QWidget> @@ -50,17 +49,19 @@ #include <QPlainTextEdit> QT_BEGIN_NAMESPACE +class QStackedWidget; class QListWidget; class QPushButton; class QComboBox; class QLabel; class QLineEdit; -class QTextEdit; QT_END_NAMESPACE -class ContactDetailsForm; -class MainDialogForm640By480; -class MainDialogForm240By320; +class ContactListPage; +class ContactEditor; +class FilterPage; + +QTM_USE_NAMESPACE class PhoneBook : public QWidget { @@ -71,75 +72,25 @@ public: ~PhoneBook(); public slots: - void addContact(); - void saveContact(); - void removeContact(); - void findContact(); - void openContact(); - void cancelContact(); - void editGroupDetails(); - void next(); - void previous(); - void importFromVCard(); - void exportAsVCard(); - void selectAvatar(); - void contactSelected(int row); + void activateEditor(QContactLocalId contactId); + void activateList(const QContactFilter& filter); + void activateList(); + void activateFind(); -private slots: - void backendChanged(const QList<QContactLocalId>& changed); - void backendSelected(const QString& backend); + void managerChanged(QContactManager *manager); private: - QContact buildContact() const; - QContactName buildName(const QString &name) const; - void displayContact(); - void updateButtons(); - bool eventFilter(QObject* watched, QEvent* event); - void populateList(const QContact& currentContact); - - QListWidget *contactsList; - - QPushButton *addButton; - QPushButton *saveButton; - QPushButton *cancelButton; - QPushButton *removeButton; - QPushButton *findButton; - QPushButton *openButton; - QPushButton *importButton; - QPushButton *exportButton; - QPushButton *quitButton; - QPushButton *groupsButton; - QLabel *currentIndexLabel; - QLabel *currentBackendLabel; - QLabel *avatarPixmapLabel; - - QComboBox *backendCombo; - - QLineEdit *nameLine; - QPushButton *avatarButton; - QLineEdit *emailLine; - QLineEdit *homePhoneLine; - QLineEdit *workPhoneLine; - QLineEdit *mobilePhoneLine; - QPlainTextEdit *addressText; - - FindDialog *dialog; + // the stacked widget which will display the pages + QStackedWidget *m_stackedWidget; - int currentIndex; - int lastIndex; - bool addingContact; - bool editingContact; - bool smallScreenSize; - QList<QContact> contacts; - QList<QContactLocalId> contactGroups; + // pages + ContactListPage *m_listPage; + ContactEditor *m_editorPage; + FilterPage *m_filterPage; - QMap<QString, QContactManager*> managers; - QContactManager *cm; - ContactDetailsForm *contactDetailsForm; - MainDialogForm640By480 *mainDialogForm640By480; - MainDialogForm240By320 *mainDialogForm240By320; - QWidget *mainForm; - QWidget *detailsForm; + // data + QContactManager *m_manager; + QContactFilter m_currentFilter; }; -#endif //PHONEBOOK_H +#endif // PHONEBOOK_H diff --git a/examples/samplephonebook/samplephonebook.pro b/examples/samplephonebook/samplephonebook.pro index 0906f2d64a..412f59478d 100644 --- a/examples/samplephonebook/samplephonebook.pro +++ b/examples/samplephonebook/samplephonebook.pro @@ -13,36 +13,19 @@ INCLUDEPATH += . \ ../../src/contacts/requests \ ../../src/contacts/details -INCLUDEPATH += ../testmodel -VPATH += ../testmodel - - -qtAddLibrary(QtContacts) +CONFIG += mobility +MOBILITY = contacts # Input -SOURCES = contactdetailsform.cpp \ - maindialogform_240_320.cpp \ - maindialogform_640_480.cpp \ - phonebook.cpp \ - serialiser.cpp \ - groupeditdialog.cpp \ - groupdetailsdialog.cpp \ - main.cpp \ - finddialog.cpp - -HEADERS = contactdetailsform.h \ - maindialogform_240_320.h \ - maindialogform_640_480.h \ - phonebook.h \ - serialiser.h \ - finddialog.h \ - ../incomingcalls/filterdialog.h \ - groupeditdialog.h \ - groupdetailsdialog.h - -FORMS += contactdetails_240_320.ui \ - maindialog_240_320.ui \ - maindialog_640_480.ui +SOURCES += main.cpp \ + phonebook.cpp \ + contacteditor.cpp \ + contactlistpage.cpp \ + filterpage.cpp +HEADERS += phonebook.h \ + contacteditor.h \ + contactlistpage.h \ + filterpage.h symbian: { TARGET.CAPABILITY = ReadUserData \ @@ -53,4 +36,3 @@ symbian: { SwEvent } include(../examples.pri) -qtAddLibrary(QtContacts) diff --git a/examples/samplephonebook/serialiser.cpp b/examples/samplephonebook/serialiser.cpp deleted file mode 100644 index 1b81ac0c45..0000000000 --- a/examples/samplephonebook/serialiser.cpp +++ /dev/null @@ -1,823 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the Qt Mobility Components. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "serialiser.h" -#include <QUuid> - -QString Serialiser::escaped(const QString& input) -{ - QString retn = ""; - for (int i = 0; i < input.length(); i++) { - QChar currChar = input.at(i); - if (currChar == '\\' || - currChar == '=' || - currChar == ',' || - currChar == ';' || - currChar == ':') { - // we need to escape this character. - retn += '\\'; // escape with a single backslash. - } - retn += currChar; - } - - return retn; -} - -QString Serialiser::convertDetail(const QContact& contact, const QContactDetail& detail, const QString& vcardField) -{ - // the format of the converted detail will be: - // X-com-nokia-mobility-contacts-vcard-detail-UUID;vcardField;definitionName;key=value,key=value;preferredFor=actionId,actionId - // where each of the elements are escaped strings. - QString retn = "X-com-nokia-mobility-contacts-vcard-detail-"; - retn += escaped(QUuid::createUuid().toString()); - retn += ":"; - retn += escaped(vcardField); - retn += ";"; - retn += escaped(detail.definitionName()); - retn += ";"; - - QVariantMap vals = detail.values(); - foreach (const QString& key, vals.keys()) { - retn += escaped(key); - retn += "="; - retn += escaped(vals.value(key).toString()); - retn += ","; - } - retn.chop(1); - retn += ";"; - - retn += "preferredFor="; - foreach(const QContactActionDescriptor& actionDescr, contact.availableActions(QString())) { - if (contact.isPreferredDetail(actionDescr.actionName(), detail)) { - retn += escaped(actionDescr.actionName()) + ","; - } - } - - if (retn.endsWith(",")) - retn.chop(1); - - return retn; -} - -QStringList Serialiser::findActionIdsFromCustomString(const QString& customString) -{ - QString pref = "preferredFor="; - int startPos = customString.indexOf(pref) + pref.length(); - if (startPos <= pref.length() || startPos >= customString.length()) - return QStringList(); - - QStringList retn; - QString currentActionId = ""; - for (int i = startPos; i < customString.length(); i++) { - QChar currChar = customString.at(i); - if (currChar == '\\') { - i += 1; - currentActionId += customString.at(i); - } else if (currChar == ',') { - if (currentActionId.length() > 0) { - retn << currentActionId; - } - - currentActionId = ""; - } - } - - if (currentActionId.length() > 0) - retn << currentActionId; - - return retn; -} - -QString Serialiser::findLinkStringFromCustomString(const QString& customString) -{ - // check to see if the custom detail was put there by us. - if (customString.indexOf("X-com-nokia-mobility-contacts-vcard-detail-") != 0) { - return QString(); // no link. - } - - // parse the detail. In this implementation, we ignore the linked vcard field. - int sectionCount = 0; - QString linkString = ""; - for (int i = 0; i < customString.length(); i++) { - QChar currChar = customString.at(i); - - // the second section is the link string. grab it. - if (sectionCount > 0) { - if (currChar == '\\') { - linkString += customString.at(i+1); - } else { - linkString += currChar; - } - } - - if (currChar == ';' || currChar == ':') { - // check to see whether we've finished copying the link string. - sectionCount += 1; - if (sectionCount == 2) { - linkString.chop(1); // chop off the trailing ';' - return linkString; - } - } else if (currChar == '\\') { - // skip the escaped character. - i += 1; - } - } - - return QString(); // no link. -} - -QContactDetail Serialiser::convertCustomString(const QString& customString) -{ - int nextSection = 0; - int oldNextSection = 0; - - // check to see if the custom detail was put there by us. - if (customString.indexOf("X-com-nokia-mobility-contacts-vcard-detail-") != 0) { - return QContactDetail(); - } - - // parse the detail. In this implementation, we ignore the linked vcard field. - int sectionCount = 0; - for (int i = nextSection; i < customString.length(); i++) { - QChar currChar = customString.at(i); - if (currChar == ';' || currChar == ':') { - // check to see whether we've finished skipping past the unused sections. - sectionCount += 1; - if (sectionCount == 2) { - nextSection = i + 1; - break; - } - } else if (currChar == '\\') { - // skip the escaped character. - i += 1; - } - } - - // then, we parse the definitionName from the string. - QString definitionName = ""; - for (int i = nextSection; i < customString.length(); i++) { - QChar currChar = customString.at(i); - if (currChar == ';') { - nextSection = i + 1; - break; - } else if (currChar == '\\') { - // the next character is escaped. - i += 1; - } - definitionName += customString.at(i); - } - - // check to see whether this custom string was built by us - if (nextSection == oldNextSection) { - // nope; just return an empty detail. - return QContactDetail(); - } - - // then, we parse the values. - QVariantMap values; - QString currKey = ""; - QString currVal = ""; - for (int i = nextSection; i < customString.length(); i++) { - QChar currChar = customString.at(i); - if (currChar == ';') { - // finished with the key/value pairs. - nextSection = i+1; - break; - } else if (currChar == '=') { - // we have found the key. now find the value - for (int j = i + 1; j < customString.length(); j++) { - currChar = customString.at(j); - if (currChar == ',') { - // finished with this key/value pair - i = j; - break; - } else if (currChar == ';') { - // finished with all key/value pairs. - i = j - 1; // we want to see this char next time around. - break; - } else if (currChar == '\\') { - j += 1; - currVal += customString.at(j); - } else { - currVal += currChar; - } - } - - // and insert it into the map - values.insert(currKey, currVal); - currKey = ""; - currVal = ""; - } else if (currChar == ',') { - // finished with this key/value pair. - // this should have been handled in the above case... - currKey = ""; - currVal = ""; - } else if (currChar == '\\') { - // an escaped character in the key - i += 1; - currKey += customString.at(i); - } else { - // a normal character in the key. - currKey += currChar; - } - } - - // check to see whether this custom string was built by us - if (nextSection == oldNextSection) { - // nope; just return an empty detail. - return QContactDetail(); - } - - // we parse the attributes. - QMap<QString, QString> attrs; - currKey = ""; - QString currAttr = ""; - for (int i = nextSection; i < customString.length(); i++) { - QChar currChar = customString.at(i); - if (currChar == ';') { - // finished with the key/value pairs. - nextSection = i+1; - break; - } else if (currChar == '=') { - // we have found the key. now find the value - for (int j = i + 1; j < customString.length(); j++) { - currChar = customString.at(j); - if (currChar == ',') { - // finished with this key/value pair - i = j; - break; - } else if (currChar == ';') { - // finished with all key/value pairs. - i = j - 1; // we want to see this char next time around. - break; - } else if (currChar == '\\') { - j += 1; - currAttr += customString.at(j); - } else { - currAttr += currChar; - } - } - - // and insert it into the map - values.insert(currKey, currAttr); - currKey = ""; - currAttr = ""; - } else if (currChar == ',') { - // finished with this key/value pair. - // this should have been handled in the above case... - currKey = ""; - currVal = ""; - } else if (currChar == '\\') { - // an escaped character in the key - i += 1; - currKey += customString.at(i); - } else { - // a normal character in the key. - currKey += currChar; - } - } - - // check to see whether this custom string was built by us - if (nextSection == oldNextSection) { - // nope; just return an empty detail. - return QContactDetail(); - } - - // having parsed the definitionName, values, attributes, and preferences we build the detail. - QContactDetail retn(definitionName); - QStringList keys = values.keys(); - foreach (const QString& key, keys) - retn.setValue(key, values.value(key)); - return retn; -} - -QContact Serialiser::convertVcard(const QStringList& vcardLines) -{ - QMultiMap<QString, QContactDetail> vcardDetails; // details built from vcard-supported fields - QMultiMap<QString, QContactDetail> customDetails; // details built from x-custom fields which are linked to vcardDetails - QList<QContactDetail> unlinkedCustomDetails; // details built from x-custom fields - - QMap<QString, QContactDetail> customPreferredForUuid; // map of detail uuid to detail which has some associated preference information. - QMap<QString, QStringList> customPreferredFor; // map of detail uuid to list of actionds for which the detail is preferred. - QList<QContactDetail> vcardPreferredFor; // list of details build from vcard-supported fields which had the pref flag set. - - QContact retn; - QStringList strippedVcardLines = removeClutter(vcardLines); - foreach (const QString& line, strippedVcardLines) { - if (line.startsWith("X-com-nokia-mobility-contacts-vcard-detail-")) { - QContactDetail det = convertCustomString(line); - if (!det.isEmpty()) { - // the line was a custom detail that we saved. - QString linkString = findLinkStringFromCustomString(line); - if (linkString.isEmpty()) { - unlinkedCustomDetails.append(det); - } else { - customDetails.insert(linkString, det); - } - - QString detailUuid = QUuid::createUuid().toString(); - customPreferredForUuid.insert(detailUuid, det); - customPreferredFor.insert(detailUuid, findActionIdsFromCustomString(line)); - } - } else { - QContactDetail det = parsePropertyType(line); - QString defId = det.definitionName(); - if (defId.isEmpty()) { - // this must be another program's custom field. ignore it. - } else { - // this is a built-in vcard supported field. build the detail. - QStringList contexts = parseContext(line); - if (!contexts.isEmpty()) - det.setContexts(contexts); - if (defId == QContactPhoneNumber::DefinitionName) { - det.setValue(QContactPhoneNumber::FieldSubTypes, parseAttributes(line)); - det.setValue(QContactPhoneNumber::FieldNumber, parseValue(line)); - vcardDetails.insert("TEL", det); - } else if (defId == QContactEmailAddress::DefinitionName) { - det.setValue(QContactEmailAddress::FieldEmailAddress, parseValue(line)); - vcardDetails.insert("EMAIL", det); - } else if (defId == "Url") { - det.setValue(QContactUrl::FieldSubType, parseAttributes(line)); - det.setValue(QContactUrl::DefinitionName, parseValue(line)); - vcardDetails.insert("URL", det); - } else if (defId == QContactAvatar::DefinitionName) { - det.setValue(QContactAvatar::FieldSubType, parseAttributes(line)); - det.setValue(QContactAvatar::FieldAvatar, parseValue(line)); - vcardDetails.insert("PHOTO", det); - } else if (defId == QContactGuid::DefinitionName) { - det.setValue(QContactGuid::FieldGuid, parseValue(line)); - vcardDetails.insert("UID", det); - } else if (defId == QContactAddress::DefinitionName) { - det.setValue(QContactAddress::FieldSubTypes, parseAttributes(line)); - QStringList fieldValues = parseValue(line).split(";"); - // ignore values 0 and 1 (extended and postal address) in this implementation - det.setValue(QContactAddress::FieldStreet, fieldValues.value(2)); - det.setValue(QContactAddress::FieldLocality, fieldValues.value(3)); - det.setValue(QContactAddress::FieldRegion, fieldValues.value(4)); - det.setValue(QContactAddress::FieldPostcode, fieldValues.value(5)); - det.setValue(QContactAddress::FieldCountry, fieldValues.value(6)); - vcardDetails.insert("ADR", det); - } else if (defId == QContactName::DefinitionName) { - QStringList fieldValues = parseValue(line).split(";"); - if (vcardDetails.contains("N")) { - // modify the existing name - QContactDetail currName = vcardDetails.value("N"); - currName.setValue(QContactName::FieldPrefix, fieldValues.value(3)); - currName.setValue(QContactName::FieldFirst, fieldValues.value(1)); - currName.setValue(QContactName::FieldMiddle, fieldValues.value(2)); - currName.setValue(QContactName::FieldLast, fieldValues.value(0)); - currName.setValue(QContactName::FieldSuffix, fieldValues.value(4)); - vcardDetails.replace("N", currName); - } else { - // create a new name if no existing name stored. - det.setValue(QContactName::FieldPrefix, fieldValues.value(3)); - det.setValue(QContactName::FieldFirst, fieldValues.value(1)); - det.setValue(QContactName::FieldMiddle, fieldValues.value(2)); - det.setValue(QContactName::FieldLast, fieldValues.value(0)); - det.setValue(QContactName::FieldSuffix, fieldValues.value(4)); - vcardDetails.insert("N", det); - } - } else { - // we don't know how to map this value type. Ignore the line. - continue; - } - - if (parsePreferred(line)) { - vcardPreferredFor.append(det); - } - } - } - } - - // at this stage, we have built two sets of details - // the first set is built from our custom lines, which contain all the information - // the second set is built from the vcard-builtin lines. - // we now want to reconcile the two sets by throwing out any custom-set details - // which are not related to any built-in line but should be. - foreach (const QString& linkString, customDetails.keys()) { - foreach (const QContactDetail& linkedDetail, customDetails.values(linkString)) { - bool found = false; - QContactDetail toRemove; - foreach (const QContactDetail& vcardDetail, vcardDetails.values(linkString)) { - if (linkedDetail.values() == vcardDetail.values()) { - toRemove = vcardDetail; - found = true; - break; - } - } - - if (!found) { - // this supposedly linked detail has no corresponding vcard detail. - // it is an orphan. ignore it. - } else { - // remove the vcard detail from the map! - vcardDetails.remove(linkString, toRemove); - vcardPreferredFor.removeOne(toRemove); - - // save the more verbose (ie, built from custom string) detail. - toRemove = linkedDetail; // copy so we can call non-const function. - retn.saveDetail(&toRemove); - } - } - } - - // any details which are left in the vcardDetails map should be included - foreach (const QContactDetail& det, vcardDetails.values()) { - QContactDetail temp = det; - retn.saveDetail(&temp); - } - - // as should any unlinked custom details. - foreach (const QContactDetail& det, unlinkedCustomDetails) { - QContactDetail temp = det; - retn.saveDetail(&temp); - } - - // now set any preferences found in the vcard should be set - //foreach (const QContactDetail& det, vcardPreferredFor) { - // there is no granularity here; hence, we assume that if any detail is listed as preferred, - // then it is the preferred detail for every action available to it. - - // new: - //foreach (QContactAbstractAction* impl, QContactAbstractAction::implementations()) { - // foreach (const QString& actionId, impl->actionsForDetail(det)) { - // retn.setPreferredDetail(actionId, det); - // } - //} - - // old: - //foreach (const QString& actionId, QContactManager::availableActions(det.definitionName())) { - // retn.setPreferredDetail(actionId, det); - //} - //} - - // and now we set any preferences saved in the custom strings - foreach (const QString& detailUuid, customPreferredForUuid.keys()) { - QContactDetail det = customPreferredForUuid.value(detailUuid); - foreach (const QStringList& actionIds, customPreferredFor.values(detailUuid)) { - foreach (const QString& actionId, actionIds) { - retn.setPreferredDetail(actionId, det); - } - } - } - - return retn; -} - -QStringList Serialiser::removeClutter(const QStringList& vcard) -{ - QStringList copy; - - foreach (QString line, vcard) { - QString firstBit = line.split(":", QString::SkipEmptyParts).value(0); - if (firstBit == "BEGIN" || firstBit == "VERSION" || firstBit == "CLASS" || firstBit == "PRODID" || firstBit == "REV" || firstBit == "END") { - // ignore this line. - } else { - copy.append(line); - } - } - - return copy; -} - -QContactDetail Serialiser::parsePropertyType(const QString& line) -{ - // depending on the line signature, return a QContact<PropertyType> object. - QStringList semiColonSplit = line.split(";"); - QStringList colonSplit = line.split(":"); - if (semiColonSplit.size() == 0 && colonSplit.size() == 0) - return QContactDetail(); - - if (semiColonSplit.size() != 0) { - if (semiColonSplit.at(0) == "TEL") { - return QContactPhoneNumber(); - } else if (semiColonSplit.at(0) == "EMAIL") { - return QContactEmailAddress(); - } else if (semiColonSplit.at(0) == "ADR") { - return QContactAddress(); - } else if (semiColonSplit.at(0) == "PHOTO") { - return QContactAvatar(); - } else if (semiColonSplit.at(0) == "UID") { - return QContactGuid(); - } - } - - // ok, so we have dealt with the cases where a semi colon proceeds the first token. - // Now we must deal with the fields where the first token is proceeded by a colon. - if (colonSplit.size() != 0) { - if (colonSplit.at(0) == "URL") { - return QContactDetail("Url"); - } else if (colonSplit.at(0) == "N") { - QContactName name; - return name; - } else if (colonSplit.at(0) == "FN") { - QContactDisplayLabel label; - return label; - } - } - - // otherwise, it's an unknown or custom field. - return QContactDetail(); -} - -QStringList Serialiser::parseContext(const QString& line) -{ - // depending on the TYPE= section, return a context (work/home/...) - // returns the first one found. - QStringList result; - QStringList contexts; - contexts << QContactDetail::ContextHome << QContactDetail::ContextWork << QContactDetail::ContextOther; - QStringList semiColonSplit = line.split(";"); - for (int i = 0; i < semiColonSplit.size(); i++) { - QString currSplit = semiColonSplit.at(i); - if (currSplit.startsWith("TYPE=")) { - for (int j = 0; j < contexts.size(); j++) { - QString currContext = contexts.at(j); - if (currSplit.contains(currContext.toLower()) && !result.contains(currContext)) { - result.append(currContext); - return result; - } - } - } - } - - return result; -} - -QString Serialiser::parseValue(const QString& line) -{ - // return the settable value of this field - QStringList colonSplit = line.split(":"); - if (colonSplit.size() != 2) { - return QString(); - } - - return colonSplit.at(1); -} - -QString Serialiser::parseAttributes(const QString& line) -{ - // return any special attributes of this field - QString result = ""; - QStringList contexts; - contexts << QContactDetail::ContextHome << QContactDetail::ContextWork << QContactDetail::ContextOther; - QStringList semiColonSplit = line.split(";"); - for (int i = 0; i < semiColonSplit.size(); i++) { - QString currSplit = semiColonSplit.at(i); - if (currSplit.startsWith("TYPE=")) { - // get rid of the TYPE= preamble, then remove any Contexts/Pref - QString possibleAttrs = currSplit.remove(0,5); - int startIndex = -1; - - // firstly, remove pref if it exists. - startIndex = possibleAttrs.indexOf("pref"); - if (startIndex != -1) - possibleAttrs = possibleAttrs.remove(startIndex, 4); - - // then, remove any contexts - for (int j = 0; j < contexts.size(); j++) { - startIndex = possibleAttrs.indexOf(contexts.at(j).toLower()); - if (startIndex != -1) { - possibleAttrs = possibleAttrs.remove(startIndex, contexts.at(j).length()); - } - } - - // finally, remove any value - startIndex = possibleAttrs.indexOf(":"); - if (startIndex != -1) { - possibleAttrs = possibleAttrs.left(startIndex); - } - - // now we should be left with just attributes, separated by ",". - QStringList attributes = possibleAttrs.split(",", QString::SkipEmptyParts); - foreach (QString attribute, attributes) { - // special cases: deal with the vcard TYPE attributes that don't - // map directly to our QContactDetail SubType attributes. - if (attribute == "cell") { - result += "Mobile,"; - } else if (attribute == "fax") { - result += "Facsimile,"; - } else if (attribute == "msg") { - result += "Messaging,"; - } else if (attribute == "dom") { - result += "Domestic,"; - } else if (attribute == "intl") { - result += "International,"; - } else { - QString firstLetter = ""; - firstLetter += attribute.at(0); - firstLetter = firstLetter.toUpper(); - QString rest = attribute.remove(0,1); - result += firstLetter + rest + ","; - } - } - - // remove the trailing `,' - result.chop(1); - } - } - - return result; -} - -bool Serialiser::parsePreferred(const QString& line) -{ - // return whether this field is preferred - QStringList semiColonSplit = line.split(";"); - for (int i = 0; i < semiColonSplit.size(); i++) { - QString currSplit = semiColonSplit.at(i); - if (currSplit.startsWith("TYPE=")) { - if (currSplit.contains("pref")) { - return true; - } - } - } - - return false; -} - -bool Serialiser::detailIsPreferredForAnything(const QContact& contact, const QContactDetail& detail) -{ - foreach (const QContactActionDescriptor& actionDescr, contact.availableActions(QString())) { - if (contact.isPreferredDetail(actionDescr.actionName(), detail)) { - return true; - } - } - - return false; -} - -QStringList Serialiser::convertContact(const QContact& contact) -{ - QStringList vcard; - QContact c = contact; - - QDateTime curr = QDateTime::currentDateTime(); - QString entry = "REV:" + curr.toString("yyyy-MM-dd hh:mm:ss"); - vcard << "BEGIN:VCARD" << "VERSION:3.0" << "CLASS:PUBLIC" << "PRODID:-//qcontactvcardserializer from Nokia.com//NONSGML Version 1//EN" << entry; - - QStringList customVcardFields; - - QStringList vcardFieldsWithValues; - foreach (const QContactDetail& det, contact.details()) { - // we look at each detail of the contact - // if the detail can be mapped to a non-singular vcard field, we create the vcard entry and the custom entry - // if the detail can be mapped to a singular vcard field, we check to see that another detail which also - // maps to the same vcard field hasn't been saved as the vcard entry before doing the above. - QString definitionName = det.definitionName(); - if (definitionName == QContactName::DefinitionName) { - bool saved = false; - - // only one name is allowed - if (!vcardFieldsWithValues.contains("N")) { - entry = "N:" + det.value(QContactName::FieldLast) + ";" + det.value(QContactName::FieldFirst) + ";" + det.value(QContactName::FieldMiddle) + ";" + det.value(QContactName::FieldPrefix) + det.value(QContactName::FieldSuffix); - vcardFieldsWithValues << "N"; - vcard << entry; - customVcardFields << convertDetail(contact, det, "N"); - saved = true; - } - - // if not already saved, save as a generic custom field. - if (!saved) { - customVcardFields << convertDetail(contact, det); - } - } else if (definitionName == QContactDisplayLabel::DefinitionName) { - // only one formatted name is allowed - if (!vcardFieldsWithValues.contains("FN")) { - entry = "FN:" + det.value(QContactDisplayLabel::FieldLabel); - vcard << entry; - vcardFieldsWithValues << "FN"; - customVcardFields << convertDetail(contact, det, "FN"); - } - } else if (definitionName == QContactAddress::DefinitionName) { - // any number of address fields are allowed. - entry = "ADR;TYPE="; - QString typestr = ""; - QStringList subTypes = det.value<QStringList>(QContactAddress::FieldSubTypes); - QStringList contexts = det.contexts(); - if (contexts.contains(QContactDetail::ContextHome)) typestr += "home,"; - if (contexts.contains(QContactDetail::ContextWork)) typestr += "work,"; - if (contexts.contains(QContactDetail::ContextOther)) typestr += "other,"; - if (subTypes.contains(QContactAddress::SubTypeDomestic)) typestr += "dom,"; - if (subTypes.contains(QContactAddress::SubTypeInternational)) typestr += "intl,"; - if (subTypes.contains(QContactAddress::SubTypeParcel)) typestr += "parcel,"; - if (subTypes.contains(QContactAddress::SubTypePostal)) typestr += "postal,"; - if (detailIsPreferredForAnything(contact, det)) typestr += "pref,"; - typestr.chop(1); - entry += typestr + ":;;" + det.value(QContactAddress::FieldStreet) + ";" + det.value(QContactAddress::FieldLocality) + ";" + det.value(QContactAddress::FieldRegion) + ";" + det.value(QContactAddress::FieldPostcode) + ";" + det.value(QContactAddress::FieldCountry); - vcard << entry; - //entry = "LABEL;TYPE=" + typestr + ":" + det.value(QContactAddress::FieldDisplayLabel); - //vcard << entry; - vcardFieldsWithValues << "ADR"; - vcardFieldsWithValues << "LABEL"; - customVcardFields << convertDetail(contact, det, "ADR"); - } else if (definitionName == "Url") { - // any number of Url fields are allowed. - entry = "URL:" + det.value("Url"); - vcard << entry; - vcardFieldsWithValues << "URL"; - customVcardFields << convertDetail(contact, det, "URL"); - } else if (definitionName == QContactEmailAddress::DefinitionName) { - // any number of email address fields are allowed. - entry = "EMAIL;TYPE=internet"; - if (detailIsPreferredForAnything(contact, det)) entry += ",pref"; - entry += ":" + det.value(QContactEmailAddress::FieldEmailAddress); - vcard << entry; - vcardFieldsWithValues << "EMAIL"; - customVcardFields << convertDetail(contact, det, "EMAIL"); - } else if (definitionName == QContactPhoneNumber::DefinitionName) { - // any number of telephone fields are allowed. - entry = "TEL;TYPE="; - QString typeStr = ""; - QStringList subTypes = det.value<QStringList>(QContactPhoneNumber::FieldSubTypes); - QStringList contexts = det.contexts(); - if (subTypes.contains(QContactPhoneNumber::SubTypeMobile)) typeStr += "cell,"; - if (subTypes.contains(QContactPhoneNumber::SubTypeFacsimile)) typeStr += "fax,"; - if (subTypes.contains(QContactPhoneNumber::SubTypeVideo)) typeStr += "video,"; - if (subTypes.contains(QContactPhoneNumber::SubTypePager)) typeStr += "pager,"; - if (subTypes.contains(QContactPhoneNumber::SubTypeModem)) typeStr += "modem,"; - if (subTypes.contains(QContactPhoneNumber::SubTypeBulletinBoardSystem)) typeStr += "bbs,"; - if (subTypes.contains(QContactPhoneNumber::SubTypeMessagingCapable)) typeStr += "msg,"; - if (subTypes.contains(QContactPhoneNumber::SubTypeLandline) || typeStr.isEmpty()) typeStr += "voice,"; - if (contexts.contains(QContactDetail::ContextHome)) typeStr = "home," + typeStr; - if (contexts.contains(QContactDetail::ContextWork)) typeStr = "work," + typeStr; - if (contexts.contains(QContactDetail::ContextOther)) typeStr = "other," + typeStr; - if (detailIsPreferredForAnything(contact, det)) typeStr += "pref,"; - typeStr.chop(1); - entry += typeStr + ":" + det.value(QContactPhoneNumber::FieldNumber); - vcard << entry; - vcardFieldsWithValues << "TEL"; - customVcardFields << convertDetail(contact, det, "TEL"); - } else if (definitionName == QContactAvatar::DefinitionName) { - // only one photo field is allowed per vcard, according to the spec - if (vcardFieldsWithValues.contains("PHOTO")) { - // vcard already contains a photo field; save this one as a custom field only. - customVcardFields << convertDetail(contact, det); - } else { - // vcard does not yet contain a photo field; save this as the photo field. - vcardFieldsWithValues << "PHOTO"; - entry = "PHOTO;VALUE=uri:" + det.value(QContactAvatar::FieldAvatar); - customVcardFields << convertDetail(contact, det, "PHOTO"); - } - } else if (definitionName == QContactGuid::DefinitionName) { - // only one UID field is allowed per vcard, according to the spec - if (vcardFieldsWithValues.contains("UID")) { - // vcard already contains a photo field; save this one as a custom field only. - customVcardFields << convertDetail(contact, det); - } else { - // vcard does not yet contain a UID field; save this as the UID field. - vcardFieldsWithValues << "UID"; - entry = "UID:" + det.value(QContactGuid::FieldGuid); - customVcardFields << convertDetail(contact, det, "UID"); - } - } else { - // there is no vcard field mapping for this detail; - // so, simply save it as a custom field. - customVcardFields << convertDetail(contact, det); // doesn't map to any vcard field - } - } - - // now append our custom vcard fields and end the vcard. - vcard << customVcardFields; - vcard << "END:VCARD"; - - return vcard; -} diff --git a/examples/samplephonebook/serialiser.h b/examples/samplephonebook/serialiser.h deleted file mode 100644 index 174a28eb74..0000000000 --- a/examples/samplephonebook/serialiser.h +++ /dev/null @@ -1,73 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the Qt Mobility Components. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef SERIALISER_H -#define SERIALISER_H - -#include "qtcontacts.h" - -#include <QString> -#include <QStringList> - -QTM_USE_NAMESPACE - -class Serialiser -{ -public: - static QStringList convertContact(const QContact& contact); - static QContact convertVcard(const QStringList& vcardLines); - -private: - static QString escaped(const QString& input); - static QString convertDetail(const QContact& contact, const QContactDetail& detail, const QString& vcardField = QString()); - static QStringList findActionIdsFromCustomString(const QString& customString); - static QString findLinkStringFromCustomString(const QString& customString); - static QContactDetail convertCustomString(const QString& customString); - static QStringList removeClutter(const QStringList& vcard); - static QContactDetail parsePropertyType(const QString& line); - static QStringList parseContext(const QString& line); - static QString parseValue(const QString& line); - static QString parseAttributes(const QString& line); - static bool parsePreferred(const QString& line); - static bool detailIsPreferredForAnything(const QContact& contact, const QContactDetail& detail); -}; - -#endif diff --git a/examples/serviceactions/serviceactions.pro b/examples/serviceactions/serviceactions.pro index d2c6c4418d..4cb1f53e98 100644 --- a/examples/serviceactions/serviceactions.pro +++ b/examples/serviceactions/serviceactions.pro @@ -5,7 +5,8 @@ QT += gui include(../examples.pri) -qtAddLibrary(QtMessaging) +CONFIG += mobility +MOBILITY = messaging INCLUDEPATH += ../../src/messaging symbian|win32 { diff --git a/examples/servicebrowser/servicebrowser.pro b/examples/servicebrowser/servicebrowser.pro index ddf8bf6006..5b06a1f092 100644 --- a/examples/servicebrowser/servicebrowser.pro +++ b/examples/servicebrowser/servicebrowser.pro @@ -11,7 +11,8 @@ HEADERS += servicebrowser.h SOURCES += servicebrowser.cpp \ main.cpp -qtAddLibrary(QtServiceFramework) +CONFIG += mobility +MOBILITY = serviceframework symbian { addFiles.sources = ../filemanagerplugin/filemanagerservice.xml diff --git a/examples/serviceinstaller_sfw_symbian/exampleinstaller.cpp b/examples/serviceinstaller_sfw_symbian/exampleinstaller/exampleinstaller.cpp index c1489f00c8..5fbf361373 100644 --- a/examples/serviceinstaller_sfw_symbian/exampleinstaller.cpp +++ b/examples/serviceinstaller_sfw_symbian/exampleinstaller/exampleinstaller.cpp @@ -45,13 +45,26 @@ QTM_USE_NAMESPACE +//! [0] +const QString filemanagerxml = "c:\\resource\\apps\\xmldata\\filemanagerservice.xml"; +const QString bluetoothxml = "c:\\resource\\apps\\xmldata\\bluetoothtransferservice.xml"; + int main(int argc, char *argv[]) { QCoreApplication app(argc, argv); QServiceManager s; - s.addService("c:\\private\\E00b7e42\\xmldata\\filemanagerservice.xml"); - s.addService("c:\\private\\E00b7e42\\xmldata\\bluetoothtransferservice.xml"); + + if (QFile::exists(filemanagerxml)) { + s.addService(filemanagerxml); + } else { + s.removeService("FileManagerService"); + } - return app.exec(); + if (QFile::exists(bluetoothxml)) { + s.addService(bluetoothxml); + } else { + s.removeService("BluetoothTransferService"); + } } +//! [0] diff --git a/examples/serviceinstaller_sfw_symbian/exampleinstaller/exampleinstaller.pro b/examples/serviceinstaller_sfw_symbian/exampleinstaller/exampleinstaller.pro new file mode 100644 index 0000000000..eb435e1c9e --- /dev/null +++ b/examples/serviceinstaller_sfw_symbian/exampleinstaller/exampleinstaller.pro @@ -0,0 +1,16 @@ +TEMPLATE = app +include(../../examples.pri) + +QT = core +CONFIG += no_icon +INCLUDEPATH += ../../../src/serviceframework + +CONFIG += mobility +MOBILITY = serviceframework + +SOURCES += exampleinstaller.cpp + +symbian { + TARGET.UID3 = 0xE00b7e42 + TARGET.CAPABILITY = ALL -TCB +} diff --git a/examples/serviceinstaller_sfw_symbian/exampleservices.pro b/examples/serviceinstaller_sfw_symbian/exampleservices.pro new file mode 100644 index 0000000000..2f7851fc58 --- /dev/null +++ b/examples/serviceinstaller_sfw_symbian/exampleservices.pro @@ -0,0 +1,20 @@ +TEMPLATE = subdirs +SUBDIRS = exampleinstaller + +symbian { + load(data_caging_paths) + xmlFiles.sources = ../filemanagerplugin/filemanagerservice.xml \ + ../bluetoothtransferplugin/bluetoothtransferservice.xml + xmlFiles.path = c:$$APP_RESOURCE_DIR/xmldata + + plugins.sources = serviceframework_filemanagerplugin.dll \ + serviceframework_bluetoothtransferplugin.dll + plugins.path = $$QT_PLUGINS_BASE_DIR + + installer.pkg_postrules += "\"$${EPOCROOT}epoc32/release/$(PLATFORM)/$(TARGET)/exampleinstaller.exe\" \ + - \"!:\sys\bin\exampleinstaller.exe\",FR,RB,RW" + + DEPLOYMENT += xmlFiles \ + plugins \ + installer +} diff --git a/examples/serviceinstaller_sfw_symbian/serviceinstaller_sfw_symbian.pro b/examples/serviceinstaller_sfw_symbian/serviceinstaller_sfw_symbian.pro deleted file mode 100644 index 694d0c95b8..0000000000 --- a/examples/serviceinstaller_sfw_symbian/serviceinstaller_sfw_symbian.pro +++ /dev/null @@ -1,30 +0,0 @@ -TEMPLATE = app -TARGET = exampleinstaller -include(../examples.pri) -INCLUDEPATH += ../../src/serviceframework \ - ../../src/global - -QT = core - -SOURCES += exampleinstaller.cpp - -qtAddLibrary(QtServiceFramework) - -CONFIG += no_icon - -symbian { - addFiles.sources = ../filemanagerplugin/filemanagerservice.xml \ - ../bluetoothtransferplugin/bluetoothtransferservice.xml - addFiles.path = xmldata - DEPLOYMENT += addFiles - - load(data_caging_paths) - pluginDep.sources = serviceframework_filemanagerplugin.dll \ - serviceframework_bluetoothtransferplugin.dll - pluginDep.path = $$QT_PLUGINS_BASE_DIR - DEPLOYMENT += pluginDep - - TARGET.UID3 = 0xE00b7e42 - - TARGET.CAPABILITY = ALL -TCB -} diff --git a/examples/slideshow/slideshow.pro b/examples/slideshow/slideshow.pro index a41c1f6895..92d9b79695 100644 --- a/examples/slideshow/slideshow.pro +++ b/examples/slideshow/slideshow.pro @@ -3,7 +3,8 @@ TARGET = slideshow INCLUDEPATH+=../../src/multimedia include (../examples.pri) -qtAddLibrary(QtMedia) +CONFIG += mobility +MOBILITY = multimedia HEADERS = \ slideshow.h diff --git a/examples/streamplayer/streamplayer.pro b/examples/streamplayer/streamplayer.pro index 7dd76213a2..4f60d6cf0b 100644 --- a/examples/streamplayer/streamplayer.pro +++ b/examples/streamplayer/streamplayer.pro @@ -4,7 +4,8 @@ TARGET=streamplayer INCLUDEPATH+=../../src/multimedia include (../examples.pri) -qtAddLibrary(QtMedia) +CONFIG += mobility +MOBILITY = multimedia HEADERS = \ streamplayer.h diff --git a/examples/sysinfo/dialog.cpp b/examples/sysinfo/dialog.cpp index 8c9d73b280..98b9ef06ae 100644 --- a/examples/sysinfo/dialog.cpp +++ b/examples/sysinfo/dialog.cpp @@ -40,25 +40,19 @@ ****************************************************************************/ #include "dialog.h" -#ifdef Q_OS_SYMBIAN -#include "ui_dialog_s60.h" -#else -#include "ui_dialog.h" -#endif #include <QMessageBox> #include <QTimer> Dialog::Dialog() : - QDialog(), - ui(new Ui::Dialog), + QWidget(), saver(NULL), systemInfo(NULL), di(NULL), ni(NULL) { - ui->setupUi(this); + setupUi(this); setupGeneral(); - connect(ui->tabWidget,SIGNAL(currentChanged(int)),this,SLOT(tabChanged(int))); - connect(ui->versionComboBox,SIGNAL(activated(int)), this,SLOT(getVersion(int))); - connect(ui->featureComboBox,SIGNAL(activated(int)), this,SLOT(getFeature(int))); + connect(tabWidget,SIGNAL(currentChanged(int)),this,SLOT(tabChanged(int))); + connect(versionComboBox,SIGNAL(activated(int)), this,SLOT(getVersion(int))); + connect(featureComboBox,SIGNAL(activated(int)), this,SLOT(getFeature(int))); QTimer *timer = new QTimer(this); connect(timer, SIGNAL(timeout()), this, SLOT(updateDeviceLockedState())); timer->start(1000); @@ -66,7 +60,6 @@ Dialog::Dialog() : Dialog::~Dialog() { - delete ui; delete systemInfo; delete di; delete saver; @@ -77,7 +70,7 @@ void Dialog::changeEvent(QEvent *e) QWidget::changeEvent(e); switch (e->type()) { case QEvent::LanguageChange: - ui->retranslateUi(this); + retranslateUi(this); break; default: break; @@ -150,17 +143,17 @@ void Dialog::setupGeneral() { delete systemInfo; systemInfo = new QSystemInfo(this); - ui->curLanguageLineEdit->setText( systemInfo->currentLanguage()); - ui->languagesComboBox->clear(); - ui->languagesComboBox->insertItems(0,systemInfo->availableLanguages()); - ui->countryCodeLabel->setText(systemInfo->currentCountryCode()); + curLanguageLineEdit->setText( systemInfo->currentLanguage()); + languagesComboBox->clear(); + languagesComboBox->insertItems(0,systemInfo->availableLanguages()); + countryCodeLabel->setText(systemInfo->currentCountryCode()); } void Dialog::setupDevice() { delete di; di = new QSystemDeviceInfo(this); - ui->batteryLevelBar->setValue(di->batteryLevel()); + batteryLevelBar->setValue(di->batteryLevel()); connect(di,SIGNAL(batteryLevelChanged(int)), this,SLOT(updateBatteryStatus(int))); @@ -171,26 +164,26 @@ void Dialog::setupDevice() connect(di,SIGNAL(powerStateChanged(QSystemDeviceInfo::PowerState)), this,SLOT(updatePowerState(QSystemDeviceInfo::PowerState))); - ui->ImeiLabel->setText(di->imei()); - ui->imsiLabel->setText(di->imsi()); - ui->manufacturerLabel->setText(di->manufacturer()); - ui->modelLabel->setText(di->model()); - ui->productLabel->setText(di->productName()); + ImeiLabel->setText(di->imei()); + imsiLabel->setText(di->imsi()); + manufacturerLabel->setText(di->manufacturer()); + modelLabel->setText(di->model()); + productLabel->setText(di->productName()); - ui->deviceLockCheckBox->setChecked(di->isDeviceLocked()); + deviceLockCheckBox->setChecked(di->isDeviceLocked()); - ui->profileComboBox->setCurrentIndex(di->currentProfile()); + profileComboBox->setCurrentIndex(di->currentProfile()); connect(di, SIGNAL(currentProfileChanged(QSystemDeviceInfo::Profile)), this, SLOT(updateProfile(QSystemDeviceInfo::Profile))); if(di->currentPowerState() == QSystemDeviceInfo::BatteryPower) { - ui->radioButton_2->setChecked(true); + radioButton_2->setChecked(true); } else if(di->currentPowerState() == QSystemDeviceInfo::WallPower) { - ui->radioButton_3->setChecked(true); + radioButton_3->setChecked(true); } else if(di->currentPowerState() == QSystemDeviceInfo::WallPowerChargingBattery) { - ui->radioButton_4->setChecked(true); + radioButton_4->setChecked(true); } else { - ui->radioButton->setChecked(true); + radioButton->setChecked(true); } QSystemDeviceInfo::InputMethodFlags methods = di->inputMethodType(); @@ -214,33 +207,33 @@ void Dialog::setupDevice() inputs << "Mouse"; } - ui->inputMethodLabel->setText(inputs.join(" ")); + inputMethodLabel->setText(inputs.join(" ")); } void Dialog::updateDeviceLockedState() { if (di) - ui->deviceLockCheckBox->setChecked(di->isDeviceLocked()); + deviceLockCheckBox->setChecked(di->isDeviceLocked()); } void Dialog::updateProfile(QSystemDeviceInfo::Profile profile) { - ui->profileComboBox->setCurrentIndex(profile); + profileComboBox->setCurrentIndex(profile); } void Dialog::setupDisplay() { QSystemDisplayInfo di; - ui->brightnessLineEdit->setText(QString::number(di.displayBrightness(0))); - ui->colorDepthLineEdit->setText(QString::number(di.colorDepth((0)))); + brightnessLineEdit->setText(QString::number(di.displayBrightness(0))); + colorDepthLineEdit->setText(QString::number(di.colorDepth((0)))); } void Dialog::setupStorage() { QSystemStorageInfo mi; - ui->storageTreeWidget->clear(); - ui->storageTreeWidget->header()->setResizeMode(QHeaderView::ResizeToContents); + storageTreeWidget->clear(); + storageTreeWidget->header()->setResizeMode(QHeaderView::ResizeToContents); QStringList vols = mi.logicalDrives(); foreach(QString volName, vols) { @@ -266,7 +259,7 @@ void Dialog::setupStorage() items << QString::number(mi.totalDiskSpace(volName)); items << QString::number(mi.availableDiskSpace(volName)); QTreeWidgetItem *item = new QTreeWidgetItem(items); - ui->storageTreeWidget->addTopLevelItem(item); + storageTreeWidget->addTopLevelItem(item); } } @@ -275,7 +268,7 @@ void Dialog::setupNetwork() delete ni; ni = new QSystemNetworkInfo(this); - connect(ui->netStatusComboBox,SIGNAL(activated(int)), + connect(netStatusComboBox,SIGNAL(activated(int)), this, SLOT(netStatusComboActivated(int))); connect(ni,SIGNAL(networkSignalStrengthChanged(QSystemNetworkInfo::NetworkMode, int)), @@ -287,13 +280,13 @@ void Dialog::setupNetwork() connect(ni,SIGNAL(networkStatusChanged(QSystemNetworkInfo::NetworkMode,QSystemNetworkInfo::NetworkStatus)), this,SLOT(networkStatusChanged(QSystemNetworkInfo::NetworkMode,QSystemNetworkInfo::NetworkStatus))); - ui->cellIdLabel->setText(QString::number(ni->cellId())); - ui->locationAreaCodeLabel->setText(QString::number(ni->locationAreaCode())); - ui->currentMMCLabel->setText(ni->currentMobileCountryCode()); - ui->currentMNCLabel->setText(ni->currentMobileNetworkCode()); + cellIdLabel->setText(QString::number(ni->cellId())); + locationAreaCodeLabel->setText(QString::number(ni->locationAreaCode())); + currentMMCLabel->setText(ni->currentMobileCountryCode()); + currentMNCLabel->setText(ni->currentMobileNetworkCode()); - ui->homeMMCLabel->setText(ni->homeMobileCountryCode()); - ui->homeMNCLabel->setText(ni->homeMobileNetworkCode()); + homeMMCLabel->setText(ni->homeMobileCountryCode()); + homeMNCLabel->setText(ni->homeMobileNetworkCode()); } void Dialog::netStatusComboActivated(int index) { @@ -302,16 +295,16 @@ void Dialog::netStatusComboActivated(int index) displayNetworkStatus(ni->networkStatus((QSystemNetworkInfo::NetworkMode)reIndex)); - ui->macAddressLabel->setText(ni->macAddress((QSystemNetworkInfo::NetworkMode)reIndex)); + macAddressLabel->setText(ni->macAddress((QSystemNetworkInfo::NetworkMode)reIndex)); int strength = ni->networkSignalStrength((QSystemNetworkInfo::NetworkMode)reIndex); if(strength < 0) strength = 0; - ui->signalLevelProgressBar->setValue(strength); + signalLevelProgressBar->setValue(strength); - ui->InterfaceLabel->setText(ni->interfaceForMode((QSystemNetworkInfo::NetworkMode)reIndex).humanReadableName()); + InterfaceLabel->setText(ni->interfaceForMode((QSystemNetworkInfo::NetworkMode)reIndex).humanReadableName()); - ui->operatorNameLabel->setText(ni->networkName((QSystemNetworkInfo::NetworkMode)reIndex)); + operatorNameLabel->setText(ni->networkName((QSystemNetworkInfo::NetworkMode)reIndex)); } void Dialog::getVersion(int index) @@ -330,7 +323,7 @@ void Dialog::getVersion(int index) }; QSystemInfo si; - ui->versionLineEdit->setText(si.version(version)); + versionLineEdit->setText(si.version(version)); } void Dialog::getFeature(int index) @@ -378,35 +371,35 @@ void Dialog::getFeature(int index) break; }; QSystemInfo si; - ui->featuresLineEdit->setText((si.hasFeatureSupported(feature) ? "true":"false" )); + featuresLineEdit->setText((si.hasFeatureSupported(feature) ? "true":"false" )); } //void Dialog::doVolumes(int /*index*/) //{ // QSystemStorageInfo mi; -// QString vol = ui->volumesComboBox->currentText(); -// int index2 = ui->diskComboBox->currentIndex(); +// QString vol = volumesComboBox->currentText(); +// int index2 = diskComboBox->currentIndex(); // switch(index2) { // case 0: // //total -// ui->diskSpaceLineEdit->setText( QString::number(mi.totalDiskSpace(vol))); +// diskSpaceLineEdit->setText( QString::number(mi.totalDiskSpace(vol))); // break; // case 1: // //available -// ui->diskSpaceLineEdit->setText( QString::number(mi.availableDiskSpace(vol))); +// diskSpaceLineEdit->setText( QString::number(mi.availableDiskSpace(vol))); // break; // case 2: // //type // QSystemStorageInfo::VolumeType volType; // volType = mi.getVolumeType(vol); // if(volType == QSystemStorageInfo::Internal) { -// ui->diskSpaceLineEdit->setText( "Internal"); +// diskSpaceLineEdit->setText( "Internal"); // } else // if(volType == QSystemStorageInfo::Removable) { -// ui->diskSpaceLineEdit->setText( "Removable"); +// diskSpaceLineEdit->setText( "Removable"); // } // if(volType == QSystemStorageInfo::Cdrom) { -// ui->diskSpaceLineEdit->setText( "Cdrom"); +// diskSpaceLineEdit->setText( "Cdrom"); // } // break; // }; @@ -422,10 +415,10 @@ void Dialog::setupSaver() bool saverEnabled = saver->screenSaverInhibited(); - connect( ui->saverInhibitedCheckBox, SIGNAL(clicked(bool)), + connect( saverInhibitedCheckBox, SIGNAL(clicked(bool)), this,SLOT(setSaverEnabled(bool))); - ui->saverInhibitedCheckBox->setChecked(saverEnabled); + saverInhibitedCheckBox->setChecked(saverEnabled); } @@ -446,7 +439,7 @@ void Dialog::setSaverEnabled(bool b) void Dialog::updateBatteryStatus(int level) { - ui->batteryLevelBar->setValue(level); + batteryLevelBar->setValue(level); } void Dialog::updatePowerState(QSystemDeviceInfo::PowerState newState) @@ -455,16 +448,16 @@ void Dialog::updatePowerState(QSystemDeviceInfo::PowerState newState) switch (newState) { case QSystemDeviceInfo::BatteryPower: { - ui->radioButton_2->setChecked(true); + radioButton_2->setChecked(true); } break; case QSystemDeviceInfo::WallPower: { - ui->radioButton_3->setChecked(true); + radioButton_3->setChecked(true); } break; case QSystemDeviceInfo::WallPowerChargingBattery: - ui->radioButton_4->setChecked(true); + radioButton_4->setChecked(true); break; }; } @@ -508,32 +501,32 @@ void Dialog::displayBatteryStatus(QSystemDeviceInfo::BatteryStatus status) void Dialog::networkSignalStrengthChanged(QSystemNetworkInfo::NetworkMode mode , int strength) { if(mode == QSystemNetworkInfo::WlanMode) { - if(ui->netStatusComboBox->currentText() == "Wlan") { - ui->signalLevelProgressBar->setValue(strength); + if(netStatusComboBox->currentText() == "Wlan") { + signalLevelProgressBar->setValue(strength); } } if(mode == QSystemNetworkInfo::EthernetMode) { - if(ui->netStatusComboBox->currentText() == "Ethernet") { - ui->signalLevelProgressBar->setValue(strength); + if(netStatusComboBox->currentText() == "Ethernet") { + signalLevelProgressBar->setValue(strength); } } if(mode == QSystemNetworkInfo::GsmMode) { - if(ui->netStatusComboBox->currentText() == "Gsm") { - ui->signalLevelProgressBar->setValue(strength); + if(netStatusComboBox->currentText() == "Gsm") { + signalLevelProgressBar->setValue(strength); } } if(mode == QSystemNetworkInfo::CdmaMode) { - if(ui->netStatusComboBox->currentText() == "Cdma") { - ui->signalLevelProgressBar->setValue(strength); + if(netStatusComboBox->currentText() == "Cdma") { + signalLevelProgressBar->setValue(strength); } } if(mode == QSystemNetworkInfo::WcdmaMode) { - if(ui->netStatusComboBox->currentText() == "Wcdma") { - ui->signalLevelProgressBar->setValue(strength); + if(netStatusComboBox->currentText() == "Wcdma") { + signalLevelProgressBar->setValue(strength); } } @@ -542,32 +535,32 @@ void Dialog::networkSignalStrengthChanged(QSystemNetworkInfo::NetworkMode mode , void Dialog::networkNameChanged(QSystemNetworkInfo::NetworkMode mode,const QString &text) { if(mode == QSystemNetworkInfo::WlanMode) { - if(ui->netStatusComboBox->currentText() == "Wlan") { - ui->operatorNameLabel->setText(text); + if(netStatusComboBox->currentText() == "Wlan") { + operatorNameLabel->setText(text); } } if(mode == QSystemNetworkInfo::EthernetMode) { - if(ui->netStatusComboBox->currentText() == "Ethernet") { - ui->operatorNameLabel->setText(text); + if(netStatusComboBox->currentText() == "Ethernet") { + operatorNameLabel->setText(text); } } if(mode == QSystemNetworkInfo::GsmMode) { - if(ui->netStatusComboBox->currentText() == "Gsm") { - ui->operatorNameLabel->setText(text); + if(netStatusComboBox->currentText() == "Gsm") { + operatorNameLabel->setText(text); } } if(mode == QSystemNetworkInfo::CdmaMode) { - if(ui->netStatusComboBox->currentText() == "Cdma") { - ui->operatorNameLabel->setText(text); + if(netStatusComboBox->currentText() == "Cdma") { + operatorNameLabel->setText(text); } } if(mode == QSystemNetworkInfo::WcdmaMode) { - if(ui->netStatusComboBox->currentText() == "Wcdma") { - ui->operatorNameLabel->setText(text); + if(netStatusComboBox->currentText() == "Wcdma") { + operatorNameLabel->setText(text); } } @@ -576,31 +569,31 @@ void Dialog::networkNameChanged(QSystemNetworkInfo::NetworkMode mode,const QStri void Dialog::networkStatusChanged(QSystemNetworkInfo::NetworkMode mode , QSystemNetworkInfo::NetworkStatus status) { if(mode == QSystemNetworkInfo::WlanMode) { - if(ui->netStatusComboBox->currentText() == "Wlan") { + if(netStatusComboBox->currentText() == "Wlan") { displayNetworkStatus(status); } } if(mode == QSystemNetworkInfo::EthernetMode) { - if(ui->netStatusComboBox->currentText() == "Ethernet") { + if(netStatusComboBox->currentText() == "Ethernet") { displayNetworkStatus(status); } } if(mode == QSystemNetworkInfo::GsmMode) { - if(ui->netStatusComboBox->currentText() == "Gsm") { + if(netStatusComboBox->currentText() == "Gsm") { displayNetworkStatus(status); } } if(mode == QSystemNetworkInfo::CdmaMode) { - if(ui->netStatusComboBox->currentText() == "Cdma") { + if(netStatusComboBox->currentText() == "Cdma") { displayNetworkStatus(status); } } if(mode == QSystemNetworkInfo::WcdmaMode) { - if(ui->netStatusComboBox->currentText() == "Wcdma") { + if(netStatusComboBox->currentText() == "Wcdma") { displayNetworkStatus(status); } } @@ -639,5 +632,5 @@ void Dialog::displayNetworkStatus(QSystemNetworkInfo::NetworkStatus status) stat = "Roaming"; break; }; - ui->cellNetworkStatusLabel->setText(stat); + cellNetworkStatusLabel->setText(stat); } diff --git a/examples/sysinfo/dialog.h b/examples/sysinfo/dialog.h index 866e5cd80a..274b460fa3 100644 --- a/examples/sysinfo/dialog.h +++ b/examples/sysinfo/dialog.h @@ -42,16 +42,17 @@ #ifndef DIALOG_H #define DIALOG_H -#include <QDialog> +#include <QWidget> #include <qsysteminfo.h> - +#ifdef Q_OS_SYMBIAN +#include "ui_dialog_s60.h" +#else +#include "ui_dialog.h" +#endif QTM_USE_NAMESPACE -namespace Ui { - class Dialog; -} - -class Dialog : public QDialog { +class Dialog : public QWidget, public Ui_Dialog +{ Q_OBJECT public: Dialog(); @@ -61,7 +62,6 @@ protected: void changeEvent(QEvent *e); private: - Ui::Dialog *ui; void setupGeneral(); void setupDevice(); void setupDisplay(); diff --git a/examples/sysinfo/dialog.ui b/examples/sysinfo/dialog.ui index 7196b4866f..3a452b7016 100644 --- a/examples/sysinfo/dialog.ui +++ b/examples/sysinfo/dialog.ui @@ -1,895 +1,894 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>Dialog</class>
- <widget class="QDialog" name="Dialog">
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>602</width>
- <height>516</height>
- </rect>
- </property>
- <property name="windowTitle">
- <string>Sysinfo</string>
- </property>
- <layout class="QGridLayout" name="gridLayout">
- <item row="0" column="0">
- <widget class="QTabWidget" name="tabWidget">
- <property name="currentIndex">
- <number>0</number>
- </property>
- <widget class="QWidget" name="generaltab">
- <attribute name="title">
- <string>General</string>
- </attribute>
- <layout class="QGridLayout" name="gridLayout_2">
- <item row="0" column="0" colspan="2">
- <widget class="QLabel" name="label">
- <property name="text">
- <string>Current Language:</string>
- </property>
- </widget>
- </item>
- <item row="0" column="2" colspan="2">
- <widget class="QLineEdit" name="curLanguageLineEdit"/>
- </item>
- <item row="1" column="0" colspan="2">
- <widget class="QLabel" name="label_16">
- <property name="text">
- <string>Current Country:</string>
- </property>
- </widget>
- </item>
- <item row="1" column="2" colspan="2">
- <widget class="QLabel" name="countryCodeLabel">
- <property name="text">
- <string>TextLabel</string>
- </property>
- </widget>
- </item>
- <item row="2" column="0" colspan="2">
- <widget class="QLabel" name="label_2">
- <property name="text">
- <string>Available Languages:</string>
- </property>
- </widget>
- </item>
- <item row="2" column="2" colspan="2">
- <widget class="QComboBox" name="languagesComboBox"/>
- </item>
- <item row="3" column="0">
- <widget class="QLabel" name="label_3">
- <property name="text">
- <string>Version</string>
- </property>
- </widget>
- </item>
- <item row="3" column="1" colspan="2">
- <widget class="QComboBox" name="versionComboBox">
- <item>
- <property name="text">
- <string>Os</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>QtCore</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Firmware</string>
- </property>
- </item>
- </widget>
- </item>
- <item row="3" column="3" colspan="2">
- <widget class="QLineEdit" name="versionLineEdit"/>
- </item>
- <item row="4" column="0" colspan="2">
- <widget class="QLabel" name="label_4">
- <property name="text">
- <string>Feature supported</string>
- </property>
- </widget>
- </item>
- <item row="4" column="2" colspan="2">
- <widget class="QComboBox" name="featureComboBox">
- <item>
- <property name="text">
- <string>Bluetooth</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Camera</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>FmRadio</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Irda</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Led</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Memcard</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Usb</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Vibrate</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>WLan</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Sim</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Location</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>VideoOut</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Haptics</string>
- </property>
- </item>
- </widget>
- </item>
- <item row="4" column="4">
- <widget class="QLineEdit" name="featuresLineEdit"/>
- </item>
- <item row="5" column="1">
- <spacer name="verticalSpacer_3">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>291</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </widget>
- <widget class="QWidget" name="sysdevicetab">
- <attribute name="title">
- <string>Device</string>
- </attribute>
- <layout class="QGridLayout" name="gridLayout_6">
- <item row="0" column="0" colspan="2">
- <widget class="QProgressBar" name="batteryLevelBar">
- <property name="maximum">
- <number>100</number>
- </property>
- <property name="value">
- <number>0</number>
- </property>
- </widget>
- </item>
- <item row="0" column="2" rowspan="4" colspan="2">
- <widget class="QGroupBox" name="groupBox">
- <property name="title">
- <string>Power state</string>
- </property>
- <layout class="QGridLayout" name="gridLayout_8">
- <item row="0" column="0">
- <widget class="QRadioButton" name="radioButton">
- <property name="text">
- <string>Unknown Power</string>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QRadioButton" name="radioButton_2">
- <property name="text">
- <string>Battery Power</string>
- </property>
- </widget>
- </item>
- <item row="2" column="0">
- <widget class="QRadioButton" name="radioButton_3">
- <property name="text">
- <string>Wall Power</string>
- </property>
- </widget>
- </item>
- <item row="3" column="0">
- <widget class="QRadioButton" name="radioButton_4">
- <property name="text">
- <string>Wall Power charging Battery</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- <item row="1" column="0" colspan="2">
- <spacer name="horizontalSpacer_2">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>298</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="2" column="0">
- <widget class="QLabel" name="label_18">
- <property name="text">
- <string>IMEI:</string>
- </property>
- </widget>
- </item>
- <item row="2" column="1">
- <widget class="QLabel" name="ImeiLabel">
- <property name="text">
- <string>xx</string>
- </property>
- </widget>
- </item>
- <item row="3" column="0">
- <widget class="QLabel" name="label_19">
- <property name="text">
- <string>IMSI:</string>
- </property>
- </widget>
- </item>
- <item row="3" column="1">
- <widget class="QLabel" name="imsiLabel">
- <property name="text">
- <string>xx</string>
- </property>
- </widget>
- </item>
- <item row="4" column="0">
- <widget class="QLabel" name="label_20">
- <property name="text">
- <string>Manufacturer:</string>
- </property>
- </widget>
- </item>
- <item row="4" column="1">
- <widget class="QLabel" name="manufacturerLabel">
- <property name="text">
- <string>TextLabel</string>
- </property>
- </widget>
- </item>
- <item row="5" column="0">
- <widget class="QLabel" name="label_21">
- <property name="text">
- <string>Model</string>
- </property>
- </widget>
- </item>
- <item row="5" column="1">
- <widget class="QLabel" name="modelLabel">
- <property name="text">
- <string>TextLabel</string>
- </property>
- </widget>
- </item>
- <item row="6" column="0">
- <widget class="QLabel" name="label_22">
- <property name="text">
- <string>Product:</string>
- </property>
- </widget>
- </item>
- <item row="6" column="1">
- <widget class="QLabel" name="productLabel">
- <property name="text">
- <string>TextLabel</string>
- </property>
- </widget>
- </item>
- <item row="7" column="0">
- <widget class="QCheckBox" name="deviceLockCheckBox">
- <property name="text">
- <string>Device locked</string>
- </property>
- </widget>
- </item>
- <item row="8" column="0">
- <widget class="QLabel" name="label_23">
- <property name="text">
- <string>Sim status:</string>
- </property>
- </widget>
- </item>
- <item row="8" column="1" colspan="2">
- <widget class="QComboBox" name="simComboBox">
- <item>
- <property name="text">
- <string>Sim not available</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Single available</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Dual available</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Locked</string>
- </property>
- </item>
- </widget>
- </item>
- <item row="8" column="3">
- <spacer name="horizontalSpacer">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>201</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="9" column="0">
- <widget class="QLabel" name="label_24">
- <property name="text">
- <string>current Profile:</string>
- </property>
- </widget>
- </item>
- <item row="9" column="1" colspan="2">
- <widget class="QComboBox" name="profileComboBox">
- <item>
- <property name="text">
- <string>Unknown Profile</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Silent Profile</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Normal Profile</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Loud profile</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Vib profile</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Offline profile</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Powersave profile</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Custom profile</string>
- </property>
- </item>
- </widget>
- </item>
- <item row="10" column="0">
- <widget class="QLabel" name="label_25">
- <property name="text">
- <string>Input method:</string>
- </property>
- </widget>
- </item>
- <item row="10" column="1">
- <widget class="QLabel" name="inputMethodLabel">
- <property name="text">
- <string>TextLabel</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- <widget class="QWidget" name="sysdisplaytab">
- <attribute name="title">
- <string>Display</string>
- </attribute>
- <widget class="QLabel" name="label_14">
- <property name="geometry">
- <rect>
- <x>14</x>
- <y>30</y>
- <width>67</width>
- <height>16</height>
- </rect>
- </property>
- <property name="text">
- <string>brightness</string>
- </property>
- </widget>
- <widget class="QLineEdit" name="brightnessLineEdit">
- <property name="geometry">
- <rect>
- <x>90</x>
- <y>30</y>
- <width>114</width>
- <height>25</height>
- </rect>
- </property>
- </widget>
- <widget class="QLabel" name="label_15">
- <property name="geometry">
- <rect>
- <x>14</x>
- <y>60</y>
- <width>72</width>
- <height>16</height>
- </rect>
- </property>
- <property name="text">
- <string>color depth</string>
- </property>
- </widget>
- <widget class="QLineEdit" name="colorDepthLineEdit">
- <property name="geometry">
- <rect>
- <x>90</x>
- <y>60</y>
- <width>114</width>
- <height>25</height>
- </rect>
- </property>
- </widget>
- </widget>
- <widget class="QWidget" name="sysmemorytab">
- <attribute name="title">
- <string>Storage</string>
- </attribute>
- <layout class="QGridLayout" name="gridLayout_5">
- <item row="0" column="0">
- <widget class="QTreeWidget" name="storageTreeWidget">
- <column>
- <property name="text">
- <string>Volume Name</string>
- </property>
- </column>
- <column>
- <property name="text">
- <string>Type of Volume</string>
- </property>
- </column>
- <column>
- <property name="text">
- <string>Total Disk Space</string>
- </property>
- </column>
- <column>
- <property name="text">
- <string>Available Disk Space</string>
- </property>
- </column>
- </widget>
- </item>
- </layout>
- </widget>
- <widget class="QWidget" name="sysnetworktab">
- <attribute name="title">
- <string>Network</string>
- </attribute>
- <layout class="QGridLayout" name="gridLayout_9">
- <item row="0" column="0">
- <widget class="QGroupBox" name="groupBox_2">
- <property name="title">
- <string/>
- </property>
- <layout class="QGridLayout" name="gridLayout_3">
- <item row="0" column="0">
- <widget class="QComboBox" name="netStatusComboBox">
- <item>
- <property name="text">
- <string>Gsm</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Cdma</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Wcdma</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Wlan</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Ethernet</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Bluetooth</string>
- </property>
- </item>
- </widget>
- </item>
- <item row="0" column="1" colspan="2">
- <spacer name="horizontalSpacer_8">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="label_5">
- <property name="text">
- <string>Network Status</string>
- </property>
- </widget>
- </item>
- <item row="1" column="2">
- <widget class="QLabel" name="cellNetworkStatusLabel">
- <property name="frameShape">
- <enum>QFrame::StyledPanel</enum>
- </property>
- <property name="frameShadow">
- <enum>QFrame::Sunken</enum>
- </property>
- <property name="text">
- <string>.</string>
- </property>
- </widget>
- </item>
- <item row="2" column="0" colspan="2">
- <widget class="QLabel" name="label_6">
- <property name="text">
- <string>Network Signal Strength</string>
- </property>
- </widget>
- </item>
- <item row="2" column="2">
- <widget class="QProgressBar" name="signalLevelProgressBar">
- <property name="value">
- <number>0</number>
- </property>
- <property name="format">
- <string>%v</string>
- </property>
- </widget>
- </item>
- <item row="3" column="0">
- <widget class="QLabel" name="label_26">
- <property name="text">
- <string>MAC address:</string>
- </property>
- </widget>
- </item>
- <item row="3" column="2">
- <widget class="QLabel" name="macAddressLabel">
- <property name="text">
- <string>.</string>
- </property>
- </widget>
- </item>
- <item row="4" column="0">
- <widget class="QLabel" name="label_27">
- <property name="text">
- <string>Interface Name:</string>
- </property>
- </widget>
- </item>
- <item row="4" column="2">
- <widget class="QLabel" name="InterfaceLabel">
- <property name="text">
- <string>.</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QGroupBox" name="groupBox_3">
- <property name="title">
- <string/>
- </property>
- <layout class="QGridLayout" name="gridLayout_7">
- <item row="0" column="0">
- <widget class="QLabel" name="label_7">
- <property name="text">
- <string>Cell Id:</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QLabel" name="cellIdLabel">
- <property name="frameShape">
- <enum>QFrame::StyledPanel</enum>
- </property>
- <property name="frameShadow">
- <enum>QFrame::Sunken</enum>
- </property>
- <property name="text">
- <string>.</string>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="label_8">
- <property name="text">
- <string>Location Area Code</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QLabel" name="locationAreaCodeLabel">
- <property name="frameShape">
- <enum>QFrame::StyledPanel</enum>
- </property>
- <property name="frameShadow">
- <enum>QFrame::Sunken</enum>
- </property>
- <property name="text">
- <string>.</string>
- </property>
- </widget>
- </item>
- <item row="2" column="0">
- <widget class="QLabel" name="label_9">
- <property name="text">
- <string>Current MMC:</string>
- </property>
- </widget>
- </item>
- <item row="2" column="1">
- <widget class="QLabel" name="currentMMCLabel">
- <property name="frameShape">
- <enum>QFrame::StyledPanel</enum>
- </property>
- <property name="frameShadow">
- <enum>QFrame::Sunken</enum>
- </property>
- <property name="text">
- <string>.</string>
- </property>
- </widget>
- </item>
- <item row="2" column="2">
- <spacer name="horizontalSpacer_4">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>136</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="2" column="3">
- <widget class="QLabel" name="label_11">
- <property name="text">
- <string>Home MMC:</string>
- </property>
- </widget>
- </item>
- <item row="2" column="4">
- <widget class="QLabel" name="homeMMCLabel">
- <property name="frameShape">
- <enum>QFrame::StyledPanel</enum>
- </property>
- <property name="frameShadow">
- <enum>QFrame::Sunken</enum>
- </property>
- <property name="text">
- <string>.</string>
- </property>
- </widget>
- </item>
- <item row="2" column="5">
- <spacer name="horizontalSpacer_5">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>135</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="3" column="0">
- <widget class="QLabel" name="label_10">
- <property name="text">
- <string>Current MNC:</string>
- </property>
- </widget>
- </item>
- <item row="3" column="1">
- <widget class="QLabel" name="currentMNCLabel">
- <property name="frameShape">
- <enum>QFrame::StyledPanel</enum>
- </property>
- <property name="frameShadow">
- <enum>QFrame::Sunken</enum>
- </property>
- <property name="text">
- <string>.</string>
- </property>
- </widget>
- </item>
- <item row="3" column="2">
- <spacer name="horizontalSpacer_6">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>136</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="3" column="3">
- <widget class="QLabel" name="label_12">
- <property name="text">
- <string>Home MNC:</string>
- </property>
- </widget>
- </item>
- <item row="3" column="4">
- <widget class="QLabel" name="homeMNCLabel">
- <property name="frameShape">
- <enum>QFrame::StyledPanel</enum>
- </property>
- <property name="frameShadow">
- <enum>QFrame::Sunken</enum>
- </property>
- <property name="text">
- <string>.</string>
- </property>
- </widget>
- </item>
- <item row="3" column="5">
- <spacer name="horizontalSpacer_7">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>135</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="4" column="0">
- <widget class="QLabel" name="label_13">
- <property name="text">
- <string>Network Name</string>
- </property>
- </widget>
- </item>
- <item row="4" column="1" colspan="5">
- <widget class="QLabel" name="operatorNameLabel">
- <property name="frameShape">
- <enum>QFrame::StyledPanel</enum>
- </property>
- <property name="frameShadow">
- <enum>QFrame::Sunken</enum>
- </property>
- <property name="text">
- <string>.</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- <item row="2" column="0">
- <spacer name="verticalSpacer_2">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>213</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </widget>
- <widget class="QWidget" name="screenTab">
- <attribute name="title">
- <string>Screen Saver</string>
- </attribute>
- <layout class="QGridLayout" name="gridLayout_4">
- <item row="0" column="0" colspan="3">
- <widget class="QCheckBox" name="saverInhibitedCheckBox">
- <property name="text">
- <string>Screen Saver Inhibited</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1" colspan="2">
- <spacer name="verticalSpacer">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>40</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </widget>
- </widget>
- </item>
- </layout>
- </widget>
- <layoutdefault spacing="6" margin="11"/>
- <resources/>
- <connections/>
-</ui>
+<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>Dialog</class> + <widget class="QWidget" name="Dialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>678</width> + <height>556</height> + </rect> + </property> + <property name="windowTitle"> + <string>System Information</string> + </property> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QTabWidget" name="tabWidget"> + <property name="currentIndex"> + <number>0</number> + </property> + <widget class="QWidget" name="generaltab"> + <attribute name="title"> + <string>General</string> + </attribute> + <layout class="QGridLayout" name="gridLayout_10"> + <item row="0" column="0" colspan="2"> + <widget class="QLabel" name="label_17"> + <property name="text"> + <string>Current Language:</string> + </property> + </widget> + </item> + <item row="0" column="2" colspan="2"> + <widget class="QLineEdit" name="curLanguageLineEdit"/> + </item> + <item row="1" column="0" colspan="2"> + <widget class="QLabel" name="label_28"> + <property name="text"> + <string>Current Country:</string> + </property> + </widget> + </item> + <item row="1" column="2" colspan="2"> + <widget class="QLabel" name="countryCodeLabel"> + <property name="text"> + <string>TextLabel</string> + </property> + </widget> + </item> + <item row="2" column="0" colspan="2"> + <widget class="QLabel" name="label_29"> + <property name="text"> + <string>Available Languages:</string> + </property> + </widget> + </item> + <item row="2" column="2" colspan="2"> + <widget class="QComboBox" name="languagesComboBox"/> + </item> + <item row="3" column="0"> + <widget class="QLabel" name="label_30"> + <property name="text"> + <string>Version</string> + </property> + </widget> + </item> + <item row="3" column="1" colspan="2"> + <widget class="QComboBox" name="versionComboBox"> + <item> + <property name="text"> + <string>Os</string> + </property> + </item> + <item> + <property name="text"> + <string>QtCore</string> + </property> + </item> + <item> + <property name="text"> + <string>Firmware</string> + </property> + </item> + </widget> + </item> + <item row="3" column="3" colspan="2"> + <widget class="QLineEdit" name="versionLineEdit"/> + </item> + <item row="4" column="0" colspan="2"> + <widget class="QLabel" name="label_31"> + <property name="text"> + <string>Feature supported</string> + </property> + </widget> + </item> + <item row="4" column="2" colspan="2"> + <widget class="QComboBox" name="featureComboBox"> + <item> + <property name="text"> + <string>Bluetooth</string> + </property> + </item> + <item> + <property name="text"> + <string>Camera</string> + </property> + </item> + <item> + <property name="text"> + <string>FmRadio</string> + </property> + </item> + <item> + <property name="text"> + <string>Irda</string> + </property> + </item> + <item> + <property name="text"> + <string>Led</string> + </property> + </item> + <item> + <property name="text"> + <string>Memcard</string> + </property> + </item> + <item> + <property name="text"> + <string>Usb</string> + </property> + </item> + <item> + <property name="text"> + <string>Vibrate</string> + </property> + </item> + <item> + <property name="text"> + <string>WLan</string> + </property> + </item> + <item> + <property name="text"> + <string>Sim</string> + </property> + </item> + <item> + <property name="text"> + <string>Location</string> + </property> + </item> + <item> + <property name="text"> + <string>VideoOut</string> + </property> + </item> + <item> + <property name="text"> + <string>Haptics</string> + </property> + </item> + </widget> + </item> + <item row="4" column="4"> + <widget class="QLineEdit" name="featuresLineEdit"/> + </item> + <item row="5" column="1"> + <spacer name="verticalSpacer_4"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>291</height> + </size> + </property> + </spacer> + </item> + </layout> + </widget> + <widget class="QWidget" name="sysdevicetab"> + <attribute name="title"> + <string>Device</string> + </attribute> + <layout class="QGridLayout" name="gridLayout_11"> + <item row="0" column="0" colspan="2"> + <widget class="QProgressBar" name="batteryLevelBar"> + <property name="maximum"> + <number>100</number> + </property> + <property name="value"> + <number>0</number> + </property> + </widget> + </item> + <item row="0" column="2" rowspan="4" colspan="2"> + <widget class="QGroupBox" name="groupBox_4"> + <property name="title"> + <string>Power state</string> + </property> + <layout class="QGridLayout" name="gridLayout_12"> + <item row="0" column="0"> + <widget class="QRadioButton" name="radioButton"> + <property name="text"> + <string>Unknown Power</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QRadioButton" name="radioButton_2"> + <property name="text"> + <string>Battery Power</string> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QRadioButton" name="radioButton_3"> + <property name="text"> + <string>Wall Power</string> + </property> + </widget> + </item> + <item row="3" column="0"> + <widget class="QRadioButton" name="radioButton_4"> + <property name="text"> + <string>Wall Power charging Battery</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item row="1" column="0" colspan="2"> + <spacer name="horizontalSpacer_3"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>298</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item row="2" column="0"> + <widget class="QLabel" name="label_32"> + <property name="text"> + <string>IMEI:</string> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="QLabel" name="ImeiLabel"> + <property name="text"> + <string>xx</string> + </property> + </widget> + </item> + <item row="3" column="0"> + <widget class="QLabel" name="label_33"> + <property name="text"> + <string>IMSI:</string> + </property> + </widget> + </item> + <item row="3" column="1"> + <widget class="QLabel" name="imsiLabel"> + <property name="text"> + <string>xx</string> + </property> + </widget> + </item> + <item row="4" column="0"> + <widget class="QLabel" name="label_34"> + <property name="text"> + <string>Manufacturer:</string> + </property> + </widget> + </item> + <item row="4" column="1"> + <widget class="QLabel" name="manufacturerLabel"> + <property name="text"> + <string>TextLabel</string> + </property> + </widget> + </item> + <item row="5" column="0"> + <widget class="QLabel" name="label_35"> + <property name="text"> + <string>Model</string> + </property> + </widget> + </item> + <item row="5" column="1"> + <widget class="QLabel" name="modelLabel"> + <property name="text"> + <string>TextLabel</string> + </property> + </widget> + </item> + <item row="6" column="0"> + <widget class="QLabel" name="label_36"> + <property name="text"> + <string>Product:</string> + </property> + </widget> + </item> + <item row="6" column="1"> + <widget class="QLabel" name="productLabel"> + <property name="text"> + <string>TextLabel</string> + </property> + </widget> + </item> + <item row="7" column="0"> + <widget class="QCheckBox" name="deviceLockCheckBox"> + <property name="text"> + <string>Device locked</string> + </property> + </widget> + </item> + <item row="8" column="0"> + <widget class="QLabel" name="label_37"> + <property name="text"> + <string>Sim status:</string> + </property> + </widget> + </item> + <item row="8" column="1" colspan="2"> + <widget class="QComboBox" name="simComboBox"> + <item> + <property name="text"> + <string>Sim not available</string> + </property> + </item> + <item> + <property name="text"> + <string>Single available</string> + </property> + </item> + <item> + <property name="text"> + <string>Dual available</string> + </property> + </item> + <item> + <property name="text"> + <string>Locked</string> + </property> + </item> + </widget> + </item> + <item row="8" column="3"> + <spacer name="horizontalSpacer_9"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>201</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item row="9" column="0"> + <widget class="QLabel" name="label_38"> + <property name="text"> + <string>current Profile:</string> + </property> + </widget> + </item> + <item row="9" column="1" colspan="2"> + <widget class="QComboBox" name="profileComboBox"> + <item> + <property name="text"> + <string>Unknown Profile</string> + </property> + </item> + <item> + <property name="text"> + <string>Silent Profile</string> + </property> + </item> + <item> + <property name="text"> + <string>Normal Profile</string> + </property> + </item> + <item> + <property name="text"> + <string>Loud profile</string> + </property> + </item> + <item> + <property name="text"> + <string>Vib profile</string> + </property> + </item> + <item> + <property name="text"> + <string>Offline profile</string> + </property> + </item> + <item> + <property name="text"> + <string>Powersave profile</string> + </property> + </item> + <item> + <property name="text"> + <string>Custom profile</string> + </property> + </item> + </widget> + </item> + <item row="10" column="0"> + <widget class="QLabel" name="label_39"> + <property name="text"> + <string>Input method:</string> + </property> + </widget> + </item> + <item row="10" column="1"> + <widget class="QLabel" name="inputMethodLabel"> + <property name="text"> + <string>TextLabel</string> + </property> + </widget> + </item> + </layout> + </widget> + <widget class="QWidget" name="sysdisplaytab"> + <attribute name="title"> + <string>Display</string> + </attribute> + <widget class="QLabel" name="label_40"> + <property name="geometry"> + <rect> + <x>14</x> + <y>30</y> + <width>67</width> + <height>16</height> + </rect> + </property> + <property name="text"> + <string>brightness</string> + </property> + </widget> + <widget class="QLineEdit" name="brightnessLineEdit"> + <property name="geometry"> + <rect> + <x>90</x> + <y>30</y> + <width>114</width> + <height>25</height> + </rect> + </property> + </widget> + <widget class="QLabel" name="label_41"> + <property name="geometry"> + <rect> + <x>14</x> + <y>60</y> + <width>72</width> + <height>16</height> + </rect> + </property> + <property name="text"> + <string>color depth</string> + </property> + </widget> + <widget class="QLineEdit" name="colorDepthLineEdit"> + <property name="geometry"> + <rect> + <x>90</x> + <y>60</y> + <width>114</width> + <height>25</height> + </rect> + </property> + </widget> + </widget> + <widget class="QWidget" name="sysmemorytab"> + <attribute name="title"> + <string>Storage</string> + </attribute> + <layout class="QGridLayout" name="gridLayout_13"> + <item row="0" column="0"> + <widget class="QTreeWidget" name="storageTreeWidget"> + <column> + <property name="text"> + <string>Volume Name</string> + </property> + </column> + <column> + <property name="text"> + <string>Type of Volume</string> + </property> + </column> + <column> + <property name="text"> + <string>Total Disk Space</string> + </property> + </column> + <column> + <property name="text"> + <string>Available Disk Space</string> + </property> + </column> + </widget> + </item> + </layout> + </widget> + <widget class="QWidget" name="sysnetworktab"> + <attribute name="title"> + <string>Network</string> + </attribute> + <layout class="QGridLayout" name="gridLayout_3"> + <item row="0" column="0"> + <widget class="QGroupBox" name="groupBox_5"> + <property name="title"> + <string/> + </property> + <layout class="QGridLayout" name="gridLayout_15"> + <item row="0" column="0"> + <widget class="QComboBox" name="netStatusComboBox"> + <item> + <property name="text"> + <string>Gsm</string> + </property> + </item> + <item> + <property name="text"> + <string>Cdma</string> + </property> + </item> + <item> + <property name="text"> + <string>Wcdma</string> + </property> + </item> + <item> + <property name="text"> + <string>Wlan</string> + </property> + </item> + <item> + <property name="text"> + <string>Ethernet</string> + </property> + </item> + <item> + <property name="text"> + <string>Bluetooth</string> + </property> + </item> + </widget> + </item> + <item row="0" column="1" colspan="2"> + <spacer name="horizontalSpacer_10"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="label_42"> + <property name="text"> + <string>Network Status</string> + </property> + </widget> + </item> + <item row="1" column="2"> + <widget class="QLabel" name="cellNetworkStatusLabel"> + <property name="frameShape"> + <enum>QFrame::StyledPanel</enum> + </property> + <property name="frameShadow"> + <enum>QFrame::Sunken</enum> + </property> + <property name="text"> + <string>.</string> + </property> + </widget> + </item> + <item row="2" column="0" colspan="2"> + <widget class="QLabel" name="label_43"> + <property name="text"> + <string>Network Signal Strength</string> + </property> + </widget> + </item> + <item row="2" column="2"> + <widget class="QProgressBar" name="signalLevelProgressBar"> + <property name="value"> + <number>0</number> + </property> + <property name="format"> + <string>%v</string> + </property> + </widget> + </item> + <item row="3" column="0"> + <widget class="QLabel" name="label_44"> + <property name="text"> + <string>MAC address:</string> + </property> + </widget> + </item> + <item row="3" column="2"> + <widget class="QLabel" name="macAddressLabel"> + <property name="text"> + <string>.</string> + </property> + </widget> + </item> + <item row="4" column="0"> + <widget class="QLabel" name="label_45"> + <property name="text"> + <string>Interface Name:</string> + </property> + </widget> + </item> + <item row="4" column="2"> + <widget class="QLabel" name="InterfaceLabel"> + <property name="text"> + <string>.</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item row="1" column="0" colspan="2"> + <widget class="QGroupBox" name="groupBox_6"> + <property name="title"> + <string/> + </property> + <layout class="QGridLayout" name="gridLayout_2"> + <item row="0" column="0"> + <widget class="QLabel" name="label_46"> + <property name="text"> + <string>Cell Id:</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QLabel" name="cellIdLabel"> + <property name="frameShape"> + <enum>QFrame::StyledPanel</enum> + </property> + <property name="frameShadow"> + <enum>QFrame::Sunken</enum> + </property> + <property name="text"> + <string>.</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="label_47"> + <property name="text"> + <string>Location Area Code</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QLabel" name="locationAreaCodeLabel"> + <property name="frameShape"> + <enum>QFrame::StyledPanel</enum> + </property> + <property name="frameShadow"> + <enum>QFrame::Sunken</enum> + </property> + <property name="text"> + <string>.</string> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QLabel" name="label_48"> + <property name="text"> + <string>Current MMC:</string> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="QLabel" name="currentMMCLabel"> + <property name="frameShape"> + <enum>QFrame::StyledPanel</enum> + </property> + <property name="frameShadow"> + <enum>QFrame::Sunken</enum> + </property> + <property name="text"> + <string>.</string> + </property> + </widget> + </item> + <item row="2" column="2"> + <spacer name="horizontalSpacer_11"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>136</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item row="3" column="0"> + <widget class="QLabel" name="label_50"> + <property name="text"> + <string>Current MNC:</string> + </property> + </widget> + </item> + <item row="3" column="1"> + <widget class="QLabel" name="currentMNCLabel"> + <property name="frameShape"> + <enum>QFrame::StyledPanel</enum> + </property> + <property name="frameShadow"> + <enum>QFrame::Sunken</enum> + </property> + <property name="text"> + <string>.</string> + </property> + </widget> + </item> + <item row="3" column="2"> + <spacer name="horizontalSpacer_13"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>136</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item row="4" column="0"> + <widget class="QLabel" name="label_49"> + <property name="text"> + <string>Home MMC:</string> + </property> + </widget> + </item> + <item row="4" column="1"> + <widget class="QLabel" name="homeMMCLabel"> + <property name="frameShape"> + <enum>QFrame::StyledPanel</enum> + </property> + <property name="frameShadow"> + <enum>QFrame::Sunken</enum> + </property> + <property name="text"> + <string>.</string> + </property> + </widget> + </item> + <item row="4" column="2"> + <spacer name="horizontalSpacer_12"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>135</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item row="5" column="0"> + <widget class="QLabel" name="label_51"> + <property name="text"> + <string>Home MNC:</string> + </property> + </widget> + </item> + <item row="5" column="1"> + <widget class="QLabel" name="homeMNCLabel"> + <property name="frameShape"> + <enum>QFrame::StyledPanel</enum> + </property> + <property name="frameShadow"> + <enum>QFrame::Sunken</enum> + </property> + <property name="text"> + <string>.</string> + </property> + </widget> + </item> + <item row="5" column="2"> + <spacer name="horizontalSpacer_14"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>135</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item row="6" column="0"> + <widget class="QLabel" name="label_52"> + <property name="text"> + <string>Network Name</string> + </property> + </widget> + </item> + <item row="6" column="1"> + <widget class="QLabel" name="operatorNameLabel"> + <property name="frameShape"> + <enum>QFrame::StyledPanel</enum> + </property> + <property name="frameShadow"> + <enum>QFrame::Sunken</enum> + </property> + <property name="text"> + <string>.</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item row="2" column="1"> + <spacer name="verticalSpacer_5"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>213</height> + </size> + </property> + </spacer> + </item> + </layout> + </widget> + <widget class="QWidget" name="screenTab"> + <attribute name="title"> + <string>Screen Saver</string> + </attribute> + <layout class="QGridLayout" name="gridLayout_17"> + <item row="0" column="0" colspan="3"> + <widget class="QCheckBox" name="saverInhibitedCheckBox"> + <property name="text"> + <string>Screen Saver Inhibited</string> + </property> + </widget> + </item> + <item row="1" column="1" colspan="2"> + <spacer name="verticalSpacer_6"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> + </item> + </layout> + </widget> + </widget> + </item> + </layout> + </widget> + <resources/> + <connections/> +</ui> diff --git a/examples/sysinfo/dialog_s60.ui b/examples/sysinfo/dialog_s60.ui index dbb8abfc8c..604c0126e6 100644 --- a/examples/sysinfo/dialog_s60.ui +++ b/examples/sysinfo/dialog_s60.ui @@ -1,51 +1,347 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> <class>Dialog</class> - <widget class="QDialog" name="Dialog"> + <widget class="QWidget" name="Dialog"> <property name="geometry"> <rect> <x>0</x> <y>0</y> - <width>165</width> - <height>244</height> + <width>346</width> + <height>529</height> </rect> </property> <property name="windowTitle"> - <string>Sysinfo</string> + <string>System Information</string> </property> - <layout class="QVBoxLayout" name="verticalLayout_3"> - <item> - <layout class="QHBoxLayout" name="horizontalLayout_33"> - <item> - <widget class="QTabWidget" name="tabWidget"> - <property name="layoutDirection"> - <enum>Qt::LeftToRight</enum> - </property> - <property name="autoFillBackground"> - <bool>false</bool> - </property> - <property name="tabPosition"> - <enum>QTabWidget::North</enum> - </property> - <property name="currentIndex"> - <number>0</number> - </property> - <property name="documentMode"> - <bool>true</bool> - </property> - <property name="tabsClosable"> - <bool>false</bool> - </property> - <property name="movable"> - <bool>false</bool> - </property> - <widget class="QWidget" name="generaltab"> - <attribute name="title"> - <string>General</string> - </attribute> - <layout class="QVBoxLayout" name="verticalLayout_7"> - <item> - <widget class="QLabel" name="label"> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QTabWidget" name="tabWidget"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="maximumSize"> + <size> + <width>770</width> + <height>16777215</height> + </size> + </property> + <property name="layoutDirection"> + <enum>Qt::LeftToRight</enum> + </property> + <property name="autoFillBackground"> + <bool>false</bool> + </property> + <property name="tabPosition"> + <enum>QTabWidget::North</enum> + </property> + <property name="currentIndex"> + <number>0</number> + </property> + <property name="documentMode"> + <bool>true</bool> + </property> + <property name="tabsClosable"> + <bool>false</bool> + </property> + <property name="movable"> + <bool>false</bool> + </property> + <widget class="QWidget" name="generaltab"> + <attribute name="title"> + <string>General</string> + </attribute> + <layout class="QGridLayout" name="gridLayout_2"> + <item row="0" column="0"> + <widget class="QLabel" name="label"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Current Language:</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLineEdit" name="curLanguageLineEdit"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QLabel" name="label_16"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Current Country:</string> + </property> + </widget> + </item> + <item row="3" column="0"> + <widget class="QLabel" name="countryCodeLabel"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>TextLabel</string> + </property> + </widget> + </item> + <item row="4" column="0"> + <widget class="QLabel" name="label_2"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Available Languages:</string> + </property> + </widget> + </item> + <item row="4" column="1" rowspan="2"> + <spacer name="horizontalSpacer_10"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>357</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item row="5" column="0"> + <widget class="QComboBox" name="languagesComboBox"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + </widget> + </item> + <item row="6" column="0"> + <spacer name="verticalSpacer_8"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>291</height> + </size> + </property> + </spacer> + </item> + </layout> + </widget> + <widget class="QWidget" name="generaltab_2"> + <attribute name="title"> + <string>General2</string> + </attribute> + <layout class="QGridLayout" name="gridLayout_14"> + <item row="0" column="0"> + <widget class="QComboBox" name="versionComboBox"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <item> + <property name="text"> + <string>Os</string> + </property> + </item> + <item> + <property name="text"> + <string>QtCore</string> + </property> + </item> + <item> + <property name="text"> + <string>Firmware</string> + </property> + </item> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="label_3"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Version</string> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QLineEdit" name="versionLineEdit"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + </widget> + </item> + <item row="3" column="0"> + <widget class="QComboBox" name="featureComboBox"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <item> + <property name="text"> + <string>Bluetooth</string> + </property> + </item> + <item> + <property name="text"> + <string>Camera</string> + </property> + </item> + <item> + <property name="text"> + <string>FmRadio</string> + </property> + </item> + <item> + <property name="text"> + <string>Irda</string> + </property> + </item> + <item> + <property name="text"> + <string>Led</string> + </property> + </item> + <item> + <property name="text"> + <string>Memcard</string> + </property> + </item> + <item> + <property name="text"> + <string>Usb</string> + </property> + </item> + <item> + <property name="text"> + <string>Vibrate</string> + </property> + </item> + <item> + <property name="text"> + <string>WLan</string> + </property> + </item> + <item> + <property name="text"> + <string>Sim</string> + </property> + </item> + <item> + <property name="text"> + <string>Location</string> + </property> + </item> + <item> + <property name="text"> + <string>VideoOut</string> + </property> + </item> + <item> + <property name="text"> + <string>Haptics</string> + </property> + </item> + </widget> + </item> + <item row="4" column="0"> + <widget class="QLabel" name="label_4"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Feature supported</string> + </property> + </widget> + </item> + <item row="4" column="1" rowspan="2"> + <spacer name="horizontalSpacer_11"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>359</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item row="5" column="0"> + <widget class="QLineEdit" name="featuresLineEdit"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + </widget> + </item> + <item row="6" column="0"> + <spacer name="verticalSpacer_11"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>343</height> + </size> + </property> + </spacer> + </item> + </layout> + </widget> + <widget class="QWidget" name="sysdevicetab"> + <attribute name="title"> + <string>Device</string> + </attribute> + <layout class="QGridLayout" name="gridLayout_15"> + <item row="0" column="0"> + <layout class="QHBoxLayout" name="horizontalLayout_6"> + <item> + <widget class="QLabel" name="label_18"> <property name="sizePolicy"> <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <horstretch>0</horstretch> @@ -53,22 +349,29 @@ </sizepolicy> </property> <property name="text"> - <string>Current Language:</string> + <string>IMEI:</string> </property> </widget> </item> <item> - <widget class="QLineEdit" name="curLanguageLineEdit"> + <widget class="QLabel" name="ImeiLabel"> <property name="sizePolicy"> <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> + <property name="text"> + <string>xx</string> + </property> </widget> </item> + </layout> + </item> + <item row="1" column="0"> + <layout class="QHBoxLayout" name="horizontalLayout_7"> <item> - <widget class="QLabel" name="label_16"> + <widget class="QLabel" name="label_19"> <property name="sizePolicy"> <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <horstretch>0</horstretch> @@ -76,12 +379,12 @@ </sizepolicy> </property> <property name="text"> - <string>Current Country:</string> + <string>IMSI:</string> </property> </widget> </item> <item> - <widget class="QLabel" name="countryCodeLabel"> + <widget class="QLabel" name="imsiLabel"> <property name="sizePolicy"> <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <horstretch>0</horstretch> @@ -89,12 +392,16 @@ </sizepolicy> </property> <property name="text"> - <string>TextLabel</string> + <string>xx</string> </property> </widget> </item> + </layout> + </item> + <item row="2" column="0"> + <layout class="QHBoxLayout" name="horizontalLayout_8"> <item> - <widget class="QLabel" name="label_2"> + <widget class="QLabel" name="label_34"> <property name="sizePolicy"> <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <horstretch>0</horstretch> @@ -102,102 +409,55 @@ </sizepolicy> </property> <property name="text"> - <string>Available Languages:</string> + <string>Manufacturer:</string> </property> </widget> </item> <item> - <widget class="QComboBox" name="languagesComboBox"> + <widget class="QLabel" name="manufacturerLabel"> <property name="sizePolicy"> <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> - </widget> - </item> - <item> - <spacer name="verticalSpacer_3"> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>291</height> - </size> + <property name="text"> + <string>TextLabel</string> </property> - </spacer> + </widget> </item> </layout> - </widget> - <widget class="QWidget" name="generaltab_2"> - <attribute name="title"> - <string>General2</string> - </attribute> - <layout class="QVBoxLayout" name="verticalLayout_2"> - <item> - <widget class="QComboBox" name="versionComboBox"> + </item> + <item row="2" column="1" rowspan="2"> + <spacer name="horizontalSpacer_12"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>359</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item row="3" column="0"> + <layout class="QHBoxLayout" name="horizontalLayout_9"> + <item> + <widget class="QLabel" name="label_35"> <property name="sizePolicy"> <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> - <item> - <property name="text"> - <string>Os</string> - </property> - </item> - <item> - <property name="text"> - <string>QtCore</string> - </property> - </item> - <item> - <property name="text"> - <string>WrtCore</string> - </property> - </item> - <item> - <property name="text"> - <string>Webkit</string> - </property> - </item> - <item> - <property name="text"> - <string>ServiceFramework</string> - </property> - </item> - <item> - <property name="text"> - <string>WrtExtensions</string> - </property> - </item> - <item> - <property name="text"> - <string>Service Provider</string> - </property> - </item> - <item> - <property name="text"> - <string>Netscape Plugin</string> - </property> - </item> - <item> - <property name="text"> - <string>Webapp</string> - </property> - </item> - <item> - <property name="text"> - <string>Firmware</string> - </property> - </item> + <property name="text"> + <string>Model</string> + </property> </widget> </item> <item> - <widget class="QLabel" name="label_3"> + <widget class="QLabel" name="modelLabel"> <property name="sizePolicy"> <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <horstretch>0</horstretch> @@ -205,90 +465,29 @@ </sizepolicy> </property> <property name="text"> - <string>Version</string> + <string>TextLabel</string> </property> </widget> </item> + </layout> + </item> + <item row="4" column="0"> + <layout class="QHBoxLayout" name="horizontalLayout_10"> <item> - <widget class="QLineEdit" name="versionLineEdit"/> - </item> - <item> - <widget class="QComboBox" name="featureComboBox"> + <widget class="QLabel" name="label_36"> <property name="sizePolicy"> <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> - <item> - <property name="text"> - <string>Bluetooth</string> - </property> - </item> - <item> - <property name="text"> - <string>Camera</string> - </property> - </item> - <item> - <property name="text"> - <string>FmRadio</string> - </property> - </item> - <item> - <property name="text"> - <string>Irda</string> - </property> - </item> - <item> - <property name="text"> - <string>Led</string> - </property> - </item> - <item> - <property name="text"> - <string>Memcard</string> - </property> - </item> - <item> - <property name="text"> - <string>Usb</string> - </property> - </item> - <item> - <property name="text"> - <string>Vibrate</string> - </property> - </item> - <item> - <property name="text"> - <string>WLan</string> - </property> - </item> - <item> - <property name="text"> - <string>Sim</string> - </property> - </item> - <item> - <property name="text"> - <string>Location</string> - </property> - </item> - <item> - <property name="text"> - <string>VideoOut</string> - </property> - </item> - <item> - <property name="text"> - <string>Haptics</string> - </property> - </item> + <property name="text"> + <string>Product:</string> + </property> </widget> </item> <item> - <widget class="QLabel" name="label_4"> + <widget class="QLabel" name="productLabel"> <property name="sizePolicy"> <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <horstretch>0</horstretch> @@ -296,205 +495,463 @@ </sizepolicy> </property> <property name="text"> - <string>Feature supported</string> + <string>TextLabel</string> </property> </widget> </item> + </layout> + </item> + <item row="5" column="0"> + <spacer name="verticalSpacer_13"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>309</height> + </size> + </property> + </spacer> + </item> + </layout> + </widget> + <widget class="QWidget" name="sysdevicetab_2"> + <attribute name="title"> + <string>Device2</string> + </attribute> + <layout class="QGridLayout" name="gridLayout_16"> + <item row="0" column="0"> + <widget class="QCheckBox" name="deviceLockCheckBox"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Device locked</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="label_37"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Sim status:</string> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QComboBox" name="simComboBox"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <item> + <property name="text"> + <string>Sim not available</string> + </property> + </item> <item> - <widget class="QLineEdit" name="featuresLineEdit"/> + <property name="text"> + <string>Single available</string> + </property> </item> <item> - <spacer name="verticalSpacer_10"> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>343</height> - </size> - </property> - </spacer> + <property name="text"> + <string>Dual available</string> + </property> </item> - </layout> - </widget> - <widget class="QWidget" name="sysdevicetab"> - <attribute name="title"> - <string>Device</string> - </attribute> - <layout class="QVBoxLayout" name="verticalLayout_4"> - <item> - <layout class="QHBoxLayout" name="horizontalLayout"> - <item> - <widget class="QLabel" name="label_18"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>IMEI:</string> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="ImeiLabel"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>xx</string> - </property> - </widget> - </item> - </layout> - </item> - <item> - <layout class="QHBoxLayout" name="horizontalLayout_2"> - <item> - <widget class="QLabel" name="label_19"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>IMSI:</string> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="imsiLabel"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>xx</string> - </property> - </widget> - </item> - </layout> - </item> - <item> - <layout class="QHBoxLayout" name="horizontalLayout_3"> - <item> - <widget class="QLabel" name="label_20"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>Manufacturer:</string> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="manufacturerLabel"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>TextLabel</string> - </property> - </widget> - </item> - </layout> - </item> - <item> - <layout class="QHBoxLayout" name="horizontalLayout_4"> - <item> - <widget class="QLabel" name="label_21"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>Model</string> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="modelLabel"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>TextLabel</string> - </property> - </widget> - </item> - </layout> - </item> - <item> - <layout class="QHBoxLayout" name="horizontalLayout_5"> - <item> - <widget class="QLabel" name="label_22"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>Product:</string> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="productLabel"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>TextLabel</string> - </property> - </widget> - </item> - </layout> - </item> - <item> - <spacer name="verticalSpacer_4"> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>309</height> - </size> - </property> - </spacer> + <item> + <property name="text"> + <string>Locked</string> + </property> </item> - </layout> - </widget> - <widget class="QWidget" name="sysdevicetab_2"> - <attribute name="title"> - <string>Device2</string> - </attribute> - <layout class="QVBoxLayout" name="verticalLayout_5"> - <item> - <widget class="QCheckBox" name="deviceLockCheckBox"> + </widget> + </item> + <item row="3" column="0"> + <widget class="QLabel" name="label_38"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>current Profile:</string> + </property> + </widget> + </item> + <item row="4" column="0"> + <widget class="QComboBox" name="profileComboBox"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <item> + <property name="text"> + <string>Unknown Profile</string> + </property> + </item> + <item> + <property name="text"> + <string>Silent Profile</string> + </property> + </item> + <item> + <property name="text"> + <string>Normal Profile</string> + </property> + </item> + <item> + <property name="text"> + <string>Loud profile</string> + </property> + </item> + <item> + <property name="text"> + <string>Vib profile</string> + </property> + </item> + <item> + <property name="text"> + <string>Offline profile</string> + </property> + </item> + <item> + <property name="text"> + <string>Powersave profile</string> + </property> + </item> + <item> + <property name="text"> + <string>Custom profile</string> + </property> + </item> + </widget> + </item> + <item row="5" column="0"> + <widget class="QLabel" name="label_39"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Input method:</string> + </property> + </widget> + </item> + <item row="5" column="1" rowspan="2"> + <spacer name="horizontalSpacer_13"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>359</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item row="6" column="0"> + <widget class="QLabel" name="inputMethodLabel"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>TextLabel</string> + </property> + <property name="wordWrap"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="7" column="0"> + <spacer name="verticalSpacer_14"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>346</height> + </size> + </property> + </spacer> + </item> + </layout> + </widget> + <widget class="QWidget" name="sysdevicetab_3"> + <attribute name="title"> + <string>Device3</string> + </attribute> + <layout class="QGridLayout" name="gridLayout_17"> + <item row="0" column="0"> + <widget class="QLabel" name="powerStateLabel"> + <property name="text"> + <string>PowerState</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QProgressBar" name="batteryLevelBar"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="maximum"> + <number>100</number> + </property> + <property name="value"> + <number>0</number> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QRadioButton" name="radioButton"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Unknown Power</string> + </property> + </widget> + </item> + <item row="3" column="0"> + <widget class="QRadioButton" name="radioButton_2"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Battery Power</string> + </property> + </widget> + </item> + <item row="3" column="1" rowspan="2"> + <spacer name="horizontalSpacer_14"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>359</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item row="4" column="0"> + <widget class="QRadioButton" name="radioButton_3"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Wall Power</string> + </property> + </widget> + </item> + <item row="5" column="0"> + <widget class="QRadioButton" name="radioButton_4"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Wall Power charging Battery</string> + </property> + </widget> + </item> + <item row="6" column="0"> + <spacer name="verticalSpacer_15"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>315</height> + </size> + </property> + </spacer> + </item> + </layout> + </widget> + <widget class="QWidget" name="sysdisplaytab"> + <attribute name="title"> + <string>Display</string> + </attribute> + <layout class="QGridLayout" name="gridLayout_18"> + <item row="0" column="0"> + <widget class="QLabel" name="label_40"> + <property name="text"> + <string>brightness</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLineEdit" name="brightnessLineEdit"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QLabel" name="label_41"> + <property name="text"> + <string>color depth</string> + </property> + </widget> + </item> + <item row="2" column="1"> + <spacer name="horizontalSpacer_15"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>357</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item row="3" column="0"> + <widget class="QLineEdit" name="colorDepthLineEdit"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + </widget> + </item> + <item row="4" column="0"> + <spacer name="verticalSpacer_16"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>371</height> + </size> + </property> + </spacer> + </item> + </layout> + </widget> + <widget class="QWidget" name="sysmemorytab"> + <attribute name="title"> + <string>Storage</string> + </attribute> + <layout class="QGridLayout" name="gridLayout_19"> + <item row="0" column="0"> + <widget class="QTreeWidget" name="storageTreeWidget"> + <column> + <property name="text"> + <string>Volume Name</string> + </property> + </column> + <column> + <property name="text"> + <string>Type of Volume</string> + </property> + </column> + <column> + <property name="text"> + <string>Total Disk Space</string> + </property> + </column> + <column> + <property name="text"> + <string>Available Disk Space</string> + </property> + </column> + </widget> + </item> + </layout> + </widget> + <widget class="QWidget" name="sysnetworktab"> + <attribute name="title"> + <string>Network</string> + </attribute> + <layout class="QGridLayout" name="gridLayout_20"> + <item row="0" column="0"> + <widget class="QComboBox" name="netStatusComboBox"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <item> + <property name="text"> + <string>Gsm</string> + </property> + </item> + <item> + <property name="text"> + <string>Cdma</string> + </property> + </item> + <item> + <property name="text"> + <string>Wcdma</string> + </property> + </item> + <item> + <property name="text"> + <string>Wlan</string> + </property> + </item> + <item> + <property name="text"> + <string>Ethernet</string> + </property> + </item> + <item> + <property name="text"> + <string>Bluetooth</string> + </property> + </item> + </widget> + </item> + <item row="1" column="0"> + <layout class="QHBoxLayout" name="horizontalLayout_28"> + <item> + <widget class="QLabel" name="label_42"> <property name="sizePolicy"> <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <horstretch>0</horstretch> @@ -502,55 +959,71 @@ </sizepolicy> </property> <property name="text"> - <string>Device locked</string> + <string>Network Status</string> </property> </widget> </item> <item> - <widget class="QLabel" name="label_23"> + <widget class="QLabel" name="cellNetworkStatusLabel"> <property name="sizePolicy"> <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> + <property name="frameShape"> + <enum>QFrame::StyledPanel</enum> + </property> + <property name="frameShadow"> + <enum>QFrame::Sunken</enum> + </property> <property name="text"> - <string>Sim status:</string> + <string>.</string> </property> </widget> </item> + </layout> + </item> + <item row="2" column="0"> + <widget class="QLabel" name="label_43"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Network Signal Strength</string> + </property> + </widget> + </item> + <item row="3" column="0"> + <widget class="QProgressBar" name="signalLevelProgressBar"> + <property name="value"> + <number>0</number> + </property> + <property name="format"> + <string>%v</string> + </property> + </widget> + </item> + <item row="4" column="0"> + <layout class="QHBoxLayout" name="horizontalLayout_26"> <item> - <widget class="QComboBox" name="simComboBox"> + <widget class="QLabel" name="label_44"> <property name="sizePolicy"> <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> - <item> - <property name="text"> - <string>Sim not available</string> - </property> - </item> - <item> - <property name="text"> - <string>Single available</string> - </property> - </item> - <item> - <property name="text"> - <string>Dual available</string> - </property> - </item> - <item> - <property name="text"> - <string>Locked</string> - </property> - </item> + <property name="text"> + <string>MAC address:</string> + </property> </widget> </item> <item> - <widget class="QLabel" name="label_24"> + <widget class="QLabel" name="macAddressLabel"> <property name="sizePolicy"> <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <horstretch>0</horstretch> @@ -558,155 +1031,115 @@ </sizepolicy> </property> <property name="text"> - <string>current Profile:</string> + <string>.</string> </property> </widget> </item> + </layout> + </item> + <item row="4" column="1"> + <spacer name="horizontalSpacer_16"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>359</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item row="5" column="0"> + <layout class="QHBoxLayout" name="horizontalLayout_29"> <item> - <widget class="QComboBox" name="profileComboBox"> + <widget class="QLabel" name="label_45"> <property name="sizePolicy"> <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> - <item> - <property name="text"> - <string>Unknown Profile</string> - </property> - </item> - <item> - <property name="text"> - <string>Silent Profile</string> - </property> - </item> - <item> - <property name="text"> - <string>Normal Profile</string> - </property> - </item> - <item> - <property name="text"> - <string>Loud profile</string> - </property> - </item> - <item> - <property name="text"> - <string>Vib profile</string> - </property> - </item> - <item> - <property name="text"> - <string>Offline profile</string> - </property> - </item> - <item> - <property name="text"> - <string>Powersave profile</string> - </property> - </item> - <item> - <property name="text"> - <string>Custom profile</string> - </property> - </item> - </widget> - </item> - <item> - <layout class="QHBoxLayout" name="horizontalLayout_7"> - <item> - <widget class="QLabel" name="label_25"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>Input method:</string> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="inputMethodLabel"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>TextLabel</string> - </property> - </widget> - </item> - </layout> - </item> - <item> - <widget class="QCheckBox" name="bluetoothOnCheckBox"> <property name="text"> - <string>Bluetooth on</string> + <string>Interface Name:</string> </property> </widget> </item> <item> - <spacer name="verticalSpacer_5"> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>346</height> - </size> + <widget class="QLabel" name="InterfaceLabel"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> </property> - </spacer> - </item> - </layout> - </widget> - <widget class="QWidget" name="sysdevicetab_3"> - <attribute name="title"> - <string>Device3</string> - </attribute> - <layout class="QVBoxLayout" name="verticalLayout_6"> - <item> - <widget class="QLabel" name="powerStateLabel"> <property name="text"> - <string>PowerState</string> + <string>.</string> </property> </widget> </item> + </layout> + </item> + <item row="6" column="0"> + <spacer name="verticalSpacer_17"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>188</height> + </size> + </property> + </spacer> + </item> + </layout> + </widget> + <widget class="QWidget" name="sysnetworktab_2"> + <attribute name="title"> + <string>Network2</string> + </attribute> + <layout class="QGridLayout" name="gridLayout_21"> + <item row="0" column="0"> + <layout class="QHBoxLayout" name="horizontalLayout_41"> <item> - <widget class="QProgressBar" name="batteryLevelBar"> + <widget class="QLabel" name="label_46"> <property name="sizePolicy"> <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximum"> - <number>100</number> - </property> - <property name="value"> - <number>0</number> + <property name="text"> + <string>Network Name</string> </property> </widget> </item> <item> - <widget class="QRadioButton" name="radioButton"> + <widget class="QLabel" name="operatorNameLabel"> <property name="sizePolicy"> <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> + <property name="frameShape"> + <enum>QFrame::StyledPanel</enum> + </property> + <property name="frameShadow"> + <enum>QFrame::Sunken</enum> + </property> <property name="text"> - <string>Unknown Power</string> + <string>.</string> </property> </widget> </item> + </layout> + </item> + <item row="1" column="0"> + <layout class="QHBoxLayout" name="horizontalLayout_42"> <item> - <widget class="QRadioButton" name="radioButton_2"> + <widget class="QLabel" name="label_47"> <property name="sizePolicy"> <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <horstretch>0</horstretch> @@ -714,25 +1147,48 @@ </sizepolicy> </property> <property name="text"> - <string>Battery Power</string> + <string>Cell Id:</string> </property> </widget> </item> <item> - <widget class="QRadioButton" name="radioButton_3"> + <widget class="QLabel" name="cellIdLabel"> <property name="sizePolicy"> <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> + <property name="frameShape"> + <enum>QFrame::StyledPanel</enum> + </property> + <property name="frameShadow"> + <enum>QFrame::Sunken</enum> + </property> <property name="text"> - <string>Wall Power</string> + <string>.</string> </property> </widget> </item> + </layout> + </item> + <item row="1" column="1" rowspan="2"> + <spacer name="horizontalSpacer_17"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>357</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item row="2" column="0"> + <layout class="QHBoxLayout" name="horizontalLayout_43"> <item> - <widget class="QRadioButton" name="radioButton_4"> + <widget class="QLabel" name="label_48"> <property name="sizePolicy"> <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <horstretch>0</horstretch> @@ -740,617 +1196,176 @@ </sizepolicy> </property> <property name="text"> - <string>Wall Power charging Battery</string> + <string>Location Area Code</string> </property> </widget> </item> <item> - <spacer name="verticalSpacer_6"> - <property name="orientation"> - <enum>Qt::Vertical</enum> + <widget class="QLabel" name="locationAreaCodeLabel"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>315</height> - </size> + <property name="frameShape"> + <enum>QFrame::StyledPanel</enum> + </property> + <property name="frameShadow"> + <enum>QFrame::Sunken</enum> </property> - </spacer> - </item> - </layout> - </widget> - <widget class="QWidget" name="sysdisplaytab"> - <attribute name="title"> - <string>Display</string> - </attribute> - <layout class="QVBoxLayout" name="verticalLayout_8"> - <item> - <widget class="QLabel" name="label_14"> <property name="text"> - <string>brightness</string> + <string>.</string> </property> </widget> </item> + </layout> + </item> + <item row="3" column="0"> + <spacer name="verticalSpacer_18"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>309</height> + </size> + </property> + </spacer> + </item> + </layout> + </widget> + <widget class="QWidget" name="sysnetworktab_3"> + <attribute name="title"> + <string>Network3</string> + </attribute> + <layout class="QGridLayout" name="gridLayout_22"> + <item row="0" column="0"> + <layout class="QHBoxLayout" name="horizontalLayout_44"> <item> - <widget class="QLineEdit" name="brightnessLineEdit"/> - </item> - <item> - <widget class="QLabel" name="label_15"> + <widget class="QLabel" name="label_49"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> <property name="text"> - <string>color depth</string> + <string>Current MMC:</string> </property> </widget> </item> <item> - <widget class="QLineEdit" name="colorDepthLineEdit"/> - </item> - <item> - <layout class="QHBoxLayout" name="horizontalLayout_14"> - <item> - <widget class="QLabel" name="label_29"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>Resolution</string> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="resolutionLabel"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>TextLabel</string> - </property> - </widget> - </item> - </layout> - </item> - <item> - <spacer name="verticalSpacer_7"> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>371</height> - </size> - </property> - </spacer> - </item> - </layout> - </widget> - <widget class="QWidget" name="sysmemorytab"> - <attribute name="title"> - <string>Storage</string> - </attribute> - <layout class="QVBoxLayout" name="verticalLayout_9"> - <item> - <widget class="QTreeWidget" name="storageTreeWidget"> - <column> - <property name="text"> - <string>Volume Name</string> - </property> - </column> - <column> - <property name="text"> - <string>Type of Volume</string> - </property> - </column> - <column> - <property name="text"> - <string>Total Disk Space</string> - </property> - </column> - <column> - <property name="text"> - <string>Available Disk Space</string> - </property> - </column> + <widget class="QLabel" name="currentMMCLabel"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="frameShape"> + <enum>QFrame::StyledPanel</enum> + </property> + <property name="frameShadow"> + <enum>QFrame::Sunken</enum> + </property> + <property name="text"> + <string>.</string> + </property> </widget> </item> </layout> - </widget> - <widget class="QWidget" name="sysnetworktab"> - <attribute name="title"> - <string>Network</string> - </attribute> - <layout class="QVBoxLayout" name="verticalLayout"> - <item> - <widget class="QComboBox" name="netStatusComboBox"> + </item> + <item row="1" column="0"> + <layout class="QHBoxLayout" name="horizontalLayout_45"> + <item> + <widget class="QLabel" name="label_50"> <property name="sizePolicy"> <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> - <item> - <property name="text"> - <string>Gsm</string> - </property> - </item> - <item> - <property name="text"> - <string>Cdma</string> - </property> - </item> - <item> - <property name="text"> - <string>Wcdma</string> - </property> - </item> - <item> - <property name="text"> - <string>Wlan</string> - </property> - </item> - <item> - <property name="text"> - <string>Ethernet</string> - </property> - </item> - <item> - <property name="text"> - <string>Bluetooth</string> - </property> - </item> + <property name="text"> + <string>Current MNC:</string> + </property> </widget> </item> <item> - <layout class="QHBoxLayout" name="horizontalLayout_27"> - <item> - <widget class="QLabel" name="label_5"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>Network Status</string> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="cellNetworkStatusLabel"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="frameShape"> - <enum>QFrame::StyledPanel</enum> - </property> - <property name="frameShadow"> - <enum>QFrame::Sunken</enum> - </property> - <property name="text"> - <string>.</string> - </property> - </widget> - </item> - </layout> - </item> - <item> - <widget class="QLabel" name="label_6"> + <widget class="QLabel" name="currentMNCLabel"> <property name="sizePolicy"> <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> + <property name="frameShape"> + <enum>QFrame::StyledPanel</enum> + </property> + <property name="frameShadow"> + <enum>QFrame::Sunken</enum> + </property> <property name="text"> - <string>Network Signal Strength</string> + <string>.</string> </property> </widget> </item> + </layout> + </item> + <item row="2" column="0"> + <layout class="QHBoxLayout" name="horizontalLayout_46"> <item> - <widget class="QProgressBar" name="signalLevelProgressBar"> - <property name="value"> - <number>0</number> + <widget class="QLabel" name="label_51"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> </property> - <property name="format"> - <string>%v</string> + <property name="text"> + <string>Home MMC:</string> </property> </widget> </item> <item> - <layout class="QHBoxLayout" name="horizontalLayout_25"> - <item> - <widget class="QLabel" name="label_26"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>MAC address:</string> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="macAddressLabel"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>.</string> - </property> - </widget> - </item> - </layout> - </item> - <item> - <layout class="QHBoxLayout" name="horizontalLayout_24"> - <item> - <widget class="QLabel" name="label_27"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>Interface Name:</string> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="InterfaceLabel"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>.</string> - </property> - </widget> - </item> - </layout> - </item> - <item> - <spacer name="verticalSpacer_2"> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>188</height> - </size> - </property> - </spacer> - </item> - </layout> - </widget> - <widget class="QWidget" name="sysnetworktab_2"> - <attribute name="title"> - <string>Network2</string> - </attribute> - <layout class="QVBoxLayout" name="verticalLayout_10"> - <item> - <layout class="QHBoxLayout" name="horizontalLayout_38"> - <item> - <widget class="QLabel" name="label_13"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>Network Name</string> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="operatorNameLabel"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="frameShape"> - <enum>QFrame::StyledPanel</enum> - </property> - <property name="frameShadow"> - <enum>QFrame::Sunken</enum> - </property> - <property name="text"> - <string>.</string> - </property> - </widget> - </item> - </layout> - </item> - <item> - <layout class="QHBoxLayout" name="horizontalLayout_39"> - <item> - <widget class="QLabel" name="label_7"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>Cell Id:</string> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="cellIdLabel"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="frameShape"> - <enum>QFrame::StyledPanel</enum> - </property> - <property name="frameShadow"> - <enum>QFrame::Sunken</enum> - </property> - <property name="text"> - <string>.</string> - </property> - </widget> - </item> - </layout> - </item> - <item> - <layout class="QHBoxLayout" name="horizontalLayout_40"> - <item> - <widget class="QLabel" name="label_8"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>Location Area Code</string> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="locationAreaCodeLabel"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="frameShape"> - <enum>QFrame::StyledPanel</enum> - </property> - <property name="frameShadow"> - <enum>QFrame::Sunken</enum> - </property> - <property name="text"> - <string>.</string> - </property> - </widget> - </item> - </layout> - </item> - <item> - <spacer name="verticalSpacer_9"> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>309</height> - </size> - </property> - </spacer> - </item> - </layout> - </widget> - <widget class="QWidget" name="sysnetworktab_3"> - <attribute name="title"> - <string>Network3</string> - </attribute> - <layout class="QVBoxLayout" name="verticalLayout_11"> - <item> - <layout class="QHBoxLayout" name="horizontalLayout_37"> - <item> - <widget class="QLabel" name="label_9"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>Current MMC:</string> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="currentMMCLabel"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="frameShape"> - <enum>QFrame::StyledPanel</enum> - </property> - <property name="frameShadow"> - <enum>QFrame::Sunken</enum> - </property> - <property name="text"> - <string>.</string> - </property> - </widget> - </item> - </layout> - </item> - <item> - <layout class="QHBoxLayout" name="horizontalLayout_36"> - <item> - <widget class="QLabel" name="label_10"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>Current MNC:</string> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="currentMNCLabel"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="frameShape"> - <enum>QFrame::StyledPanel</enum> - </property> - <property name="frameShadow"> - <enum>QFrame::Sunken</enum> - </property> - <property name="text"> - <string>.</string> - </property> - </widget> - </item> - </layout> - </item> - <item> - <layout class="QHBoxLayout" name="horizontalLayout_35"> - <item> - <widget class="QLabel" name="label_11"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>Home MMC:</string> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="homeMMCLabel"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="frameShape"> - <enum>QFrame::StyledPanel</enum> - </property> - <property name="frameShadow"> - <enum>QFrame::Sunken</enum> - </property> - <property name="text"> - <string>.</string> - </property> - </widget> - </item> - </layout> - </item> - <item> - <layout class="QHBoxLayout" name="horizontalLayout_34"> - <item> - <widget class="QLabel" name="label_12"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>Home MNC:</string> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="homeMNCLabel"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="frameShape"> - <enum>QFrame::StyledPanel</enum> - </property> - <property name="frameShadow"> - <enum>QFrame::Sunken</enum> - </property> - <property name="text"> - <string>.</string> - </property> - </widget> - </item> - </layout> - </item> - <item> - <spacer name="verticalSpacer_12"> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>378</height> - </size> - </property> - </spacer> - </item> - </layout> - </widget> - <widget class="QWidget" name="screenTab"> - <attribute name="title"> - <string>Screen Saver</string> - </attribute> - <layout class="QVBoxLayout" name="verticalLayout_12"> - <item> - <widget class="QCheckBox" name="saverInhibitedCheckBox"> + <widget class="QLabel" name="homeMMCLabel"> <property name="sizePolicy"> <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> + <property name="frameShape"> + <enum>QFrame::StyledPanel</enum> + </property> + <property name="frameShadow"> + <enum>QFrame::Sunken</enum> + </property> <property name="text"> - <string>Screen Saver Inhibited</string> + <string>.</string> </property> </widget> </item> + </layout> + </item> + <item row="2" column="1"> + <spacer name="horizontalSpacer_18"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>359</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item row="3" column="0"> + <layout class="QHBoxLayout" name="horizontalLayout_47"> <item> - <widget class="QCheckBox" name="screenLockCheckBox"> + <widget class="QLabel" name="label_52"> <property name="sizePolicy"> <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <horstretch>0</horstretch> @@ -1358,32 +1373,83 @@ </sizepolicy> </property> <property name="text"> - <string>screen lock on?</string> + <string>Home MNC:</string> </property> </widget> </item> <item> - <spacer name="verticalSpacer"> - <property name="orientation"> - <enum>Qt::Vertical</enum> + <widget class="QLabel" name="homeMNCLabel"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="frameShape"> + <enum>QFrame::StyledPanel</enum> </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>40</height> - </size> + <property name="frameShadow"> + <enum>QFrame::Sunken</enum> </property> - </spacer> + <property name="text"> + <string>.</string> + </property> + </widget> </item> </layout> - </widget> - </widget> - </item> - </layout> + </item> + <item row="4" column="0"> + <spacer name="verticalSpacer_19"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>378</height> + </size> + </property> + </spacer> + </item> + </layout> + </widget> + <widget class="QWidget" name="screenTab"> + <attribute name="title"> + <string>Screen Saver</string> + </attribute> + <layout class="QGridLayout" name="gridLayout_23"> + <item row="0" column="0"> + <widget class="QCheckBox" name="saverInhibitedCheckBox"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Screen Saver Inhibited</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <spacer name="verticalSpacer_20"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> + </item> + </layout> + </widget> + </widget> </item> </layout> </widget> - <layoutdefault spacing="6" margin="11"/> <resources/> <connections/> </ui> diff --git a/examples/sysinfo/sysinfo.pro b/examples/sysinfo/sysinfo.pro index 756148f66d..c2aeee8942 100644 --- a/examples/sysinfo/sysinfo.pro +++ b/examples/sysinfo/sysinfo.pro @@ -12,7 +12,8 @@ HEADERS += dialog.h INCLUDEPATH += ../../src/systeminfo include(../examples.pri) -qtAddLibrary(QtSystemInfo) +CONFIG += mobility +MOBILITY = systeminfo CONFIG += console diff --git a/examples/writemessage/writemessage.pro b/examples/writemessage/writemessage.pro index e0a844c0a4..079c364ee0 100644 --- a/examples/writemessage/writemessage.pro +++ b/examples/writemessage/writemessage.pro @@ -5,7 +5,8 @@ QT += gui include(../examples.pri) -qtAddLibrary(QtMessaging) +CONFIG += mobility +MOBILITY = messaging INCLUDEPATH += ../../src/messaging symbian|win32 { diff --git a/features/deploy.pri b/features/deploy.pri index c2d1813541..bf172ce057 100644 --- a/features/deploy.pri +++ b/features/deploy.pri @@ -3,7 +3,7 @@ headers.path = $$QT_MOBILITY_INCLUDE contains(TEMPLATE,.*lib) { target.path=$$QT_MOBILITY_LIB - TARGET = $$qtLibraryTarget($$TARGET) + TARGET = $$qtLibraryTarget($${TARGET}) } else { contains(TEMPLATE,.*app):target.path=$$QT_MOBILITY_BIN } diff --git a/features/mobility.prf.template b/features/mobility.prf.template index 86c5d3ad4d..2925f7178f 100644 --- a/features/mobility.prf.template +++ b/features/mobility.prf.template @@ -1,4 +1,4 @@ -INCLUDEPATH += $${MOBILITY_INCLUDE} +!symbian:INCLUDEPATH += $${MOBILITY_INCLUDE} mac: LIBS += -F$${MOBILITY_LIB} LIBS+= -L$${MOBILITY_LIB} diff --git a/plugins/contacts/qtcontacts-tracker/qtcontacts-tracker.pro b/plugins/contacts/qtcontacts-tracker/qtcontacts-tracker.pro index 13db6b6d7c..c65c1f1c10 100644 --- a/plugins/contacts/qtcontacts-tracker/qtcontacts-tracker.pro +++ b/plugins/contacts/qtcontacts-tracker/qtcontacts-tracker.pro @@ -16,7 +16,8 @@ MOC_DIR = .moc/ OBJECTS_DIR = .obj/ LIBS += -lqttracker -qtAddLibrary(QtContacts) +CONFIG += mobility +MOBILITY = contacts target.path = $$SOURCE_DIR/plugins/contacts INSTALLS += target diff --git a/plugins/contacts/symbian/symbian.pro b/plugins/contacts/symbian/symbian.pro index 1c6a67d949..447ba63a48 100644 --- a/plugins/contacts/symbian/symbian.pro +++ b/plugins/contacts/symbian/symbian.pro @@ -91,7 +91,8 @@ symbian: { src/cntsymbiantransformerror.cpp \ src/cntsymbiandatabase.cpp - qtAddLibrary(QtContacts) + CONFIG += mobility + MOBILITY = contacts LIBS += \ -lcntmodel \ diff --git a/plugins/contacts/symbian/tsrc/tst_details/tst_details.pro b/plugins/contacts/symbian/tsrc/tst_details/tst_details.pro index 046c03c12e..803e817251 100644 --- a/plugins/contacts/symbian/tsrc/tst_details/tst_details.pro +++ b/plugins/contacts/symbian/tsrc/tst_details/tst_details.pro @@ -10,7 +10,8 @@ INCLUDEPATH += ../../../src/contacts \ ../../../src/contacts/requests \ ../../../src/contacts/filters -qtAddLibrary(QtContacts) +CONFIG += mobility +MOBILITY = contacts SOURCES += tst_details.cpp diff --git a/plugins/contacts/wince/wince.pro b/plugins/contacts/wince/wince.pro index b072be2426..b0a20de68b 100644 --- a/plugins/contacts/wince/wince.pro +++ b/plugins/contacts/wince/wince.pro @@ -19,5 +19,6 @@ INCLUDEPATH += $$SOURCE_DIR/src/contacts $$SOURCE_DIR/src/contacts/details $$SOU target.path=$$QT_MOBILITY_PREFIX/plugins/contacts INSTALLS+=target LIBS += pimstore.lib -lole32 -qtAddLibrary(QtContacts) +CONFIG += mobility +MOBILITY = contacts diff --git a/plugins/multimedia/audiocapture/audiocapture.pro b/plugins/multimedia/audiocapture/audiocapture.pro index b657d3f7be..d4bb450934 100644 --- a/plugins/multimedia/audiocapture/audiocapture.pro +++ b/plugins/multimedia/audiocapture/audiocapture.pro @@ -8,7 +8,8 @@ QT += multimedia include (../../../common.pri) INCLUDEPATH += ../../../src/multimedia -qtAddLibrary(QtMedia) +CONFIG += mobility +MOBILITY = multimedia DEPENDPATH += . diff --git a/plugins/multimedia/directshow/directshow.pro b/plugins/multimedia/directshow/directshow.pro index 8fe601c65a..518f2475fe 100644 --- a/plugins/multimedia/directshow/directshow.pro +++ b/plugins/multimedia/directshow/directshow.pro @@ -9,7 +9,8 @@ PLUGIN_TYPE = mediaservice include (../../../common.pri) INCLUDEPATH+=../../../src/multimedia -qtAddLibrary(QtMedia) +CONFIG += mobility +MOBILITY = multimedia DEPENDPATH += . diff --git a/plugins/multimedia/gstreamer/gstreamer.pro b/plugins/multimedia/gstreamer/gstreamer.pro index d95a9aec5e..ab36b8fe53 100644 --- a/plugins/multimedia/gstreamer/gstreamer.pro +++ b/plugins/multimedia/gstreamer/gstreamer.pro @@ -6,7 +6,8 @@ PLUGIN_TYPE=mediaservice include(../../../common.pri) INCLUDEPATH+=../../../src/multimedia -qtAddLibrary(QtMedia) +CONFIG += mobility +MOBILITY = multimedia DEPENDPATH += . diff --git a/plugins/multimedia/m3u/m3u.pro b/plugins/multimedia/m3u/m3u.pro index 3a3bec0894..d24fbea655 100644 --- a/plugins/multimedia/m3u/m3u.pro +++ b/plugins/multimedia/m3u/m3u.pro @@ -6,7 +6,8 @@ PLUGIN_TYPE = playlistformats include (../../../common.pri) -qtAddLibrary(QtMedia) +CONFIG += mobility +MOBILITY = multimedia DEPENDPATH += . INCLUDEPATH += . \ diff --git a/plugins/multimedia/phonon/phonon.pro b/plugins/multimedia/phonon/phonon.pro index 3260335bcd..aee2c16bd9 100644 --- a/plugins/multimedia/phonon/phonon.pro +++ b/plugins/multimedia/phonon/phonon.pro @@ -7,7 +7,8 @@ PLUGIN_TYPE = mediaservice include (../../../common.pri) -qtAddLibrary(QtMedia) +CONFIG += mobility +MOBILITY = multimedia INCLUDEPATH += ../../../src/multimedia diff --git a/plugins/multimedia/v4l/v4l.pro b/plugins/multimedia/v4l/v4l.pro index 665ec1f71f..17a7fa0f44 100644 --- a/plugins/multimedia/v4l/v4l.pro +++ b/plugins/multimedia/v4l/v4l.pro @@ -6,7 +6,8 @@ PLUGIN_TYPE = mediaservice include (../../../common.pri) -qtAddLibrary(QtMedia) +CONFIG += mobility +MOBILITY = multimedia DEPENDPATH += . diff --git a/plugins/multimedia/wmp/wmp.pro b/plugins/multimedia/wmp/wmp.pro index 544d55c3d2..55f918e9ed 100644 --- a/plugins/multimedia/wmp/wmp.pro +++ b/plugins/multimedia/wmp/wmp.pro @@ -11,7 +11,8 @@ TMP_INCLUDE = $$quote($$(INCLUDE)) TMP_SEARCHPATHS = $$split(TMP_INCLUDE, ";") $$QMAKE_INCDIR for(p, TMP_SEARCHPATHS): exists($${p}/evr.h): DEFINES *= QWMP_EVR -qtAddLibrary(QtMedia) +CONFIG += mobility +MOBILITY = multimedia LIBS += -lstrmiids -lole32 -lOleaut32 -luser32 -lgdi32 HEADERS = \ diff --git a/qtmobility.pro b/qtmobility.pro index 284d712df2..7c63c134d8 100644 --- a/qtmobility.pro +++ b/qtmobility.pro @@ -24,6 +24,8 @@ unix:!symbian:system(cat $${QT_MOBILITY_SOURCE_TREE}/features/mobility.prf.templ win32:system(type $${QT_MOBILITY_SOURCE_TREE}\features\mobility.prf.template >> $$PRF_OUTPUT) symbian:system(type $${QT_MOBILITY_SOURCE_TREE}\features\mobility.prf.template >> $$PRF_OUTPUT) +#symbian does not generate make install rule. we have to copy prf manually +symbian:system(copy $${QT_MOBILITY_BUILD_TREE}\features\mobility.prf $$[QT_INSTALL_DATA]\mkspecs\features) # install feature file feature.path = $$[QT_INSTALL_DATA]/mkspecs/features diff --git a/src/bearer/bearer.pro b/src/bearer/bearer.pro index 2255b7c8a5..efe2753121 100644 --- a/src/bearer/bearer.pro +++ b/src/bearer/bearer.pro @@ -48,19 +48,19 @@ symbian: { -lefsrv \ -lnetmeta + TARGET.CAPABILITY = ALL -TCB + TARGET.UID3 = 0x2002AC81 + deploy.path = $${EPOCROOT} exportheaders.sources = $$PUBLIC_HEADERS exportheaders.path = epoc32/include - for(header, exportheaders.sources) { BLD_INF_RULES.prj_exports += "$$header $$deploy.path$$exportheaders.path/$$basename(header)" } - - bearer_deployment.sources = QtBearer.dll - bearer_deployment.path = /sys/bin - DEPLOYMENT += bearer_deployment - - TARGET.CAPABILITY = All -TCB + + QtBearerManagement.sources = QtBearer.dll + QtBearerManagement.path = /sys/bin + DEPLOYMENT += QtBearerManagement } else { maemo { QT += dbus diff --git a/src/bearer/qnativewifiengine_win.cpp b/src/bearer/qnativewifiengine_win.cpp index d8fe5fb3b6..0ee671a3ba 100644 --- a/src/bearer/qnativewifiengine_win.cpp +++ b/src/bearer/qnativewifiengine_win.cpp @@ -537,6 +537,7 @@ QString QNativeWifiEngine::getInterfaceFromId(const QString &id) } local_WlanFreeMemory(connectionAttributes); + local_WlanFreeMemory(interfaceList); } return QString(); diff --git a/src/global/qmobilityglobal.h b/src/global/qmobilityglobal.h index 29ab244d32..26a906bfea 100644 --- a/src/global/qmobilityglobal.h +++ b/src/global/qmobilityglobal.h @@ -52,7 +52,9 @@ */ #define QTM_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch)) +#define QTM_PACKAGEDATE_STR "YYYY-MM-DD" +#define QTM_PACKAGE_TAG "" #if defined(QTM_BUILD_UNITTESTS) # include <qconfig.h> diff --git a/src/location/location.pro b/src/location/location.pro index d8fefecd08..1d24b6cf44 100644 --- a/src/location/location.pro +++ b/src/location/location.pro @@ -77,6 +77,8 @@ SOURCES += qlocationutils.cpp \ symbian { TARGET.CAPABILITY = ALL -TCB + TARGET.UID3 = 0x2002AC83 + INCLUDEPATH += $$EPOCROOT\epoc32\include\osextensions \ $$EPOCROOT\epoc32\include\LBTHeaders LIBS += -llbs diff --git a/src/location/qgeoareamonitor.h b/src/location/qgeoareamonitor.h index 0d20eeb5a7..d6c06da764 100644 --- a/src/location/qgeoareamonitor.h +++ b/src/location/qgeoareamonitor.h @@ -48,7 +48,13 @@ QT_BEGIN_HEADER +#ifdef Q_QDOC +//normally we would use macro only but this causes some other compilation issues +QTM_BEGIN_NAMESPACE +#else namespace QtMobility { +#endif + class QGeoPositionInfo; class QGeoAreaMonitorPrivate; diff --git a/src/messaging/qmtmengine_symbian.cpp b/src/messaging/qmtmengine_symbian.cpp index 173b5b1d21..5fba3767d3 100644 --- a/src/messaging/qmtmengine_symbian.cpp +++ b/src/messaging/qmtmengine_symbian.cpp @@ -3670,6 +3670,7 @@ QMessage CMTMEngine::mmsMessageL(CMsvEntry& receivedEntry, long int messageId) c if (count > 0) { privateMessage->_status = privateMessage->_status | QMessage::HasAttachments; } + bool pathForMessageAttachmentsCreated = false; for (TInt i = 0; i < count; i++) { CMsvAttachment* pAttachment = pStore->AttachmentManagerL().GetAttachmentInfoL(i); CleanupStack::PushL(pAttachment); diff --git a/src/messaging/qmtmengine_symbian_p.h b/src/messaging/qmtmengine_symbian_p.h index 6cfe17c108..4fa120441a 100644 --- a/src/messaging/qmtmengine_symbian_p.h +++ b/src/messaging/qmtmengine_symbian_p.h @@ -232,6 +232,8 @@ private: QString privateFolderPath(); + QString privateFolderPath(); + QDateTime symbianTTimetoQDateTime(const TTime& time) const; TTime qDateTimeToSymbianTTime(const QDateTime& date) const; diff --git a/src/publishsubscribe/publishsubscribe.pro b/src/publishsubscribe/publishsubscribe.pro index 0c93ad64d5..6fd14b3c6a 100644 --- a/src/publishsubscribe/publishsubscribe.pro +++ b/src/publishsubscribe/publishsubscribe.pro @@ -45,7 +45,6 @@ symbian { SOURCES += settingslayer_symbian.cpp \ pathmapper_symbian.cpp \ qcrmlparser.cpp - MMP_RULES += "EXPORTUNFROZEN" TARGET.CAPABILITY = ALL -TCB TARGET.UID3 = 0x2002AC78 diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro new file mode 100644 index 0000000000..090c751040 --- /dev/null +++ b/src/s60installs/s60installs.pro @@ -0,0 +1,66 @@ +TEMPLATE = subdirs + +symbian: { + load(data_caging_paths) + + SUBDIRS = + TARGET = "QtMobility" + TARGET.UID3 = 0x2002AC89 + VERSION = 0.1.0 + + vendorinfo = \ + "; Localised Vendor name" \ + "%{\"Nokia, Qt\"}" \ + " " \ + "; Unique Vendor name" \ + ":\"Nokia, Qt\"" \ + " " + qtmobilitydeployment.pkg_prerules += vendorinfo + + EPOCROOT31 = $${EPOCROOT31} + EPOCROOT50 = $${EPOCROOT50} + + qtmobilitydeployment.sources = \ + $$(EPOCROOT50)epoc32/release/armv5/urel/QtMessaging.dll \ + $$(EPOCROOT50)epoc32/release/armv5/urel/QtServiceFramework.dll \ + $$(EPOCROOT50)epoc32/release/armv5/urel/SFWDatabaseManagerServer.exe \ + $$(EPOCROOT50)epoc32/release/armv5/urel/QtLocation.dll \ + $$(EPOCROOT50)epoc32/release/armv5/urel/QtSystemInfo.dll \ + $$(EPOCROOT50)epoc32/release/armv5/urel/QtPublishSubscribe.dll \ + $$(EPOCROOT50)epoc32/release/armv5/urel/QtContacts.dll \ + $$(EPOCROOT50)epoc32/release/armv5/urel/QtVersit.dll + + + bearer = \ + "IF package(0x1028315F)" \ + " \"$$(EPOCROOT50)epoc32/release/armv5/urel/QtBearer.dll\" - \"!:\\sys\\bin\\QtBearer.dll\"" \ + "ELSEIF package(0x102752AE)" \ + " \"$$(EPOCROOT50)epoc32/release/armv5/urel/QtBearer.dll\" - \"!:\\sys\\bin\\QtBearer.dll\"" \ + "ELSEIF package(0x102032BE)" \ + " \"$$(EPOCROOT31)epoc32/release/armv5/urel/QtBearer.dll\" - \"!:\\sys\\bin\\QtBearer.dll\"" \ + "ELSE" \ + " \"$$(EPOCROOT50)epoc32/release/armv5/urel/QtBearer.dll\" - \"!:\\sys\\bin\\QtBearer.dll\"" \ + "ENDIF" + + contacts = \ + "IF package(0x1028315F)" \ + " \"$$(EPOCROOT50)epoc32/release/armv5/urel/mobapicontactspluginsymbian.dll\" - \"!:\\sys\\bin\\mobapicontactspluginsymbian.dll\"" \ + "ELSEIF package(0x102752AE)" \ + " \"$$(EPOCROOT50)epoc32/release/armv5/urel/mobapicontactspluginsymbian.dll\" - \"!:\\sys\\bin\\mobapicontactspluginsymbian.dll\"" \ + "ELSEIF package(0x102032BE)" \ + " \"$$(EPOCROOT31)epoc32/release/armv5/urel/mobapicontactspluginsymbian.dll\" - \"!:\\sys\\bin\\mobapicontactspluginsymbian.dll\"" \ + "ELSE" \ + " \"$$(EPOCROOT50)epoc32/release/armv5/urel/mobapicontactspluginsymbian.dll\" - \"!:\\sys\\bin\\mobapicontactspluginsymbian.dll\"" \ + "ENDIF" + + pluginstubs = \ + "\"$$QT_MOBILITY_BUILD_TREE/plugins/contacts/symbian/qmakepluginstubs/mobapicontactspluginsymbian.qtplugin\" - \"!:\\resource\\qt\\plugins\\contacts\\mobapicontactspluginsymbian.qtplugin\"" + + qtmobilitydeployment.pkg_postrules += bearer + qtmobilitydeployment.pkg_postrules += contacts + qtmobilitydeployment.pkg_postrules += pluginstubs + + qtmobilitydeployment.path = /sys/bin + + DEPLOYMENT += qtmobilitydeployment +} diff --git a/src/serviceframework/qservicemanager.cpp b/src/serviceframework/qservicemanager.cpp index 3de55aa1ba..7bc5146f06 100644 --- a/src/serviceframework/qservicemanager.cpp +++ b/src/serviceframework/qservicemanager.cpp @@ -221,6 +221,9 @@ private slots: /*! \enum QServiceManager::Scope + Defines the scope to be used when accessing services. Note that Symbian + does not distinguish scopes and therefore UserScope and SystemScope may + be used interchangeably. \value UserScope When adding and removing services, uses a storage location specific to the current user. diff --git a/src/serviceframework/serviceframework.pro b/src/serviceframework/serviceframework.pro index 6f1ab8656b..20018ec55b 100644 --- a/src/serviceframework/serviceframework.pro +++ b/src/serviceframework/serviceframework.pro @@ -35,6 +35,7 @@ symbian { SOURCES += databasemanager_s60.cpp TARGET.CAPABILITY = ALL -TCB + TARGET.UID3 = 0x2002AC84 deploy.path = $$EPOCROOT exportheaders.sources = $$PUBLIC_HEADERS exportheaders.path = epoc32/include diff --git a/src/src.pro b/src/src.pro index 54c7ea6df7..0c9728f492 100644 --- a/src/src.pro +++ b/src/src.pro @@ -20,3 +20,7 @@ versit.depends=contacts contains(qmf_enabled, yes)|wince*|win32|symbian|maemo { !win32-g++:SUBDIRS += messaging } + +symbian { + SUBDIRS += s60installs/s60installs.pro +} diff --git a/src/systeminfo/qsysteminfo_linux.cpp b/src/systeminfo/qsysteminfo_linux.cpp index da1dea853f..f795c4f583 100644 --- a/src/systeminfo/qsysteminfo_linux.cpp +++ b/src/systeminfo/qsysteminfo_linux.cpp @@ -134,14 +134,14 @@ QSystemInfoPrivate::QSystemInfoPrivate(QObject *parent) { halIsAvailable = halAvailable(); langCached = currentLanguage(); - startLangaugePolling(); + startLanguagePolling(); } QSystemInfoPrivate::~QSystemInfoPrivate() { } -void QSystemInfoPrivate::startLangaugePolling() +void QSystemInfoPrivate::startLanguagePolling() { QString checkLang = QString::fromLocal8Bit(qgetenv("LANG")); if(langCached.isEmpty()) { @@ -153,7 +153,7 @@ void QSystemInfoPrivate::startLangaugePolling() langCached = checkLang; } langTimer = new QTimer(this); - QTimer::singleShot(1000, this, SLOT(startLangaugePolling())); + QTimer::singleShot(1000, this, SLOT(startLanguagePolling())); } // 2 letter ISO 639-1 diff --git a/src/systeminfo/qsysteminfo_linux_p.h b/src/systeminfo/qsysteminfo_linux_p.h index 913f16ca87..2102612629 100644 --- a/src/systeminfo/qsysteminfo_linux_p.h +++ b/src/systeminfo/qsysteminfo_linux_p.h @@ -103,7 +103,7 @@ private: QString langCached; private Q_SLOTS: - void startLangaugePolling(); + void startLanguagePolling(); }; diff --git a/src/systeminfo/qsysteminfo_maemo.cpp b/src/systeminfo/qsysteminfo_maemo.cpp index 9cac871f9d..501fa56288 100644 --- a/src/systeminfo/qsysteminfo_maemo.cpp +++ b/src/systeminfo/qsysteminfo_maemo.cpp @@ -55,7 +55,7 @@ #include <QTimer> #include <QMapIterator> -s#if !defined(QT_NO_DBUS) +#if !defined(QT_NO_DBUS) #include <qhalservice_linux_p.h> #include <QtDBus> #include <QDBusConnection> @@ -111,11 +111,37 @@ s#if !defined(QT_NO_DBUS) QTM_BEGIN_NAMESPACE + static bool halAvailable() +{ +#if !defined(QT_NO_DBUS) + QDBusConnection dbusConnection = QDBusConnection::systemBus(); + if (dbusConnection.isConnected()) { + QDBusConnectionInterface *dbiface = dbusConnection.interface(); + QDBusReply<bool> reply = dbiface->isServiceRegistered("org.freedesktop.Hal"); + if (reply.isValid() && reply.value()) { + return reply.value(); + } + } +#endif + // qDebug() << "Hal is not running"; + return false; +} + +bool halIsAvailable; +//////// QSystemInfo +QSystemInfoPrivate::QSystemInfoPrivate(QObject *parent) + : QObject(parent) +{ + halIsAvailable = halAvailable(); + langCached = currentLanguage(); + startLanguagePolling(); +} + QSystemInfoPrivate::~QSystemInfoPrivate() { } -void QSystemInfoPrivate::startLangaugePolling() +void QSystemInfoPrivate::startLanguagePolling() { QString checkLang = QString::fromLocal8Bit(qgetenv("LANG")); if(langCached.isEmpty()) { @@ -127,7 +153,7 @@ void QSystemInfoPrivate::startLangaugePolling() langCached = checkLang; } langTimer = new QTimer(this); - QTimer::singleShot(1000, this, SLOT(startLangaugePolling())); + QTimer::singleShot(1000, this, SLOT(startLanguagePolling())); } // 2 letter ISO 639-1 @@ -404,21 +430,12 @@ bool QSystemInfoPrivate::hasFeatureSupported(QSystemInfo::Feature feature) QSystemNetworkInfoPrivate::QSystemNetworkInfoPrivate(QObject *parent) : QObject(parent) { -#if !defined(QT_NO_DBUS) - setupNmConnections(); -#endif } QSystemNetworkInfoPrivate::~QSystemNetworkInfoPrivate() { } -void QSystemNetworkInfoPrivate::updateDeviceInterfaceState(const QString &/*path*/, quint32 /*nmState*/) -{ - // qWarning() << __FUNCTION__ << path << nmState; -} - - QSystemNetworkInfo::NetworkStatus QSystemNetworkInfoPrivate::networkStatus(QSystemNetworkInfo::NetworkMode mode) { @@ -1683,9 +1700,6 @@ bool QSystemDeviceInfoPrivate::isDeviceLocked() QSystemScreenSaverPrivate::QSystemScreenSaverPrivate(QObject *parent) : QObject(parent) { - kdeIsRunning = false; - gnomeIsRunning = false; - whichWMRunning(); } QSystemScreenSaverPrivate::~QSystemScreenSaverPrivate() @@ -1714,6 +1728,6 @@ bool QSystemScreenSaverPrivate::isScreenSaverActive() return false; } -#include "moc_qsysteminfo_linux_p.cpp" +#include "moc_qsysteminfo_maemo_p.cpp" QTM_END_NAMESPACE diff --git a/src/systeminfo/qsysteminfo_maemo_p.h b/src/systeminfo/qsysteminfo_maemo_p.h index 5b7aade132..5c3e24455c 100644 --- a/src/systeminfo/qsysteminfo_maemo_p.h +++ b/src/systeminfo/qsysteminfo_maemo_p.h @@ -103,7 +103,7 @@ private: QString langCached; private Q_SLOTS: - void startLangaugePolling(); + void startLanguagePolling(); }; diff --git a/src/systeminfo/qsysteminfo_win.cpp b/src/systeminfo/qsysteminfo_win.cpp index 358abe6641..22548b5be4 100644 --- a/src/systeminfo/qsysteminfo_win.cpp +++ b/src/systeminfo/qsysteminfo_win.cpp @@ -75,6 +75,7 @@ #include <simmgr.h> #include <Winbase.h> #include <Winuser.h> +#include <Pm.h> #endif @@ -523,7 +524,7 @@ QString QSystemInfoPrivate::version(QSystemInfo::Version type, const QString &p { #if !defined(Q_OS_WINCE) OSVERSIONINFOEX versionInfo; - versionInfo .dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX); + versionInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX); GetVersionEx((OSVERSIONINFO *) &versionInfo); return QString::number(versionInfo.dwMajorVersion) +"." @@ -531,6 +532,14 @@ QString QSystemInfoPrivate::version(QSystemInfo::Version type, const QString &p +QString::number(versionInfo.dwBuildNumber)+"." +QString::number(versionInfo.wServicePackMajor)+"." +QString::number(versionInfo.wServicePackMinor); +#else + OSVERSIONINFO versionInfo; + versionInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); + + GetVersionEx((OSVERSIONINFO *) &versionInfo); + return QString::number(versionInfo.dwMajorVersion) +"." + +QString::number(versionInfo.dwMinorVersion)+"." + +QString::number(versionInfo.dwBuildNumber); #endif } break; @@ -1308,7 +1317,8 @@ QSystemDisplayInfoPrivate::~QSystemDisplayInfoPrivate() int QSystemDisplayInfoPrivate::displayBrightness(int /*screen*/) { -#if !defined( Q_CC_MINGW) && !defined( Q_OS_WINCE) +#if !defined( Q_CC_MINGW) +#if !defined( Q_OS_WINCE) WMIHelper *wHelper; wHelper = new WMIHelper(this); wHelper->setWmiNamespace("root/wmi"); @@ -1318,7 +1328,30 @@ int QSystemDisplayInfoPrivate::displayBrightness(int /*screen*/) QVariant v = wHelper->getWMIData(); return v.toUInt(); +#else + // This could would detect the state of the backlight, which is as close as we're going to get + // for WinCE. Unfortunately, some devices don't honour the Microsoft power management API. + // This means that the following code is not portable across WinCE devices and so shouldn't + // be included. + + //CEDEVICE_POWER_STATE powerState; + // + //if (ERROR_SUCCESS != GetDevicePower(L"BKL1:", POWER_NAME, &powerState)) + // return -1; + // + //// Backlight is on + //if (powerState == D0) + // return 100; + // + //// Screen is on, backlight is off + //if (powerState == D1) + // return 50; + // + //// Screen is off + //return 0; #endif +#endif + return -1; } @@ -1414,6 +1447,104 @@ QStringList QSystemStorageInfoPrivate::logicalDrives() return drivesList; } +#if defined(Q_OS_WINCE) +QPowerNotificationThread::QPowerNotificationThread(QSystemDeviceInfoPrivate *parent) + : parent(parent), + done(false) +{ + wakeUpEvent = CreateEvent(NULL, FALSE, FALSE, NULL); + // handle / report error +} + +QPowerNotificationThread::~QPowerNotificationThread() { + mutex.lock(); + + done = true; + SetEvent(wakeUpEvent); + + mutex.unlock(); + + wait(); + + CloseHandle(wakeUpEvent); +} + +void QPowerNotificationThread::run() { + + const int MaxMessageSize = sizeof(POWER_BROADCAST) + sizeof(POWER_BROADCAST_POWER_INFO) + + MAX_PATH; + + MSGQUEUEOPTIONS messageQueueOptions = { 0 }; + messageQueueOptions.dwSize = sizeof(messageQueueOptions); + messageQueueOptions.dwFlags = MSGQUEUE_NOPRECOMMIT; + messageQueueOptions.dwMaxMessages = 0; + messageQueueOptions.cbMaxMessage = MaxMessageSize; + messageQueueOptions.bReadAccess = true; + + HANDLE messageQueue = CreateMsgQueue(NULL, &messageQueueOptions); + + if (messageQueue == NULL) + return; + + HANDLE powerNotificationHandle = RequestPowerNotifications(messageQueue, PBT_TRANSITION + | PBT_POWERINFOCHANGE); + + if (messageQueue == NULL) + return; + + HANDLE events[2] = {messageQueue, wakeUpEvent}; + + while(true) { + DWORD dwRet = WaitForMultipleObjects(2, events, FALSE, INFINITE); + + mutex.lock(); + + if (done) { + mutex.unlock(); + break; + } + + if (dwRet == WAIT_OBJECT_0) { + + BYTE buffer[MaxMessageSize]; + DWORD bytesRead = 0; + DWORD messageProperties; + + if (!ReadMsgQueue(messageQueue, &buffer, MaxMessageSize, &bytesRead, 0, &messageProperties)) { + continue; + } + + if (bytesRead < sizeof(POWER_BROADCAST)) { + continue; + } + + POWER_BROADCAST *broadcast = (POWER_BROADCAST*) (buffer); + + if (broadcast->Message == PBT_POWERINFOCHANGE) { + POWER_BROADCAST_POWER_INFO *info = (POWER_BROADCAST_POWER_INFO*) broadcast->SystemPowerState; + parent->batteryLevel(); + } + + parent->currentPowerState(); + + } else if (dwRet == WAIT_OBJECT_0 + 1) { + // we should only be here if the wakeUpEvent was signalled + // which only occurs when the thread is being stopped + Q_ASSERT(done); + } else if (dwRet = WAIT_FAILED) { + continue; + } + + mutex.unlock(); + } + + StopPowerNotifications(powerNotificationHandle); + CloseMsgQueue(messageQueue); + CloseHandle(messageQueue); +} + +#endif + QSystemDeviceInfoPrivate *QSystemDeviceInfoPrivate::self = 0; #if !defined(Q_OS_WINCE) @@ -1445,6 +1576,9 @@ QSystemDeviceInfoPrivate::QSystemDeviceInfoPrivate(QObject *parent) batteryStatusCache = QSystemDeviceInfo::NoBatteryLevel; #if !defined(Q_OS_WINCE) QAbstractEventDispatcher::instance()->setEventFilter(qax_winEventFilter); +#else + powerNotificationThread = new QPowerNotificationThread(this); + powerNotificationThread->start(); #endif if(!self) self = this; @@ -1453,6 +1587,9 @@ QSystemDeviceInfoPrivate::QSystemDeviceInfoPrivate(QObject *parent) QSystemDeviceInfoPrivate::~QSystemDeviceInfoPrivate() { +#if defined(Q_OS_WINCE) + delete powerNotificationThread; +#endif } QSystemDeviceInfo::Profile QSystemDeviceInfoPrivate::currentProfile() @@ -1481,6 +1618,21 @@ QSystemDeviceInfo::InputMethodFlags QSystemDeviceInfoPrivate::inputMethodType() } } # endif +#else + // detect the presence of a mouse + RECT rect; + if (GetClipCursor(&rect)) { + if ((methods & QSystemDeviceInfo::Mouse) != QSystemDeviceInfo::Mouse) { + methods |= QSystemDeviceInfo::Mouse; + } + } + // We could also try to detect the presence of a stylus / single touch input. + // A team from Microsoft was unable to do this in a way which scaled across multiple devices. + // For more details see: + // http://blogs.msdn.com/netcfteam/archive/2006/10/02/Platform-detection-III_3A00_-How-to-detect-a-touch-screen-on-Windows-CE-in-.NET-CF.aspx + // Since all non-Qt apps on non-compliant devices will be able to use the touch screen + // (by virtue of being written for one particular device) shipping a library which will cause + // just the Qt apps to fail may not be the best move. #endif int keyboardType = GetKeyboardType(0); switch(keyboardType) { @@ -1661,43 +1813,47 @@ QString QSystemDeviceInfoPrivate::productName() int QSystemDeviceInfoPrivate::batteryLevel() { + int bat = 0; #ifdef Q_OS_WINCE SYSTEM_POWER_STATUS_EX status; if(GetSystemPowerStatusEx(&status, true) ) { - return status.BatteryLifePercent; + bat = status.BatteryLifePercent; } else { qWarning() << "Battery status failed"; + return 0; } #else SYSTEM_POWER_STATUS status; if(GetSystemPowerStatus( &status) ) { - int bat = status.BatteryLifePercent; - if(bat == 255) //battery unknown level status - bat = 0; + bat = status.BatteryLifePercent; + } else { + qWarning() << "Battery status failed"; + return 0; + } +#endif + if(bat == 255) //battery unknown level status + bat = 0; - if(batteryLevelCache != bat) { - batteryLevelCache = bat; - emit batteryLevelChanged(bat); - } + if(batteryLevelCache != bat) { + batteryLevelCache = bat; + emit batteryLevelChanged(bat); + } - if(batteryLevelCache < 4 && batteryStatusCache != QSystemDeviceInfo::BatteryCritical) { - batteryStatusCache = QSystemDeviceInfo::BatteryCritical; - emit batteryStatusChanged(batteryStatusCache); - } else if((batteryLevelCache > 3 && batteryLevelCache < 11) && batteryStatusCache != QSystemDeviceInfo::BatteryVeryLow) { - batteryStatusCache = QSystemDeviceInfo::BatteryVeryLow; - emit batteryStatusChanged(batteryStatusCache); - } else if((batteryLevelCache > 10 && batteryLevelCache < 41) && batteryStatusCache != QSystemDeviceInfo::BatteryLow) { - batteryStatusCache = QSystemDeviceInfo::BatteryLow; - emit batteryStatusChanged(batteryStatusCache); - } else if(batteryLevelCache > 40 && batteryStatusCache != QSystemDeviceInfo::BatteryNormal) { - batteryStatusCache = QSystemDeviceInfo::BatteryNormal; - emit batteryStatusChanged(batteryStatusCache); - } + if(batteryLevelCache < 4 && batteryStatusCache != QSystemDeviceInfo::BatteryCritical) { + batteryStatusCache = QSystemDeviceInfo::BatteryCritical; + emit batteryStatusChanged(batteryStatusCache); + } else if((batteryLevelCache > 3 && batteryLevelCache < 11) && batteryStatusCache != QSystemDeviceInfo::BatteryVeryLow) { + batteryStatusCache = QSystemDeviceInfo::BatteryVeryLow; + emit batteryStatusChanged(batteryStatusCache); + } else if((batteryLevelCache > 10 && batteryLevelCache < 41) && batteryStatusCache != QSystemDeviceInfo::BatteryLow) { + batteryStatusCache = QSystemDeviceInfo::BatteryLow; + emit batteryStatusChanged(batteryStatusCache); + } else if(batteryLevelCache > 40 && batteryStatusCache != QSystemDeviceInfo::BatteryNormal) { + batteryStatusCache = QSystemDeviceInfo::BatteryNormal; + emit batteryStatusChanged(batteryStatusCache); + } - return bat; -} -#endif - return 0; + return bat; } QSystemDeviceInfo::SimStatus QSystemDeviceInfoPrivate::simStatus() diff --git a/src/systeminfo/qsysteminfo_win_p.h b/src/systeminfo/qsysteminfo_win_p.h index 2e2bd5e351..8edf39abb4 100644 --- a/src/systeminfo/qsysteminfo_win_p.h +++ b/src/systeminfo/qsysteminfo_win_p.h @@ -196,6 +196,31 @@ private: }; +#if defined(Q_OS_WINCE) + +#include "Pm.h" + +class QSystemDeviceInfoPrivate; + +class QPowerNotificationThread : public QThread +{ + Q_OBJECT + +public: + QPowerNotificationThread(QSystemDeviceInfoPrivate *parent = 0); + ~QPowerNotificationThread(); + +protected: + void run(); + +private: + QSystemDeviceInfoPrivate *parent; + bool done; + QMutex mutex; + HANDLE wakeUpEvent; +}; +#endif + class QSystemDeviceInfoPrivate : public QObject { Q_OBJECT @@ -237,6 +262,9 @@ private: int batteryLevelCache; QTM_PREPEND_NAMESPACE(QSystemDeviceInfo::PowerState) currentPowerStateCache; QTM_PREPEND_NAMESPACE(QSystemDeviceInfo::BatteryStatus) batteryStatusCache; +#if defined(Q_OS_WINCE) + QPowerNotificationThread *powerNotificationThread; +#endif static QSystemDeviceInfoPrivate *self; }; diff --git a/src/systeminfo/systeminfo.pro b/src/systeminfo/systeminfo.pro index 6d6538e33f..360f48d97f 100644 --- a/src/systeminfo/systeminfo.pro +++ b/src/systeminfo/systeminfo.pro @@ -116,7 +116,6 @@ unix: { TARGET.CAPABILITY = ALL -TCB TARGET.EPOCALLOWDLLDATA = 1 TARGET.UID3 = 0x2002ac7d - MMP_RULES += EXPORTUNFROZEN deploy.path = $${EPOCROOT} exportheaders.sources = $$PUBLIC_HEADERS diff --git a/src/versit/versit.pro b/src/versit/versit.pro index 3ca8feebbd..07dcd2ef0d 100644 --- a/src/versit/versit.pro +++ b/src/versit/versit.pro @@ -7,7 +7,8 @@ include(../../common.pri) DEFINES += QT_BUILD_VERSIT_LIB QT_MAKEDLL QT_ASCII_CAST_WARNINGS -qtAddLibrary(QtContacts) +CONFIG += mobility +MOBILITY = contacts # Contacts Includepath INCLUDEPATH += . \ diff --git a/tests/auto/contacts_plugins.pri b/tests/auto/contacts_plugins.pri index 979ff52bac..3ca596ab35 100644 --- a/tests/auto/contacts_plugins.pri +++ b/tests/auto/contacts_plugins.pri @@ -31,6 +31,7 @@ wince* { } # Add this too -qtAddLibrary(QtContacts) +CONFIG += mobility +MOBILITY = contacts diff --git a/tests/auto/databasemanager/databasemanager.pro b/tests/auto/databasemanager/databasemanager.pro index fc7dab4597..a827030e55 100644 --- a/tests/auto/databasemanager/databasemanager.pro +++ b/tests/auto/databasemanager/databasemanager.pro @@ -50,4 +50,5 @@ symbian { tst_databasemanager.cpp } -qtAddLibrary(QtServiceFramework) +CONFIG += mobility +MOBILITY = serviceframework diff --git a/tests/auto/qabstractsecuritysession/qabstractsecuritysession.pro b/tests/auto/qabstractsecuritysession/qabstractsecuritysession.pro index 6a319f2092..cb60613217 100644 --- a/tests/auto/qabstractsecuritysession/qabstractsecuritysession.pro +++ b/tests/auto/qabstractsecuritysession/qabstractsecuritysession.pro @@ -11,7 +11,8 @@ HEADERS += ../qsfwtestutil.h SOURCES += tst_qabstractsecuritysession.cpp \ ../qsfwtestutil.cpp -qtAddLibrary(QtServiceFramework) +CONFIG += mobility +MOBILITY = serviceframework symbian|wince* { diff --git a/tests/auto/qaudiocapturesource/qaudiocapturesource.pro b/tests/auto/qaudiocapturesource/qaudiocapturesource.pro index 4d4a379e46..c4363a7881 100644 --- a/tests/auto/qaudiocapturesource/qaudiocapturesource.pro +++ b/tests/auto/qaudiocapturesource/qaudiocapturesource.pro @@ -7,5 +7,6 @@ SOURCES += tst_qaudiocapturesource.cpp include (../../../common.pri) -qtAddLibrary(QtMedia) +CONFIG += mobility +MOBILITY = multimedia diff --git a/tests/auto/qcamera/qcamera.pro b/tests/auto/qcamera/qcamera.pro index 7623925c9a..b7023b27e8 100644 --- a/tests/auto/qcamera/qcamera.pro +++ b/tests/auto/qcamera/qcamera.pro @@ -6,5 +6,6 @@ SOURCES += tst_qcamera.cpp include (../../../common.pri) -qtAddLibrary(QtMedia) +CONFIG += mobility +MOBILITY = multimedia diff --git a/tests/auto/qcontact/qcontact.pro b/tests/auto/qcontact/qcontact.pro index 337f7bf690..82cb029030 100644 --- a/tests/auto/qcontact/qcontact.pro +++ b/tests/auto/qcontact/qcontact.pro @@ -12,7 +12,8 @@ INCLUDEPATH += ../../../src/contacts \ INCLUDEPATH += ../ -qtAddLibrary(QtContacts) +CONFIG += mobility +MOBILITY = contacts SOURCES += tst_qcontact.cpp diff --git a/tests/auto/qcontactactions/sendemailaction/sendemailaction.pro b/tests/auto/qcontactactions/sendemailaction/sendemailaction.pro index ad8a1a35c0..b6b7578fdd 100644 --- a/tests/auto/qcontactactions/sendemailaction/sendemailaction.pro +++ b/tests/auto/qcontactactions/sendemailaction/sendemailaction.pro @@ -12,7 +12,8 @@ INCLUDEPATH += ../../../../src/contacts \ INCLUDEPATH += ../../ -qtAddLibrary(QtContacts) +CONFIG += mobility +MOBILITY = contacts DEFINES += ACTIONFACTORYPLUGINTARGET=contacts_sendemailactionfactory DEFINES += ACTIONFACTORYPLUGINNAME=SendEmailActionFactory diff --git a/tests/auto/qcontactactions/unittest/unittest.pro b/tests/auto/qcontactactions/unittest/unittest.pro index 53a0c6acba..84c370ef15 100644 --- a/tests/auto/qcontactactions/unittest/unittest.pro +++ b/tests/auto/qcontactactions/unittest/unittest.pro @@ -14,7 +14,8 @@ INCLUDEPATH += ../../../../src/contacts \ INCLUDEPATH += ../../ -qtAddLibrary(QtContacts) +CONFIG += mobility +MOBILITY = contacts SOURCES += tst_qcontactactions.cpp # App local deployment diff --git a/tests/auto/qcontactasync/maliciousplugin/maliciousplugin.pro b/tests/auto/qcontactasync/maliciousplugin/maliciousplugin.pro index a08f9e2afa..8f33364c3f 100644 --- a/tests/auto/qcontactasync/maliciousplugin/maliciousplugin.pro +++ b/tests/auto/qcontactasync/maliciousplugin/maliciousplugin.pro @@ -12,7 +12,8 @@ INCLUDEPATH += ../../../../src/contacts \ INCLUDEPATH += ../../ -qtAddLibrary(QtContacts) +CONFIG += mobility +MOBILITY = contacts DEFINES += MALICIOUSPLUGINTARGET=contacts_maliciousplugin DEFINES += MALICIOUSPLUGINNAME=maliciousplugin diff --git a/tests/auto/qcontactasync/unittest/unittest.pro b/tests/auto/qcontactasync/unittest/unittest.pro index 74fa94fb70..73889d98ee 100644 --- a/tests/auto/qcontactasync/unittest/unittest.pro +++ b/tests/auto/qcontactasync/unittest/unittest.pro @@ -14,7 +14,8 @@ INCLUDEPATH += ../../../../src/contacts \ INCLUDEPATH += ../../ -qtAddLibrary(QtContacts) +CONFIG += mobility +MOBILITY = contacts SOURCES += tst_qcontactasync.cpp diff --git a/tests/auto/qcontactdetail/qcontactdetail.pro b/tests/auto/qcontactdetail/qcontactdetail.pro index 495b07aa69..625ddd287f 100644 --- a/tests/auto/qcontactdetail/qcontactdetail.pro +++ b/tests/auto/qcontactdetail/qcontactdetail.pro @@ -11,7 +11,8 @@ INCLUDEPATH += ../../../src/contacts \ ../../../src/contacts/filters INCLUDEPATH += ../ -qtAddLibrary(QtContacts) +CONFIG += mobility +MOBILITY = contacts SOURCES += tst_qcontactdetail.cpp symbian: { diff --git a/tests/auto/qcontactdetaildefinition/qcontactdetaildefinition.pro b/tests/auto/qcontactdetaildefinition/qcontactdetaildefinition.pro index 73fe8af184..42f7b00ef9 100644 --- a/tests/auto/qcontactdetaildefinition/qcontactdetaildefinition.pro +++ b/tests/auto/qcontactdetaildefinition/qcontactdetaildefinition.pro @@ -11,7 +11,8 @@ INCLUDEPATH += ../../../src/contacts \ ../../../src/contacts/filters INCLUDEPATH += ../ -qtAddLibrary(QtContacts) +CONFIG += mobility +MOBILITY = contacts SOURCES += tst_qcontactdetaildefinition.cpp symbian: { diff --git a/tests/auto/qcontactdetails/qcontactdetails.pro b/tests/auto/qcontactdetails/qcontactdetails.pro index 214c4ac5e5..776954349e 100644 --- a/tests/auto/qcontactdetails/qcontactdetails.pro +++ b/tests/auto/qcontactdetails/qcontactdetails.pro @@ -11,7 +11,8 @@ INCLUDEPATH += ../../../src/contacts \ ../../../src/contacts/filters INCLUDEPATH += ../ -qtAddLibrary(QtContacts) +CONFIG += mobility +MOBILITY = contacts SOURCES += tst_qcontactdetails.cpp symbian: { diff --git a/tests/auto/qcontactfilter/qcontactfilter.pro b/tests/auto/qcontactfilter/qcontactfilter.pro index fbe1c4253c..1d544d8918 100644 --- a/tests/auto/qcontactfilter/qcontactfilter.pro +++ b/tests/auto/qcontactfilter/qcontactfilter.pro @@ -11,7 +11,8 @@ INCLUDEPATH += ../../../src/contacts \ ../../../src/contacts/filters INCLUDEPATH += ../ -qtAddLibrary(QtContacts) +CONFIG += mobility +MOBILITY = contacts SOURCES += tst_qcontactfilter.cpp diff --git a/tests/auto/qcontactmanager/qcontactmanager.pro b/tests/auto/qcontactmanager/qcontactmanager.pro index ed30d1c20a..04df5e5b52 100644 --- a/tests/auto/qcontactmanager/qcontactmanager.pro +++ b/tests/auto/qcontactmanager/qcontactmanager.pro @@ -11,7 +11,8 @@ INCLUDEPATH += ../../../src/contacts \ ../../../src/contacts/filters INCLUDEPATH += ../ -qtAddLibrary(QtContacts) +CONFIG += mobility +MOBILITY = contacts SOURCES += tst_qcontactmanager.cpp symbian: { diff --git a/tests/auto/qcontactmanagerfiltering/qcontactmanagerfiltering.pro b/tests/auto/qcontactmanagerfiltering/qcontactmanagerfiltering.pro index bb421d72d9..735e632879 100644 --- a/tests/auto/qcontactmanagerfiltering/qcontactmanagerfiltering.pro +++ b/tests/auto/qcontactmanagerfiltering/qcontactmanagerfiltering.pro @@ -11,7 +11,8 @@ INCLUDEPATH += ../../../src/contacts \ ../../../src/contacts/filters INCLUDEPATH += ../ -qtAddLibrary(QtContacts) +CONFIG += mobility +MOBILITY = contacts SOURCES += tst_qcontactmanagerfiltering.cpp symbian: { diff --git a/tests/auto/qcontactmanagerplugins/dummyplugin/dummyplugin.pro b/tests/auto/qcontactmanagerplugins/dummyplugin/dummyplugin.pro index c09b77344f..df2793ae5a 100644 --- a/tests/auto/qcontactmanagerplugins/dummyplugin/dummyplugin.pro +++ b/tests/auto/qcontactmanagerplugins/dummyplugin/dummyplugin.pro @@ -10,7 +10,8 @@ INCLUDEPATH += ../../../../src/contacts \ ../../../../src/contacts/requests \ ../../../../src/contacts/filters -qtAddLibrary(QtContacts) +CONFIG += mobility +MOBILITY = contacts SOURCES += dummyplugin.cpp DEFINES += DUMMYPLUGINNAME=testdummy diff --git a/tests/auto/qcontactmanagerplugins/dummyplugincopy/dummyplugincopy.pro b/tests/auto/qcontactmanagerplugins/dummyplugincopy/dummyplugincopy.pro index 6fd8f8b3b9..931ccdc7b0 100644 --- a/tests/auto/qcontactmanagerplugins/dummyplugincopy/dummyplugincopy.pro +++ b/tests/auto/qcontactmanagerplugins/dummyplugincopy/dummyplugincopy.pro @@ -10,7 +10,8 @@ INCLUDEPATH += ../../../../src/contacts \ ../../../../src/contacts/requests \ ../../../../src/contacts/filters -qtAddLibrary(QtContacts) +CONFIG += mobility +MOBILITY = contacts DEFINES += DUMMYPLUGINTARGET=contacts_testdummycopy DEFINES += DUMMYPLUGINNAME=testdummy diff --git a/tests/auto/qcontactmanagerplugins/dummypluginempty/dummypluginempty.pro b/tests/auto/qcontactmanagerplugins/dummypluginempty/dummypluginempty.pro index 17f78b3ee5..858eef9788 100644 --- a/tests/auto/qcontactmanagerplugins/dummypluginempty/dummypluginempty.pro +++ b/tests/auto/qcontactmanagerplugins/dummypluginempty/dummypluginempty.pro @@ -10,7 +10,8 @@ INCLUDEPATH += ../../../../src/contacts \ ../../../../src/contacts/requests \ ../../../../src/contacts/filters -qtAddLibrary(QtContacts) +CONFIG += mobility +MOBILITY = contacts DEFINES += DUMMYPLUGINTARGET=contacts_testdummyempty diff --git a/tests/auto/qcontactmanagerplugins/dummyplugininvalid/dummyplugininvalid.pro b/tests/auto/qcontactmanagerplugins/dummyplugininvalid/dummyplugininvalid.pro index c4115f0fb4..43c9cad055 100644 --- a/tests/auto/qcontactmanagerplugins/dummyplugininvalid/dummyplugininvalid.pro +++ b/tests/auto/qcontactmanagerplugins/dummyplugininvalid/dummyplugininvalid.pro @@ -10,7 +10,8 @@ INCLUDEPATH += ../../../../src/contacts \ ../../../../src/contacts/requests \ ../../../../src/contacts/filters -qtAddLibrary(QtContacts) +CONFIG += mobility +MOBILITY = contacts DEFINES += DUMMYPLUGINTARGET=contacts_testdummyinvalid DEFINES += DUMMYPLUGINNAME=invalid diff --git a/tests/auto/qcontactmanagerplugins/dummypluginmemory/dummypluginmemory.pro b/tests/auto/qcontactmanagerplugins/dummypluginmemory/dummypluginmemory.pro index 1d8b779364..5212268529 100644 --- a/tests/auto/qcontactmanagerplugins/dummypluginmemory/dummypluginmemory.pro +++ b/tests/auto/qcontactmanagerplugins/dummypluginmemory/dummypluginmemory.pro @@ -8,7 +8,8 @@ INCLUDEPATH += ../../../../src/contacts \ ../../../../src/contacts/requests \ ../../../../src/contacts/filters -qtAddLibrary(QtContacts) +CONFIG += mobility +MOBILITY = contacts include(../../../../common.pri) diff --git a/tests/auto/qcontactmanagerplugins/unittest/unittest.pro b/tests/auto/qcontactmanagerplugins/unittest/unittest.pro index f7bcf6afc7..96f645f709 100644 --- a/tests/auto/qcontactmanagerplugins/unittest/unittest.pro +++ b/tests/auto/qcontactmanagerplugins/unittest/unittest.pro @@ -12,11 +12,10 @@ INCLUDEPATH += ../../../../src/contacts \ INCLUDEPATH += ../../ -qtAddLibrary(QtContacts) +CONFIG += mobility +MOBILITY = contacts SOURCES += tst_qcontactmanagerplugins.cpp -qtAddLibrary(QtContacts) - TESTDLLS = \ $$mobilityDeployFilename(contacts_testdummy) \ $$mobilityDeployFilename(contacts_testotherdummy) \ diff --git a/tests/auto/qcontactrelationship/qcontactrelationship.pro b/tests/auto/qcontactrelationship/qcontactrelationship.pro index 5f51daa837..b2115df435 100644 --- a/tests/auto/qcontactrelationship/qcontactrelationship.pro +++ b/tests/auto/qcontactrelationship/qcontactrelationship.pro @@ -14,7 +14,8 @@ INCLUDEPATH += ../ SOURCES += tst_qcontactrelationship.cpp -qtAddLibrary(QtContacts) +CONFIG += mobility +MOBILITY = contacts # App local deployment symbian:QCONTACTACTION_PLUGINS_DEPLOY.sources = contacts_sendemailactionfactory.dll diff --git a/tests/auto/qgeoareamonitor/qgeoareamonitor.pro b/tests/auto/qgeoareamonitor/qgeoareamonitor.pro index 0acd041dd9..4b4418b72e 100644 --- a/tests/auto/qgeoareamonitor/qgeoareamonitor.pro +++ b/tests/auto/qgeoareamonitor/qgeoareamonitor.pro @@ -11,7 +11,8 @@ HEADERS += ../qlocationtestutils_p.h SOURCES += tst_qgeoareamonitor.cpp \ ../qlocationtestutils.cpp -qtAddLibrary(QtLocation) +CONFIG += mobility +MOBILITY = location symbian { TARGET.CAPABILITY = ALL -TCB diff --git a/tests/auto/qgeocoordinate/qgeocoordinate.pro b/tests/auto/qgeocoordinate/qgeocoordinate.pro index 3136cf4986..a88ada5d5a 100644 --- a/tests/auto/qgeocoordinate/qgeocoordinate.pro +++ b/tests/auto/qgeocoordinate/qgeocoordinate.pro @@ -11,7 +11,8 @@ HEADERS += ../qlocationtestutils_p.h SOURCES += tst_qgeocoordinate.cpp \ ../qlocationtestutils.cpp -qtAddLibrary(QtLocation) +CONFIG += mobility +MOBILITY = location symbian { INCLUDEPATH += $${EPOCROOT}/epoc32/include/osextensions diff --git a/tests/auto/qgeoinfosources_wince/qgeoinfosources_wince.pro b/tests/auto/qgeoinfosources_wince/qgeoinfosources_wince.pro index 1ea2801bf8..59fea8b00e 100644 --- a/tests/auto/qgeoinfosources_wince/qgeoinfosources_wince.pro +++ b/tests/auto/qgeoinfosources_wince/qgeoinfosources_wince.pro @@ -12,5 +12,6 @@ HEADERS += ../qlocationtestutils_p.h SOURCES += ../qlocationtestutils.cpp \ tst_qgeoinfosources_wince.cpp -qtAddLibrary(QtLocation) +CONFIG += mobility +MOBILITY = location diff --git a/tests/auto/qgeopositioninfo/qgeopositioninfo.pro b/tests/auto/qgeopositioninfo/qgeopositioninfo.pro index cfd695e675..5500e84428 100644 --- a/tests/auto/qgeopositioninfo/qgeopositioninfo.pro +++ b/tests/auto/qgeopositioninfo/qgeopositioninfo.pro @@ -9,7 +9,8 @@ INCLUDEPATH += ../../../src/location # Input SOURCES += tst_qgeopositioninfo.cpp -qtAddLibrary(QtLocation) +CONFIG += mobility +MOBILITY = location symbian { TARGET.CAPABILITY = ALL -TCB diff --git a/tests/auto/qgeopositioninfosource/qgeopositioninfosource.pro b/tests/auto/qgeopositioninfosource/qgeopositioninfosource.pro index 8d5fc92ec5..26e6c4060d 100644 --- a/tests/auto/qgeopositioninfosource/qgeopositioninfosource.pro +++ b/tests/auto/qgeopositioninfosource/qgeopositioninfosource.pro @@ -14,7 +14,8 @@ SOURCES += ../qlocationtestutils.cpp \ ../testqgeopositioninfosource.cpp \ tst_qgeopositioninfosource.cpp -qtAddLibrary(QtLocation) +CONFIG += mobility +MOBILITY = location symbian { TARGET.CAPABILITY = ALL -TCB diff --git a/tests/auto/qgeosatelliteinfo/qgeosatelliteinfo.pro b/tests/auto/qgeosatelliteinfo/qgeosatelliteinfo.pro index 8cf1cf4e82..c6155ea42a 100644 --- a/tests/auto/qgeosatelliteinfo/qgeosatelliteinfo.pro +++ b/tests/auto/qgeosatelliteinfo/qgeosatelliteinfo.pro @@ -9,7 +9,8 @@ INCLUDEPATH += ../../../src/location # Input SOURCES += tst_qgeosatelliteinfo.cpp -qtAddLibrary(QtLocation) +CONFIG += mobility +MOBILITY = location symbian { TARGET.CAPABILITY = ALL -TCB diff --git a/tests/auto/qgeosatelliteinfosource/qgeosatelliteinfosource.pro b/tests/auto/qgeosatelliteinfosource/qgeosatelliteinfosource.pro index 9c96f4b8a4..b10f85f9d6 100644 --- a/tests/auto/qgeosatelliteinfosource/qgeosatelliteinfosource.pro +++ b/tests/auto/qgeosatelliteinfosource/qgeosatelliteinfosource.pro @@ -13,7 +13,8 @@ SOURCES += tst_qgeosatelliteinfosource.cpp \ HEADERS += ../testqgeosatelliteinfosource_p.h \ ../qlocationtestutils_p.h -qtAddLibrary(QtLocation) +CONFIG += mobility +MOBILITY = location symbian { TARGET.CAPABILITY = ALL -TCB diff --git a/tests/auto/qgraphicsvideoitem/qgraphicsvideoitem.pro b/tests/auto/qgraphicsvideoitem/qgraphicsvideoitem.pro index 9798933a2a..802500a2fc 100644 --- a/tests/auto/qgraphicsvideoitem/qgraphicsvideoitem.pro +++ b/tests/auto/qgraphicsvideoitem/qgraphicsvideoitem.pro @@ -8,5 +8,6 @@ SOURCES += tst_qgraphicsvideoitem.cpp include (../../../common.pri) -qtAddLibrary(QtMedia) +CONFIG += mobility +MOBILITY = multimedia diff --git a/tests/auto/qlocationutils/qlocationutils.pro b/tests/auto/qlocationutils/qlocationutils.pro index d6ea5219f5..b49d8f1ffc 100644 --- a/tests/auto/qlocationutils/qlocationutils.pro +++ b/tests/auto/qlocationutils/qlocationutils.pro @@ -9,7 +9,8 @@ INCLUDEPATH += ../../../src/location # Input SOURCES += tst_qlocationutils.cpp -qtAddLibrary(QtLocation) +CONFIG += mobility +MOBILITY = location symbian { TARGET.CAPABILITY = ALL -TCB diff --git a/tests/auto/qmallocpool/qmallocpool.pro b/tests/auto/qmallocpool/qmallocpool.pro index 9984cc4a93..c50911428d 100644 --- a/tests/auto/qmallocpool/qmallocpool.pro +++ b/tests/auto/qmallocpool/qmallocpool.pro @@ -8,6 +8,8 @@ include(../../../common.pri) # Input SOURCES += tst_qmallocpool.cpp -qtAddLibrary(QtPublishSubscribe) +CONFIG += mobility +MOBILITY = publishsubscribe + symbian:TARGET.CAPABILITY = ALL \ -TCB diff --git a/tests/auto/qmediacontent/qmediacontent.pro b/tests/auto/qmediacontent/qmediacontent.pro index e797189f45..71730dc3a8 100644 --- a/tests/auto/qmediacontent/qmediacontent.pro +++ b/tests/auto/qmediacontent/qmediacontent.pro @@ -4,5 +4,6 @@ CONFIG += testcase include (../../../common.pri) -qtAddLibrary(QtMedia) +CONFIG += mobility +MOBILITY = multimedia SOURCES += tst_qmediacontent.cpp diff --git a/tests/auto/qmediaimageviewer/qmediaimageviewer.pro b/tests/auto/qmediaimageviewer/qmediaimageviewer.pro index acd8e9c20a..0ee874eb15 100644 --- a/tests/auto/qmediaimageviewer/qmediaimageviewer.pro +++ b/tests/auto/qmediaimageviewer/qmediaimageviewer.pro @@ -7,7 +7,8 @@ include (../../../common.pri) SOURCES += tst_qmediaimageviewer.cpp QT += network multimedia -qtAddLibrary(QtMedia) +CONFIG += mobility +MOBILITY = multimedia !contains(QT_CONFIG, no-jpeg):DEFINES += QTEST_HAVE_JPEG diff --git a/tests/auto/qmediaobject/qmediaobject.pro b/tests/auto/qmediaobject/qmediaobject.pro index e298e591c7..d8b5e0f475 100644 --- a/tests/auto/qmediaobject/qmediaobject.pro +++ b/tests/auto/qmediaobject/qmediaobject.pro @@ -6,4 +6,5 @@ include (../../../common.pri) SOURCES += tst_qmediaobject.cpp -qtAddLibrary(QtMedia) +CONFIG += mobility +MOBILITY = multimedia diff --git a/tests/auto/qmediaplayer/qmediaplayer.pro b/tests/auto/qmediaplayer/qmediaplayer.pro index a07ead1b61..9dba08528f 100644 --- a/tests/auto/qmediaplayer/qmediaplayer.pro +++ b/tests/auto/qmediaplayer/qmediaplayer.pro @@ -6,5 +6,6 @@ SOURCES += tst_qmediaplayer.cpp include (../../../common.pri) -qtAddLibrary(QtMedia) +CONFIG += mobility +MOBILITY = multimedia diff --git a/tests/auto/qmediaplaylist/qmediaplaylist.pro b/tests/auto/qmediaplaylist/qmediaplaylist.pro index f066e099b9..a002b14629 100644 --- a/tests/auto/qmediaplaylist/qmediaplaylist.pro +++ b/tests/auto/qmediaplaylist/qmediaplaylist.pro @@ -13,5 +13,6 @@ SOURCES += \ INCLUDEPATH += $$QT_MOBILITY_SOURCE_TREE/plugins/multimedia/m3u -qtAddLibrary(QtMedia) +CONFIG += mobility +MOBILITY = multimedia diff --git a/tests/auto/qmediaplaylistnavigator/qmediaplaylistnavigator.pro b/tests/auto/qmediaplaylistnavigator/qmediaplaylistnavigator.pro index 0fb32ec67c..d17657b01e 100644 --- a/tests/auto/qmediaplaylistnavigator/qmediaplaylistnavigator.pro +++ b/tests/auto/qmediaplaylistnavigator/qmediaplaylistnavigator.pro @@ -6,5 +6,6 @@ SOURCES += tst_qmediaplaylistnavigator.cpp include (../../../common.pri) -qtAddLibrary(QtMedia) +CONFIG += mobility +MOBILITY = multimedia diff --git a/tests/auto/qmediapluginloader/qmediapluginloader.pro b/tests/auto/qmediapluginloader/qmediapluginloader.pro index b6a8064fd1..5c249b8f8e 100644 --- a/tests/auto/qmediapluginloader/qmediapluginloader.pro +++ b/tests/auto/qmediapluginloader/qmediapluginloader.pro @@ -6,7 +6,8 @@ SOURCES += tst_qmediapluginloader.cpp include (../../../common.pri) -qtAddLibrary(QtMedia) +CONFIG += mobility +MOBILITY = multimedia wince* { PLUGIN_DEPLOY.sources = $$OUTPUT_DIR/plugins/mediaservice/*.dll diff --git a/tests/auto/qmediarecorder/qmediarecorder.pro b/tests/auto/qmediarecorder/qmediarecorder.pro index 9b6a8e21dd..1f38c70a89 100644 --- a/tests/auto/qmediarecorder/qmediarecorder.pro +++ b/tests/auto/qmediarecorder/qmediarecorder.pro @@ -6,5 +6,6 @@ SOURCES += tst_qmediarecorder.cpp include (../../../common.pri) -qtAddLibrary(QtMedia) +CONFIG += mobility +MOBILITY = multimedia diff --git a/tests/auto/qmediaresource/qmediaresource.pro b/tests/auto/qmediaresource/qmediaresource.pro index d8f5fd4c1c..1fb82f22a0 100644 --- a/tests/auto/qmediaresource/qmediaresource.pro +++ b/tests/auto/qmediaresource/qmediaresource.pro @@ -6,5 +6,6 @@ include (../../../common.pri) SOURCES += tst_qmediaresource.cpp -qtAddLibrary(QtMedia) +CONFIG += mobility +MOBILITY = multimedia diff --git a/tests/auto/qmediaservice/qmediaservice.pro b/tests/auto/qmediaservice/qmediaservice.pro index ab71a13d24..5aaf9236e2 100644 --- a/tests/auto/qmediaservice/qmediaservice.pro +++ b/tests/auto/qmediaservice/qmediaservice.pro @@ -6,5 +6,6 @@ include (../../../common.pri) SOURCES += tst_qmediaservice.cpp -qtAddLibrary(QtMedia) +CONFIG += mobility +MOBILITY = multimedia diff --git a/tests/auto/qmediaserviceprovider/qmediaserviceprovider.pro b/tests/auto/qmediaserviceprovider/qmediaserviceprovider.pro index 01b1e477b1..ca86d26e71 100644 --- a/tests/auto/qmediaserviceprovider/qmediaserviceprovider.pro +++ b/tests/auto/qmediaserviceprovider/qmediaserviceprovider.pro @@ -6,5 +6,6 @@ SOURCES += tst_qmediaserviceprovider.cpp include (../../../common.pri) -qtAddLibrary(QtMedia) +CONFIG += mobility +MOBILITY = multimedia diff --git a/tests/auto/qmessage/qmessage.pro b/tests/auto/qmessage/qmessage.pro index 208ad83543..715db570cf 100644 --- a/tests/auto/qmessage/qmessage.pro +++ b/tests/auto/qmessage/qmessage.pro @@ -7,7 +7,8 @@ QT += testlib include(../../../common.pri) include(../support/support.pri) -qtAddLibrary(QtMessaging) +CONFIG += mobility +MOBILITY = messaging INCLUDEPATH += ../../../src/messaging symbian|wince*|maemo|win32 { diff --git a/tests/auto/qmessagestore/qmessagestore.pro b/tests/auto/qmessagestore/qmessagestore.pro index b9b4c0cbea..ae4391db18 100644 --- a/tests/auto/qmessagestore/qmessagestore.pro +++ b/tests/auto/qmessagestore/qmessagestore.pro @@ -7,7 +7,8 @@ QT += testlib include(../../../common.pri) include(../support/support.pri) -qtAddLibrary(QtMessaging) +CONFIG += mobility +MOBILITY = messaging INCLUDEPATH += ../../../src/messaging symbian|wince*|maemo|win32 { diff --git a/tests/auto/qmessagestorekeys/qmessagestorekeys.pro b/tests/auto/qmessagestorekeys/qmessagestorekeys.pro index 8b8ed07c55..c2863584ee 100644 --- a/tests/auto/qmessagestorekeys/qmessagestorekeys.pro +++ b/tests/auto/qmessagestorekeys/qmessagestorekeys.pro @@ -7,7 +7,8 @@ QT += testlib include(../../../common.pri) include(../support/support.pri) -qtAddLibrary(QtMessaging) +CONFIG += mobility +MOBILITY = messaging INCLUDEPATH += ../../../src/messaging symbian|win32 { diff --git a/tests/auto/qnetworkconfigmanager/qnetworkconfigmanager.pro b/tests/auto/qnetworkconfigmanager/qnetworkconfigmanager.pro index 0b2ed1a5cb..bdd4926c16 100644 --- a/tests/auto/qnetworkconfigmanager/qnetworkconfigmanager.pro +++ b/tests/auto/qnetworkconfigmanager/qnetworkconfigmanager.pro @@ -8,7 +8,8 @@ QT = core network INCLUDEPATH += ../../../src/bearer include(../../../common.pri) -qtAddLibrary(QtBearer) +CONFIG += mobility +MOBILITY = bearer symbian { TARGET.CAPABILITY = NetworkServices NetworkControl ReadUserData diff --git a/tests/auto/qnetworkconfiguration/qnetworkconfiguration.pro b/tests/auto/qnetworkconfiguration/qnetworkconfiguration.pro index 61e4097e2c..c5a08b3fb3 100644 --- a/tests/auto/qnetworkconfiguration/qnetworkconfiguration.pro +++ b/tests/auto/qnetworkconfiguration/qnetworkconfiguration.pro @@ -8,7 +8,8 @@ QT = core network INCLUDEPATH += ../../../src/bearer include(../../../common.pri) -qtAddLibrary(QtBearer) +CONFIG += mobility +MOBILITY = bearer symbian { TARGET.CAPABILITY = NetworkServices NetworkControl ReadUserData diff --git a/tests/auto/qnetworksession/lackey/lackey.pro b/tests/auto/qnetworksession/lackey/lackey.pro index 4cb8555c94..b8a006b38f 100644 --- a/tests/auto/qnetworksession/lackey/lackey.pro +++ b/tests/auto/qnetworksession/lackey/lackey.pro @@ -9,4 +9,5 @@ CONFIG+= testcase include(../../../../common.pri) -qtAddLibrary(QtBearer) +CONFIG += mobility +MOBILITY = bearer diff --git a/tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.pro b/tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.pro index 1410601a89..ccc405eb5b 100644 --- a/tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.pro +++ b/tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.pro @@ -8,7 +8,8 @@ QT = core network INCLUDEPATH += ../../../../src/bearer include(../../../../common.pri) -qtAddLibrary(QtBearer) +CONFIG += mobility +MOBILITY = bearer wince* { LACKEY.sources = $$OUTPUT_DIR/build/tests/bin/qnetworksessionlackey.exe diff --git a/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource.pro b/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource.pro index 3573487691..9e1cad3074 100644 --- a/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource.pro +++ b/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource.pro @@ -16,7 +16,8 @@ SOURCES += ../qlocationtestutils.cpp \ qnmeapositioninfosourceproxyfactory.cpp \ tst_qnmeapositioninfosource.cpp -qtAddLibrary(QtLocation) +CONFIG += mobility +MOBILITY = location symbian { TARGET.CAPABILITY = ALL -TCB diff --git a/tests/auto/qpacket/qpacket.pro b/tests/auto/qpacket/qpacket.pro index 7613030633..b9f5a3bebb 100644 --- a/tests/auto/qpacket/qpacket.pro +++ b/tests/auto/qpacket/qpacket.pro @@ -8,5 +8,6 @@ include(../../../common.pri) # Input SOURCES += tst_qpacket.cpp -qtAddLibrary(QtPublishSubscribe) +CONFIG += mobility +MOBILITY = publishsubscribe symbian:TARGET.CAPABILITY = ALL -TCB diff --git a/tests/auto/qpacketprotocol/qpacketprotocol.pro b/tests/auto/qpacketprotocol/qpacketprotocol.pro index 4d3c761a07..42418b3b89 100644 --- a/tests/auto/qpacketprotocol/qpacketprotocol.pro +++ b/tests/auto/qpacketprotocol/qpacketprotocol.pro @@ -8,6 +8,7 @@ include(../../../common.pri) # Input SOURCES += tst_qpacketprotocol.cpp -qtAddLibrary(QtPublishSubscribe) +CONFIG += mobility +MOBILITY = publishsubscribe symbian:TARGET.CAPABILITY = ALL \ -TCB diff --git a/tests/auto/qpaintervideosurface/qpaintervideosurface.pro b/tests/auto/qpaintervideosurface/qpaintervideosurface.pro index 6ad2e15b96..edad5081bd 100644 --- a/tests/auto/qpaintervideosurface/qpaintervideosurface.pro +++ b/tests/auto/qpaintervideosurface/qpaintervideosurface.pro @@ -10,4 +10,5 @@ include (../../../common.pri) SOURCES += tst_qpaintervideosurface.cpp -qtAddLibrary(QtMedia) +CONFIG += mobility +MOBILITY = multimedia diff --git a/tests/auto/qradiotuner/qradiotuner.pro b/tests/auto/qradiotuner/qradiotuner.pro index c984d48885..b05cb5b221 100644 --- a/tests/auto/qradiotuner/qradiotuner.pro +++ b/tests/auto/qradiotuner/qradiotuner.pro @@ -7,5 +7,6 @@ SOURCES += tst_qradiotuner.cpp include (../../../common.pri) -qtAddLibrary(QtMedia) +CONFIG += mobility +MOBILITY = multimedia diff --git a/tests/auto/qservicecontext/qservicecontext.pro b/tests/auto/qservicecontext/qservicecontext.pro index 13ceece8e0..2a96c8a28e 100644 --- a/tests/auto/qservicecontext/qservicecontext.pro +++ b/tests/auto/qservicecontext/qservicecontext.pro @@ -11,7 +11,8 @@ include(../../../common.pri) HEADERS += SOURCES += tst_qservicecontext.cpp -qtAddLibrary(QtServiceFramework) +CONFIG += mobility +MOBILITY = serviceframework symbian { TARGET.CAPABILITY = ALL -TCB diff --git a/tests/auto/qservicefilter/qservicefilter.pro b/tests/auto/qservicefilter/qservicefilter.pro index 170377fa97..33b9c4df90 100644 --- a/tests/auto/qservicefilter/qservicefilter.pro +++ b/tests/auto/qservicefilter/qservicefilter.pro @@ -8,7 +8,8 @@ QT = core include(../../../common.pri) -qtAddLibrary(QtServiceFramework) +CONFIG += mobility +MOBILITY = serviceframework symbian { TARGET.CAPABILITY = ALL -TCB diff --git a/tests/auto/qserviceinterfacedescriptor/qserviceinterfacedescriptor.pro b/tests/auto/qserviceinterfacedescriptor/qserviceinterfacedescriptor.pro index f13894e228..c82b29308b 100644 --- a/tests/auto/qserviceinterfacedescriptor/qserviceinterfacedescriptor.pro +++ b/tests/auto/qserviceinterfacedescriptor/qserviceinterfacedescriptor.pro @@ -10,7 +10,8 @@ include(../../../common.pri) # Input SOURCES += tst_qserviceinterfacedescriptor.cpp -qtAddLibrary(QtServiceFramework) +CONFIG += mobility +MOBILITY = serviceframework symbian { TARGET.CAPABILITY = ALL -TCB diff --git a/tests/auto/qservicemanager/qservicemanager.pro b/tests/auto/qservicemanager/qservicemanager.pro index ad1239e753..2f7b167dcf 100644 --- a/tests/auto/qservicemanager/qservicemanager.pro +++ b/tests/auto/qservicemanager/qservicemanager.pro @@ -14,7 +14,8 @@ SOURCES += tst_qservicemanager.cpp \ ../../sampleserviceplugin/sampleserviceplugin.cpp \ ../qsfwtestutil.cpp -qtAddLibrary(QtServiceFramework) +CONFIG += mobility +MOBILITY = serviceframework symbian|wince* { symbian { diff --git a/tests/auto/qsystemdeviceinfo/qsystemdeviceinfo.pro b/tests/auto/qsystemdeviceinfo/qsystemdeviceinfo.pro index 79b2c1e5ee..6e77ae0af1 100644 --- a/tests/auto/qsystemdeviceinfo/qsystemdeviceinfo.pro +++ b/tests/auto/qsystemdeviceinfo/qsystemdeviceinfo.pro @@ -6,7 +6,8 @@ INCLUDEPATH += ../../../src/systeminfo SOURCES += tst_qsystemdeviceinfo.cpp include(../../../common.pri) -qtAddLibrary(QtSystemInfo) +CONFIG += mobility +MOBILITY = systeminfo symbian { TARGET.CAPABILITY = All -TCB -DRM diff --git a/tests/auto/qsystemdisplayinfo/qsystemdisplayinfo.pro b/tests/auto/qsystemdisplayinfo/qsystemdisplayinfo.pro index 835458f187..4ddf7bf11c 100644 --- a/tests/auto/qsystemdisplayinfo/qsystemdisplayinfo.pro +++ b/tests/auto/qsystemdisplayinfo/qsystemdisplayinfo.pro @@ -7,7 +7,8 @@ QT = core network gui INCLUDEPATH += ../../../src/systeminfo include(../../../common.pri) -qtAddLibrary(QtSystemInfo) +CONFIG += mobility +MOBILITY = systeminfo symbian { TARGET.CAPABILITY = All -TCB -DRM diff --git a/tests/auto/qsysteminfo/qsysteminfo.pro b/tests/auto/qsysteminfo/qsysteminfo.pro index aff0fc4890..7b888068af 100644 --- a/tests/auto/qsysteminfo/qsysteminfo.pro +++ b/tests/auto/qsysteminfo/qsysteminfo.pro @@ -7,7 +7,8 @@ QT = core network INCLUDEPATH += ../../../src/systeminfo include(../../../common.pri) -qtAddLibrary(QtSystemInfo) +CONFIG += mobility +MOBILITY = systeminfo symbian { TARGET.CAPABILITY = All -TCB -DRM diff --git a/tests/auto/qsystemnetworkinfo/qsystemnetworkinfo.pro b/tests/auto/qsystemnetworkinfo/qsystemnetworkinfo.pro index 78a2d08be6..ba5f297798 100644 --- a/tests/auto/qsystemnetworkinfo/qsystemnetworkinfo.pro +++ b/tests/auto/qsystemnetworkinfo/qsystemnetworkinfo.pro @@ -7,7 +7,8 @@ SOURCES += tst_qsystemnetworkinfo.cpp INCLUDEPATH += ../../../src/systeminfo include(../../../common.pri) -qtAddLibrary(QtSystemInfo) +CONFIG += mobility +MOBILITY = systeminfo symbian { TARGET.CAPABILITY = All -TCB -DRM diff --git a/tests/auto/qsystemreadwritelock/test/test.pro b/tests/auto/qsystemreadwritelock/test/test.pro index 9410fc5f5a..3598bf11db 100644 --- a/tests/auto/qsystemreadwritelock/test/test.pro +++ b/tests/auto/qsystemreadwritelock/test/test.pro @@ -11,7 +11,8 @@ include(../../../../common.pri) # Input SOURCES += ../tst_qsystemreadwritelock.cpp -qtAddLibrary(QtPublishSubscribe) +CONFIG += mobility +MOBILITY = publishsubscribe symbian { TARGET.CAPABILITY = ALL -TCB diff --git a/tests/auto/qsystemreadwritelock_oop/lackey/lackey.pro b/tests/auto/qsystemreadwritelock_oop/lackey/lackey.pro index d3b726b5df..d636991808 100644 --- a/tests/auto/qsystemreadwritelock_oop/lackey/lackey.pro +++ b/tests/auto/qsystemreadwritelock_oop/lackey/lackey.pro @@ -12,5 +12,6 @@ CONFIG+= testcase include(../../../../common.pri) -qtAddLibrary(QtPublishSubscribe) +CONFIG += mobility +MOBILITY = publishsubscribe diff --git a/tests/auto/qsystemreadwritelock_oop/test/test.pro b/tests/auto/qsystemreadwritelock_oop/test/test.pro index 639ec6da88..66c771c526 100644 --- a/tests/auto/qsystemreadwritelock_oop/test/test.pro +++ b/tests/auto/qsystemreadwritelock_oop/test/test.pro @@ -10,7 +10,8 @@ include(../../../../common.pri) # Input SOURCES += ../tst_qsystemreadwritelock_oop.cpp -qtAddLibrary(QtPublishSubscribe) +CONFIG += mobility +MOBILITY = publishsubscribe symbian { TARGET.CAPABILITY = ALL -TCB diff --git a/tests/auto/qsystemscreensaver/qsystemscreensaver.pro b/tests/auto/qsystemscreensaver/qsystemscreensaver.pro index 408198b371..d74ce9bfb5 100644 --- a/tests/auto/qsystemscreensaver/qsystemscreensaver.pro +++ b/tests/auto/qsystemscreensaver/qsystemscreensaver.pro @@ -6,7 +6,8 @@ INCLUDEPATH += ../../../src/systeminfo SOURCES += tst_qsystemscreensaver.cpp include(../../../common.pri) -qtAddLibrary(QtSystemInfo) +CONFIG += mobility +MOBILITY = systeminfo symbian { TARGET.CAPABILITY = All -TCB -DRM diff --git a/tests/auto/qsystemstorageinfo/qsystemstorageinfo.pro b/tests/auto/qsystemstorageinfo/qsystemstorageinfo.pro index 56afab3a4f..245bb05abb 100644 --- a/tests/auto/qsystemstorageinfo/qsystemstorageinfo.pro +++ b/tests/auto/qsystemstorageinfo/qsystemstorageinfo.pro @@ -8,7 +8,8 @@ SOURCES += tst_qsystemstorageinfo.cpp INCLUDEPATH += ../../../src/systeminfo include(../../../common.pri) -qtAddLibrary(QtSystemInfo) +CONFIG += mobility +MOBILITY = systeminfo symbian { TARGET.CAPABILITY = All -TCB -DRM diff --git a/tests/auto/qvaluespace/qvaluespace.pro b/tests/auto/qvaluespace/qvaluespace.pro index acd645855a..70cf82cd6d 100644 --- a/tests/auto/qvaluespace/qvaluespace.pro +++ b/tests/auto/qvaluespace/qvaluespace.pro @@ -11,7 +11,8 @@ include(../../../common.pri) # Input SOURCES += tst_qvaluespace.cpp -qtAddLibrary(QtPublishSubscribe) +CONFIG += mobility +MOBILITY = publishsubscribe symbian { TARGET.CAPABILITY = ALL -TCB diff --git a/tests/auto/qvaluespacepublisher/qvaluespacepublisher.pro b/tests/auto/qvaluespacepublisher/qvaluespacepublisher.pro index 11eba9eac7..76fb868a1e 100644 --- a/tests/auto/qvaluespacepublisher/qvaluespacepublisher.pro +++ b/tests/auto/qvaluespacepublisher/qvaluespacepublisher.pro @@ -11,7 +11,8 @@ include(../../../common.pri) # Input SOURCES += tst_qvaluespacepublisher.cpp -qtAddLibrary(QtPublishSubscribe) +CONFIG += mobility +MOBILITY = publishsubscribe symbian { TARGET.CAPABILITY = ALL -TCB diff --git a/tests/auto/qvaluespacesubscriber/lackey/lackey.pro b/tests/auto/qvaluespacesubscriber/lackey/lackey.pro index 5e31c3a0b8..f3a76b5fae 100644 --- a/tests/auto/qvaluespacesubscriber/lackey/lackey.pro +++ b/tests/auto/qvaluespacesubscriber/lackey/lackey.pro @@ -9,4 +9,5 @@ CONFIG+= testcase include(../../../../common.pri) -qtAddLibrary(QtPublishSubscribe) +CONFIG += mobility +MOBILITY = publishsubscribe diff --git a/tests/auto/qvaluespacesubscriber/tst_qvaluespacesubscriber/tst_qvaluespacesubscriber.pro b/tests/auto/qvaluespacesubscriber/tst_qvaluespacesubscriber/tst_qvaluespacesubscriber.pro index d8f867408d..f81456cc0b 100644 --- a/tests/auto/qvaluespacesubscriber/tst_qvaluespacesubscriber/tst_qvaluespacesubscriber.pro +++ b/tests/auto/qvaluespacesubscriber/tst_qvaluespacesubscriber/tst_qvaluespacesubscriber.pro @@ -19,7 +19,8 @@ HEADERS += tst_qvaluespacesubscribershared.h DEFINES += QT_START_VALUESPACE -qtAddLibrary(QtPublishSubscribe) +CONFIG += mobility +MOBILITY = publishsubscribe symbian { TARGET.CAPABILITY = ALL -TCB diff --git a/tests/auto/qvaluespacesubscriber/tst_qvaluespacesubscriber_oop/tst_qvaluespacesubscriber_oop.pro b/tests/auto/qvaluespacesubscriber/tst_qvaluespacesubscriber_oop/tst_qvaluespacesubscriber_oop.pro index da96031328..ed8c3601af 100644 --- a/tests/auto/qvaluespacesubscriber/tst_qvaluespacesubscriber_oop/tst_qvaluespacesubscriber_oop.pro +++ b/tests/auto/qvaluespacesubscriber/tst_qvaluespacesubscriber_oop/tst_qvaluespacesubscriber_oop.pro @@ -17,7 +17,8 @@ SOURCES += tst_qvaluespacesubscriber_oop.cpp \ tst_qvaluespacesubscribershared.cpp HEADERS += tst_qvaluespacesubscribershared.h -qtAddLibrary(QtPublishSubscribe) +CONFIG += mobility +MOBILITY = publishsubscribe symbian { TARGET.CAPABILITY = ALL -TCB diff --git a/tests/auto/qvcard21writer/qvcard21writer.pro b/tests/auto/qvcard21writer/qvcard21writer.pro index 6f9bca8810..54964d58f1 100644 --- a/tests/auto/qvcard21writer/qvcard21writer.pro +++ b/tests/auto/qvcard21writer/qvcard21writer.pro @@ -19,8 +19,8 @@ INCLUDEPATH += \ HEADERS += ut_qvcard21writer.h SOURCES += ut_qvcard21writer.cpp -qtAddLibrary(QtContacts) -qtAddLibrary(QtVersit) +CONFIG += mobility +MOBILITY = contacts versit symbian: { TARGET.CAPABILITY = ALL \ diff --git a/tests/auto/qvcard30writer/qvcard30writer.pro b/tests/auto/qvcard30writer/qvcard30writer.pro index 52d63861a7..a270343844 100644 --- a/tests/auto/qvcard30writer/qvcard30writer.pro +++ b/tests/auto/qvcard30writer/qvcard30writer.pro @@ -19,8 +19,8 @@ INCLUDEPATH += \ HEADERS += ut_qvcard30writer.h SOURCES += ut_qvcard30writer.cpp -qtAddLibrary(QtContacts) -qtAddLibrary(QtVersit) +CONFIG += mobility +MOBILITY = contacts versit symbian: { TARGET.CAPABILITY = ALL \ diff --git a/tests/auto/qversitcontactexporter/qversitcontactexporter.pro b/tests/auto/qversitcontactexporter/qversitcontactexporter.pro index ac0974651e..228b9e18bf 100644 --- a/tests/auto/qversitcontactexporter/qversitcontactexporter.pro +++ b/tests/auto/qversitcontactexporter/qversitcontactexporter.pro @@ -19,8 +19,8 @@ INCLUDEPATH += \ HEADERS += ut_qversitcontactexporter.h SOURCES += ut_qversitcontactexporter.cpp -qtAddLibrary(QtContacts) -qtAddLibrary(QtVersit) +CONFIG += mobility +MOBILITY = contacts versit symbian: { TARGET.CAPABILITY = ALL \ diff --git a/tests/auto/qversitcontactimporter/qversitcontactimporter.pro b/tests/auto/qversitcontactimporter/qversitcontactimporter.pro index 3c8612f9bb..dcc704ff74 100644 --- a/tests/auto/qversitcontactimporter/qversitcontactimporter.pro +++ b/tests/auto/qversitcontactimporter/qversitcontactimporter.pro @@ -19,8 +19,8 @@ INCLUDEPATH += \ HEADERS += ut_qversitcontactimporter.h SOURCES += ut_qversitcontactimporter.cpp -qtAddLibrary(QtContacts) -qtAddLibrary(QtVersit) +CONFIG += mobility +MOBILITY = contacts versit symbian: { TARGET.CAPABILITY = ALL \ diff --git a/tests/auto/qversitdocument/qversitdocument.pro b/tests/auto/qversitdocument/qversitdocument.pro index 21d53d623e..3bdee2e527 100644 --- a/tests/auto/qversitdocument/qversitdocument.pro +++ b/tests/auto/qversitdocument/qversitdocument.pro @@ -19,8 +19,8 @@ INCLUDEPATH += \ HEADERS += ut_qversitdocument.h SOURCES += ut_qversitdocument.cpp -qtAddLibrary(QtContacts) -qtAddLibrary(QtVersit) +CONFIG += mobility +MOBILITY = contacts versit symbian: { TARGET.CAPABILITY = ALL \ diff --git a/tests/auto/qversitproperty/qversitproperty.pro b/tests/auto/qversitproperty/qversitproperty.pro index bbfec39d02..9016999ee6 100644 --- a/tests/auto/qversitproperty/qversitproperty.pro +++ b/tests/auto/qversitproperty/qversitproperty.pro @@ -19,8 +19,8 @@ INCLUDEPATH += \ HEADERS += ut_qversitproperty.h SOURCES += ut_qversitproperty.cpp -qtAddLibrary(QtContacts) -qtAddLibrary(QtVersit) +CONFIG += mobility +MOBILITY = contacts versit symbian: { TARGET.CAPABILITY = ALL \ diff --git a/tests/auto/qversitreader/qversitreader.pro b/tests/auto/qversitreader/qversitreader.pro index bff03969c7..c7cd85df04 100644 --- a/tests/auto/qversitreader/qversitreader.pro +++ b/tests/auto/qversitreader/qversitreader.pro @@ -19,8 +19,8 @@ INCLUDEPATH += \ HEADERS += ut_qversitreader.h SOURCES += ut_qversitreader.cpp -qtAddLibrary(QtContacts) -qtAddLibrary(QtVersit) +CONFIG += mobility +MOBILITY = contacts versit symbian: { TARGET.CAPABILITY = ALL \ diff --git a/tests/auto/qversitutils/qversitutils.pro b/tests/auto/qversitutils/qversitutils.pro index fa0bcf1401..8cd4c42de6 100644 --- a/tests/auto/qversitutils/qversitutils.pro +++ b/tests/auto/qversitutils/qversitutils.pro @@ -19,8 +19,8 @@ INCLUDEPATH += \ HEADERS += ut_versitutils.h SOURCES += ut_versitutils.cpp -qtAddLibrary(QtContacts) -qtAddLibrary(QtVersit) +CONFIG += mobility +MOBILITY = contacts versit symbian: { TARGET.CAPABILITY = ALL \ diff --git a/tests/auto/qversitwriter/qversitwriter.pro b/tests/auto/qversitwriter/qversitwriter.pro index ca428f32af..b60eae91f1 100644 --- a/tests/auto/qversitwriter/qversitwriter.pro +++ b/tests/auto/qversitwriter/qversitwriter.pro @@ -19,8 +19,8 @@ INCLUDEPATH += \ HEADERS += ut_qversitwriter.h SOURCES += ut_qversitwriter.cpp -qtAddLibrary(QtContacts) -qtAddLibrary(QtVersit) +CONFIG += mobility +MOBILITY = contacts versit symbian: { TARGET.CAPABILITY = ALL \ diff --git a/tests/auto/qvideowidget/qvideowidget.pro b/tests/auto/qvideowidget/qvideowidget.pro index 9384fa6a5d..2cd0c38a3e 100644 --- a/tests/auto/qvideowidget/qvideowidget.pro +++ b/tests/auto/qvideowidget/qvideowidget.pro @@ -8,4 +8,5 @@ include (../../../common.pri) SOURCES += tst_qvideowidget.cpp -qtAddLibrary(QtMedia) +CONFIG += mobility +MOBILITY = multimedia diff --git a/tests/auto/servicedatabase/servicedatabase.pro b/tests/auto/servicedatabase/servicedatabase.pro index 72d27dde0e..b051109725 100644 --- a/tests/auto/servicedatabase/servicedatabase.pro +++ b/tests/auto/servicedatabase/servicedatabase.pro @@ -22,7 +22,8 @@ include(../../../common.pri) # Input SOURCES += tst_servicedatabase.cpp \ -qtAddLibrary(QtServiceFramework) +CONFIG += mobility +MOBILITY = serviceframework symbian { libBlock = \ diff --git a/tests/auto/servicemetadata/servicemetadata.pro b/tests/auto/servicemetadata/servicemetadata.pro index 667ac9fe0d..d6f61d247b 100644 --- a/tests/auto/servicemetadata/servicemetadata.pro +++ b/tests/auto/servicemetadata/servicemetadata.pro @@ -28,4 +28,5 @@ symbian { TARGET.CAPABILITY = ALL -TCB } -qtAddLibrary(QtServiceFramework) +CONFIG += mobility +MOBILITY = serviceframework diff --git a/tests/bearerex/bearerex.pro b/tests/bearerex/bearerex.pro index a870eb1158..e480d438af 100644 --- a/tests/bearerex/bearerex.pro +++ b/tests/bearerex/bearerex.pro @@ -24,11 +24,6 @@ SOURCES += bearerex.cpp \ main.cpp \ xqlistwidget.cpp -symbian: { - bearerex.sources = Qtbearer.dll - bearerex.path = /sys/bin - DEPLOYMENT += bearerex - - TARGET.CAPABILITY = NetworkServices NetworkControl ReadUserData -} -qtAddLibrary(QtBearer) +CONFIG += mobility +MOBILITY = bearer +symbian:TARGET.CAPABILITY = NetworkServices NetworkControl ReadUserData diff --git a/tests/messagingex/messagingex.pro b/tests/messagingex/messagingex.pro index 9d76093d67..06fe4545dc 100644 --- a/tests/messagingex/messagingex.pro +++ b/tests/messagingex/messagingex.pro @@ -7,7 +7,8 @@ include(../../common.pri) # Build against the messaging library INCLUDEPATH += $$SOURCE_DIR/src/messaging -qtAddLibrary(QtMessaging) +CONFIG += mobility +MOBILITY = messaging HEADERS += \ messagingex.h diff --git a/tests/networkmanager/networkmanager.pro b/tests/networkmanager/networkmanager.pro index 31b2af10f3..7ff370aaef 100644 --- a/tests/networkmanager/networkmanager.pro +++ b/tests/networkmanager/networkmanager.pro @@ -12,7 +12,8 @@ requires(contains(QT_CONFIG,dbus)) INCLUDEPATH += ../../src/bearer include(../../common.pri) -qtAddLibrary(QtBearer) +CONFIG += mobility +MOBILITY = bearer #MOC_DIR = .moc #OBJECTS_DIR = .obj diff --git a/tests/publishsubscribeex/publishsubscribeex.pro b/tests/publishsubscribeex/publishsubscribeex.pro index d34bf438a2..9915481acd 100644 --- a/tests/publishsubscribeex/publishsubscribeex.pro +++ b/tests/publishsubscribeex/publishsubscribeex.pro @@ -27,4 +27,5 @@ symbian { TARGET.UID3 = 0x2002ac7c } -qtAddLibrary(QtPublishSubscribe) +CONFIG += mobility +MOBILITY = publishsubscribe diff --git a/tests/sampleserviceplugin/sampleserviceplugin.pro b/tests/sampleserviceplugin/sampleserviceplugin.pro index 1158bce805..aff185fa12 100644 --- a/tests/sampleserviceplugin/sampleserviceplugin.pro +++ b/tests/sampleserviceplugin/sampleserviceplugin.pro @@ -7,17 +7,15 @@ TARGET = tst_sfw_sampleserviceplugin DESTDIR = . include(../../common.pri) -qtAddLibrary(QtServiceFramework) +CONFIG += mobility +MOBILITY = serviceframework symbian { load(data_caging_paths) pluginDep.sources = tst_sfw_sampleserviceplugin.dll pluginDep.path = $$QT_PLUGINS_BASE_DIR/plugins - pluginDep2.sources = qmakepluginstubs/tst_sfw_sampleserviceplugin.qtplugin - pluginDep2.path = $$QT_PLUGINS_BASE_DIR - - DEPLOYMENT += pluginDep \ pluginDep2 + DEPLOYMENT += pluginDep TARGET.EPOCALLOWDLLDATA = 1 TARGET.CAPABILITY = ALL -TCB diff --git a/tests/sampleserviceplugin2/sampleserviceplugin2.pro b/tests/sampleserviceplugin2/sampleserviceplugin2.pro index 788d6d9889..79d3737849 100644 --- a/tests/sampleserviceplugin2/sampleserviceplugin2.pro +++ b/tests/sampleserviceplugin2/sampleserviceplugin2.pro @@ -7,17 +7,15 @@ TARGET = tst_sfw_sampleserviceplugin2 DESTDIR = . include(../../common.pri) -qtAddLibrary(QtServiceFramework) +CONFIG += mobility +MOBILITY = serviceframework symbian { load(data_caging_paths) pluginDep.sources = tst_sfw_sampleserviceplugin2.dll pluginDep.path = $$QT_PLUGINS_BASE_DIR/plugins - pluginDep2.sources = qmakepluginstubs/tst_sfw_sampleserviceplugin2.qtplugin - pluginDep2.path = $$QT_PLUGINS_BASE_DIR - - DEPLOYMENT += pluginDep \ pluginDep2 + DEPLOYMENT += pluginDep TARGET.EPOCALLOWDLLDATA = 1 TARGET.CAPABILITY = ALL -TCB diff --git a/tests/testservice2/testservice2.pro b/tests/testservice2/testservice2.pro index 49a098df6d..24fb20d7ec 100644 --- a/tests/testservice2/testservice2.pro +++ b/tests/testservice2/testservice2.pro @@ -7,17 +7,15 @@ TARGET = tst_sfw_testservice2plugin DESTDIR = . include(../../common.pri) -qtAddLibrary(QtServiceFramework) +CONFIG += mobility +MOBILITY = serviceframework symbian { load(data_caging_paths) pluginDep.sources = tst_sfw_testservice2plugin.dll pluginDep.path = $$QT_PLUGINS_BASE_DIR/plugins - pluginDep2.sources = qmakepluginstubs/tst_sfw_testservice2plugin.qtplugin - pluginDep2.path = $$QT_PLUGINS_BASE_DIR - - DEPLOYMENT += pluginDep \ pluginDep2 + DEPLOYMENT += pluginDep TARGET.EPOCALLOWDLLDATA = 1 TARGET.CAPABILITY = ALL -TCB diff --git a/tools/qcrmlgen/qcrmlgen.pro b/tools/qcrmlgen/qcrmlgen.pro index 7bb36aed4e..c962c4c8f3 100644 --- a/tools/qcrmlgen/qcrmlgen.pro +++ b/tools/qcrmlgen/qcrmlgen.pro @@ -14,5 +14,6 @@ SOURCES=\ qcrmlparser.cpp include(../../common.pri) -qtAddLibrary(QtPublishSubscribe) +CONFIG += mobility +MOBILITY = publishsubscribe include(../../features/deploy.pri) diff --git a/tools/servicefw/servicefw.pro b/tools/servicefw/servicefw.pro index 92faad0c4f..09c99648ec 100644 --- a/tools/servicefw/servicefw.pro +++ b/tools/servicefw/servicefw.pro @@ -1,6 +1,7 @@ TEMPLATE=app TARGET=servicefw -CONFIG+=console +CONFIG+=console mobility +MOBILITY = serviceframework INCLUDEPATH += ../../src/serviceframework @@ -9,4 +10,3 @@ SOURCES=servicefw.cpp include(../../common.pri) include(../../features/deploy.pri) -qtAddLibrary(QtServiceFramework) diff --git a/tools/vsexplorer/vsexplorer.pro b/tools/vsexplorer/vsexplorer.pro index 9850600e9d..f179973530 100644 --- a/tools/vsexplorer/vsexplorer.pro +++ b/tools/vsexplorer/vsexplorer.pro @@ -15,6 +15,7 @@ SOURCES=\ include(../../common.pri) -qtAddLibrary(QtPublishSubscribe) +CONFIG += mobility +MOBILITY = publishsubscribe include(../../features/deploy.pri) |