diff options
| author | Alex <qt-info@nokia.com> | 2010-05-20 11:50:39 +1000 |
|---|---|---|
| committer | Alex <qt-info@nokia.com> | 2010-05-20 11:50:39 +1000 |
| commit | d9056c40e8bf085669ee691d58c27058b4d1a9d2 (patch) | |
| tree | 6b980f2058854f344aaa3c478b19f23ef6ec1b59 | |
| parent | 0d945c1001ea3da4f408cf4e1797e2f5165bf7eb (diff) | |
| parent | 006090e5574f0e5465c410b0af1df90401b89921 (diff) | |
Merge branch 'master' of ../qtmobility
Conflicts:
doc/html/contactsengines.html
doc/html/qt-mobility-project-library.index
doc/html/qtmobility.qhp
plugins/plugins.pro
2438 files changed, 8949 insertions, 9744 deletions
diff --git a/.gitignore b/.gitignore index 7eca61747c..84c15a195a 100644 --- a/.gitignore +++ b/.gitignore @@ -32,6 +32,29 @@ bin/qcrmlgen* bin/icheck* install/* lib/* +doc/src/snippets/sensors/sensors +examples/audiorecorder/audiorecorder +examples/bearercloud/bearercloud +examples/bearermonitor/bearermonitor +examples/flickrdemo/flickrdemo +examples/lightmaps/lightmaps_with_location +examples/logfilepositionsource/logfilepositionsource +examples/player/player +examples/publish-subscribe/publish-subscribe +examples/radio/radio +examples/samplephonebook/samplephonebook +examples/satellitedialog/satellitedialog +examples/sensors/accel/accel +examples/sensors/cubehouse/cubehouse +examples/sensors/grueapp/grueapp +examples/sensors/reading_perf/reading_perf +examples/sensors/sensor_explorer/sensor_explorer +examples/sensors/small_screen_sensors/SmallSensors +examples/servicebrowser/servicebrowser +examples/sfw-notes/sfw-notes +examples/slideshow/slideshow +examples/sysinfo/sysinfo +examples/weatherinfo/weatherinfo_with_location *.app config.tests/networkmanager/networkmanager config.tests/qmf/qmf diff --git a/bin/purge.sh b/bin/purge.sh index bdd6927a69..58aad74f94 100755 --- a/bin/purge.sh +++ b/bin/purge.sh @@ -1,7 +1,7 @@ #!/bin/bash ############################################################################# ## -## Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +## Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ## All rights reserved. ## Contact: Nokia Corporation (qt-info@nokia.com) ## diff --git a/bin/rununittests.bat b/bin/rununittests.bat index 932b3cc733..8b5555aaac 100644 --- a/bin/rununittests.bat +++ b/bin/rununittests.bat @@ -1,6 +1,6 @@ ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: :: -:: Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +:: Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). :: All rights reserved. :: Contact: Nokia Corporation (qt-info@nokia.com) :: diff --git a/bin/rununittests.sh b/bin/rununittests.sh index 5e02318b51..738f4e1339 100755 --- a/bin/rununittests.sh +++ b/bin/rununittests.sh @@ -1,7 +1,7 @@ #!/bin/bash ############################################################################# ## -## Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +## Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ## All rights reserved. ## Contact: Nokia Corporation (qt-info@nokia.com) ## diff --git a/bin/syncheaders b/bin/syncheaders index 92aad67779..5f66cb6f9c 100755 --- a/bin/syncheaders +++ b/bin/syncheaders @@ -1,7 +1,7 @@ #!/usr/bin/perl ############################################################################# ## -## Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +## Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ## All rights reserved. ## Contact: Nokia Corporation (qt-info@nokia.com) ## diff --git a/bin/syncheaders.bat b/bin/syncheaders.bat index 671686b408..742be362a8 100644 --- a/bin/syncheaders.bat +++ b/bin/syncheaders.bat @@ -1,6 +1,6 @@ ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: :: -:: Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +:: Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). :: All rights reserved. :: Contact: Nokia Corporation (qt-info@nokia.com) :: diff --git a/common.pri b/common.pri index 70be3e0f63..5cafb37ea1 100644 --- a/common.pri +++ b/common.pri @@ -92,8 +92,14 @@ contains(build_unit_tests, yes):DEFINES+=QTM_BUILD_UNITTESTS DESTDIR = $$OUTPUT_DIR/bin } } else { - testplugin:DESTDIR = $$OUTPUT_DIR/build/tests/bin/plugins/$$PLUGIN_TYPE - !testplugin:DESTDIR = $$OUTPUT_DIR/plugins/$$PLUGIN_TYPE + testplugin { + DESTDIR = $$OUTPUT_DIR/build/tests/bin/plugins/$$PLUGIN_TYPE + } else { + #check that plugin_type is set or warn otherwise + isEmpty(PLUGIN_TYPE):message(PLUGIN_TYPE not specified - install rule may not work) + target.path=$${QT_MOBILITY_PLUGINS}/$${PLUGIN_TYPE} + INSTALLS += target + } } MOC_DIR = $$OUTPUT_DIR/build/$$SUBDIRPART/$$TARGET/moc @@ -174,4 +180,4 @@ LIBS += -L$$OUTPUT_DIR/lib DEPENDPATH += . $$SOURCE_DIR INCLUDEPATH += $$SOURCE_DIR/src/global -!symbian:!wince*:DEFINES += QTM_PLUGIN_PATH=\\\"$$replace(QT_MOBILITY_PREFIX, \\\\, /)\\\" +!symbian:!wince*:DEFINES += QTM_PLUGIN_PATH=\\\"$$replace(QT_MOBILITY_PLUGINS, \\\\, /)\\\" diff --git a/config.tests/corewlan/corewlantest.mm b/config.tests/corewlan/corewlantest.mm index bcddf4432d..70edc2aa71 100644 --- a/config.tests/corewlan/corewlantest.mm +++ b/config.tests/corewlan/corewlantest.mm @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/config.tests/lbt/main.cpp b/config.tests/lbt/main.cpp index a5024774e3..4bc933175a 100644 --- a/config.tests/lbt/main.cpp +++ b/config.tests/lbt/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/config.tests/networkmanager/main.cpp b/config.tests/networkmanager/main.cpp index 60c6dfce63..4c66a51c17 100644 --- a/config.tests/networkmanager/main.cpp +++ b/config.tests/networkmanager/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/config.tests/occ/main.cpp b/config.tests/occ/main.cpp index 5ba226a00c..ff2388f78c 100644 --- a/config.tests/occ/main.cpp +++ b/config.tests/occ/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/config.tests/qmf/main.cpp b/config.tests/qmf/main.cpp index e5891db0be..ebc7f267f1 100644 --- a/config.tests/qmf/main.cpp +++ b/config.tests/qmf/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/config.tests/sensors_s60_31/main.cpp b/config.tests/sensors_s60_31/main.cpp index b8ac5cc58f..763b92453d 100644 --- a/config.tests/sensors_s60_31/main.cpp +++ b/config.tests/sensors_s60_31/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/config.tests/sensors_symbian/main.cpp b/config.tests/sensors_symbian/main.cpp index b8ac5cc58f..763b92453d 100644 --- a/config.tests/sensors_symbian/main.cpp +++ b/config.tests/sensors_symbian/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/config.tests/snap/main.cpp b/config.tests/snap/main.cpp index 64642a262e..37d65a4870 100644 --- a/config.tests/snap/main.cpp +++ b/config.tests/snap/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/config.tests/symbiancntsim/main.cpp b/config.tests/symbiancntsim/main.cpp index 06e6a92ea4..52149e3c80 100644 --- a/config.tests/symbiancntsim/main.cpp +++ b/config.tests/symbiancntsim/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -1,7 +1,7 @@ #!/bin/sh ############################################################################# ## -## Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +## Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ## All rights reserved. ## Contact: Nokia Corporation (qt-info@nokia.com) ## @@ -86,6 +86,7 @@ QT_MOBILITY_PREFIX=$shadowpath/install QT_MOBILITY_INCLUDE= QT_MOBILITY_LIB= QT_MOBILITY_BIN= +QT_MOBILITY_PLUGINS= BUILD_UNITTESTS= BUILD_EXAMPLES= BUILD_DOCS=yes @@ -96,6 +97,7 @@ LINUX_TARGET= QMAKE_CACHE="$shadowpath/.qmake.cache" LIB_PATH="lib" BIN_PATH="bin" +PLUGIN_PATH="plugins" MAC_SDK= MOBILITY_MODULES="bearer location contacts multimedia publishsubscribe versit messaging systeminfo serviceframework sensors" MOBILITY_MODULES_UNPARSED= @@ -119,6 +121,8 @@ usage() echo " (default PREFIX/lib)" echo "-bindir <dir> ..... Executables will be installed to <dir>" echo " (default PREFIX/bin)" + echo "-plugindir <dir> .. Plug-ins will be installed to <dir>" + echo " (default PREFIX/plugins)" echo "-debug ............ Build with debugging symbols" echo "-release .......... Build without debugging symbols" echo "-silent ........... Reduces build output" @@ -171,6 +175,10 @@ while [ "$#" -gt 0 ]; do QT_MOBILITY_BIN="$2" shift ;; + -plugindir) + QT_MOBILITY_PLUGINS="$2" + shift + ;; -tests) BUILD_UNITTESTS="yes" ;; @@ -338,7 +346,7 @@ else fi echo "QT_MOBILITY_LIB = $QT_MOBILITY_LIB" >> "$CONFIG_IN" -#process binary path +#process bin path if [ -z "$QT_MOBILITY_BIN" ]; then QT_MOBILITY_BIN="$QT_MOBILITY_PREFIX/$BIN_PATH" elif [ -d "$QT_MOBILITY_BIN" ]; then @@ -350,6 +358,19 @@ else fi echo "QT_MOBILITY_BIN = $QT_MOBILITY_BIN" >> "$CONFIG_IN" +#process plugin path +if [ -z "$QT_MOBILITY_PLUGINS" ]; then + QT_MOBILITY_PLUGINS="$QT_MOBILITY_PREFIX/$PLUGIN_PATH" +elif [ -d "$QT_MOBILITY_PLUGINS" ]; then + QT_MOBILITY_PLUGINS=`absPath $QT_MOBILITY_PLUGINS $LINUX_TARGET` +else + mkdir -p "$QT_MOBILITY_PLUGINS" + QT_MOBILITY_PLUGINS=`absPath $QT_MOBILITY_PLUGINS $LINUX_TARGET` + rm -rf "$QT_MOBILITY_PLUGINS" +fi +echo "QT_MOBILITY_PLUGINS = $QT_MOBILITY_PLUGINS" >> "$CONFIG_IN" + + echo "QT_MOBILITY_SOURCE_TREE = $relpath" >> "$QMAKE_CACHE" echo "QT_MOBILITY_BUILD_TREE = $shadowpath" >> "$QMAKE_CACHE" diff --git a/configure.bat b/configure.bat index 07d8c448d4..7b5d235bfb 100644 --- a/configure.bat +++ b/configure.bat @@ -1,6 +1,6 @@ :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
::
-:: Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+:: Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
:: All rights reserved.
:: Contact: Nokia Corporation (qt-info@nokia.com)
::
@@ -80,6 +80,7 @@ if "%1" == "-prefix" goto prefixTag if "%1" == "-libdir" goto libTag
if "%1" == "-bindir" goto binTag
if "%1" == "-headerdir" goto headerTag
+if "%1" == "-plugindir" goto pluginTag
if "%1" == "-tests" goto testTag
if "%1" == "-examples" goto exampleTag
if "%1" == "-qt" goto qtTag
@@ -112,6 +113,8 @@ echo Usage: configure.bat [-prefix (dir)] [headerdir (dir)] [libdir (dir)] echo (default PREFIX/lib)
echo -bindir (dir) ..... Executables will be installed to dir
echo (default PREFIX/bin)
+ echo -plugindir (dir) .. Plug-ins will be installed to dir
+ echo (default PREFIX/plugins)
echo -debug ............ Build with debugging symbols
echo -release .......... Build without debugging symbols
echo -silent ........... Reduces build output
@@ -181,6 +184,13 @@ echo QT_MOBILITY_INCLUDE = %1 >> %PROJECT_CONFIG% shift
goto cmdline_parsing
+:pluginTag
+shift
+echo QT_MOBILITY_PLUGINS = %1 >> %PROJECT_CONFIG%
+shift
+echo
+goto cmdline_parsing
+
:unfrozenTag
REM Should never be used in release builds
REM Some SDK's seem to exclude Q_AUTOTEST_EXPORT symbols if the
@@ -331,6 +341,7 @@ echo qmf_enabled = no >> %PROJECT_CONFIG% echo isEmpty($$QT_MOBILITY_INCLUDE):QT_MOBILITY_INCLUDE=$$QT_MOBILITY_PREFIX/include >> %PROJECT_CONFIG%
echo isEmpty($$QT_MOBILITY_LIB):QT_MOBILITY_LIB=$$QT_MOBILITY_PREFIX/lib >> %PROJECT_CONFIG%
echo isEmpty($$QT_MOBILITY_BIN):QT_MOBILITY_BIN=$$QT_MOBILITY_PREFIX/bin >> %PROJECT_CONFIG%
+echo isEmpty($$QT_MOBILITY_PLUGINS):QT_MOBILITY_PLUGINS=$$QT_MOBILITY_PREFIX/plugins >> %PROJECT_CONFIG%
echo mobility_modules = %MOBILITY_MODULES% >> %PROJECT_CONFIG%
REM no Sysinfo support on Maemo yet
diff --git a/dist/changes-1.0.0-beta1 b/dist/changes-1.0.0-beta1 index 04aa63206c..774f27d1b6 100644 --- a/dist/changes-1.0.0-beta1 +++ b/dist/changes-1.0.0-beta1 @@ -385,11 +385,6 @@ Qt Mobility for Windows CE - -<<<<<<< HEAD:dist/changes-1.0.0-beta1 -Qt Mobility for Symbian ------- - -======= Qt Mobility for Maemo5 ------ diff --git a/dist/changes-1.0.1 b/dist/changes-1.0.1 new file mode 100644 index 0000000000..98320192ce --- /dev/null +++ b/dist/changes-1.0.1 @@ -0,0 +1,141 @@ +Qt Mobility 1.0.1 is a patch release. It contains a number of +improvements and bug fixes since the Qt Mobility 1.0.0 release. For +more details, please refer to the online documentation included in this +distribution. The documentation is also available online: + + http://qt.nokia.com/doc/qtmobility-1.0 + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker or the Merge Request queue +of the public source repository. + +Qt Bug Tracker: http://bugreports.qt.nokia.com +Merge Request: http://qt.gitorious.org + + +**************************************************************************** +* General * +**************************************************************************** + +New features +------ + + - SomeClass, SomeOtherClass + * New classes for foo, bar and baz + +Optimizations +------ + + - Optimized foo in QSomeClass + * See list of Important Behavior Changes below + + +**************************************************************************** +* Important Behavior Changes * +**************************************************************************** + + - + + +**************************************************************************** +* Library * +**************************************************************************** + +QtBearer +------ + + - foo + * bar + +QtContacts +------ + + - foo + * bar + +QtLocation +------ + + - foo + * bar + +QtMessaging +------ + + - foo + * bar + +QtMedia +------ + + - foo + * bar + +QtPublishSubscribe +------ + + - foo + * bar + +QtServiceFramework +------ + + - foo + * bar + +QtSystemInfo +------ + + - foo + * bar + +Qt Mobility Plugins +------ + + - foo + * bar + + +**************************************************************************** +* Platform Specific Changes * +**************************************************************************** + +Qt Mobility for Embedded Linux +------ + + - + +Qt Mobility for Unix (X11 and Mac OS X) +------ + + - + +Qt Mobility for Linux/X11 +------ + + - + +Qt Mobility for Windows +------ + + - + +Qt Mobility for Mac OS X +------ + + - + + + +Qt Mobility for Windows CE +------ + + - + + +**************************************************************************** +* Tools * +**************************************************************************** + + - tool + * foo diff --git a/doc/html/3rdparty.html b/doc/html/3rdparty.html index 25f9343f66..c9901fb6fa 100644 --- a/doc/html/3rdparty.html +++ b/doc/html/3rdparty.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- 3rdparty.qdoc --> <head> - <title>Qt Mobility Project 1.0: Third-Party Licenses Used in Qt</title> + <title>Qt Mobility Project 1.1: Third-Party Licenses Used in Qt</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -106,8 +106,8 @@ <p>See <tt>src/3rdparty/zlib/README</tt> for license details.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/annotated.html b/doc/html/annotated.html index 0d926fcbe5..29df721686 100644 --- a/doc/html/annotated.html +++ b/doc/html/annotated.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- classes.qdoc --> <head> - <title>Qt Mobility Project 1.0: Annotated Class List</title> + <title>Qt Mobility Project 1.1: Annotated Class List</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -269,8 +269,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 daace6603e..f75f139688 100644 --- a/doc/html/audiorecorder-audiorecorder-cpp.html +++ b/doc/html/audiorecorder-audiorecorder-cpp.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: audiorecorder.cpp Example File (audiorecorder/audiorecorder.cpp)</title> + <title>Qt Mobility Project 1.1: audiorecorder.cpp Example File (audiorecorder/audiorecorder.cpp)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -429,8 +429,8 @@ }</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 242e2008aa..425fa0aea7 100644 --- a/doc/html/audiorecorder-audiorecorder-h.html +++ b/doc/html/audiorecorder-audiorecorder-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: audiorecorder.h Example File (audiorecorder/audiorecorder.h)</title> + <title>Qt Mobility Project 1.1: audiorecorder.h Example File (audiorecorder/audiorecorder.h)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -119,8 +119,8 @@ #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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 367986d90f..bf79bb46e1 100644 --- a/doc/html/audiorecorder-audiorecorder-pro.html +++ b/doc/html/audiorecorder-audiorecorder-pro.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: audiorecorder.pro Example File (audiorecorder/audiorecorder.pro)</title> + <title>Qt Mobility Project 1.1: audiorecorder.pro Example File (audiorecorder/audiorecorder.pro)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -38,8 +38,8 @@ }</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 149d97d6e6..5c0c75ff16 100644 --- a/doc/html/audiorecorder-main-cpp.html +++ b/doc/html/audiorecorder-main-cpp.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: main.cpp Example File (audiorecorder/main.cpp)</title> + <title>Qt Mobility Project 1.1: main.cpp Example File (audiorecorder/main.cpp)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -72,8 +72,8 @@ };</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/audiorecorder.html b/doc/html/audiorecorder.html index 6773d501f8..167ddbaa16 100644 --- a/doc/html/audiorecorder.html +++ b/doc/html/audiorecorder.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- audiorecorder.qdoc --> <head> - <title>Qt Mobility Project 1.0: Audio Recorder Example</title> + <title>Qt Mobility Project 1.1: Audio Recorder Example</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -56,8 +56,8 @@ }</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 88264b3b63..8c51b3ae21 100644 --- a/doc/html/battery-charge-battery-charge-pro.html +++ b/doc/html/battery-charge-battery-charge-pro.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: battery-charge.pro Example File (battery-charge/battery-charge.pro)</title> + <title>Qt Mobility Project 1.1: battery-charge.pro Example File (battery-charge/battery-charge.pro)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -17,8 +17,8 @@ SUBDIRS = battery-subscriber battery-publisher</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 72bf8eab77..4960e921a3 100644 --- a/doc/html/battery-charge-battery-publisher-battery-publisher-pro.html +++ b/doc/html/battery-charge-battery-publisher-battery-publisher-pro.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: battery-publisher.pro Example File (battery-charge/battery-publisher/battery-publisher.pro)</title> + <title>Qt Mobility Project 1.1: battery-publisher.pro Example File (battery-charge/battery-publisher/battery-publisher.pro)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -30,8 +30,8 @@ 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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 5df7216d27..132d1b089e 100644 --- a/doc/html/battery-charge-battery-publisher-batterypublisher-cpp.html +++ b/doc/html/battery-charge-battery-publisher-batterypublisher-cpp.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: batterypublisher.cpp Example File (battery-charge/battery-publisher/batterypublisher.cpp)</title> + <title>Qt Mobility Project 1.1: batterypublisher.cpp Example File (battery-charge/battery-publisher/batterypublisher.cpp)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -119,8 +119,8 @@ }</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 9acf68d045..3737cc7e25 100644 --- a/doc/html/battery-charge-battery-publisher-batterypublisher-h.html +++ b/doc/html/battery-charge-battery-publisher-batterypublisher-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: batterypublisher.h Example File (battery-charge/battery-publisher/batterypublisher.h)</title> + <title>Qt Mobility Project 1.1: batterypublisher.h Example File (battery-charge/battery-publisher/batterypublisher.h)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -94,8 +94,8 @@ #endif <span class="comment">// BATTERYPUBLISHER_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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 19e0cc28f2..83e4afdda7 100644 --- a/doc/html/battery-charge-battery-publisher-main-cpp.html +++ b/doc/html/battery-charge-battery-publisher-main-cpp.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: main.cpp Example File (battery-charge/battery-publisher/main.cpp)</title> + <title>Qt Mobility Project 1.1: main.cpp Example File (battery-charge/battery-publisher/main.cpp)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -70,8 +70,8 @@ }</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 93249d6e80..a15afad363 100644 --- a/doc/html/battery-charge-battery-subscriber-battery-subscriber-pro.html +++ b/doc/html/battery-charge-battery-subscriber-battery-subscriber-pro.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: battery-subscriber.pro Example File (battery-charge/battery-subscriber/battery-subscriber.pro)</title> + <title>Qt Mobility Project 1.1: battery-subscriber.pro Example File (battery-charge/battery-subscriber/battery-subscriber.pro)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -26,8 +26,8 @@ OTHER_FILES += battery-meter.qml</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 69fdaf181f..a432127cbf 100644 --- a/doc/html/battery-charge-battery-subscriber-battery-subscriber-qrc.html +++ b/doc/html/battery-charge-battery-subscriber-battery-subscriber-qrc.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: battery-subscriber.qrc Example File (battery-charge/battery-subscriber/battery-subscriber.qrc)</title> + <title>Qt Mobility Project 1.1: battery-subscriber.qrc Example File (battery-charge/battery-subscriber/battery-subscriber.qrc)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -21,8 +21,8 @@ </RCC></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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/battery-charge.html b/doc/html/battery-charge.html index 0e61d830c3..7a37254bae 100644 --- a/doc/html/battery-charge.html +++ b/doc/html/battery-charge.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- battery-charge.qdoc --> <head> - <title>Qt Mobility Project 1.0: Accessing Publish and Subscribe from QML</title> + <title>Qt Mobility Project 1.1: Accessing Publish and Subscribe from QML</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -75,8 +75,8 @@ },</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/bearer-management.html b/doc/html/bearer-management.html index 6ad034f5e6..276c6ed11f 100644 --- a/doc/html/bearer-management.html +++ b/doc/html/bearer-management.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- bearermanagement.qdoc --> <head> - <title>Qt Mobility Project 1.0: Bearer Management</title> + <title>Qt Mobility Project 1.1: Bearer Management</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,9 +15,9 @@ <td align="right" valign="top" width="230"><img src="images/codeless.png" border="0" /></td></tr></table><h1 class="title">Bearer Management<br /><span class="subtitle"></span> </h1> <p>Bearer Management controls the connectivity state of the system so that the user can start or stop interfaces or roam transparently between access points.</p> -<ul><li><a href="#namespace">Namespace</a></li> -<li><a href="#overview">Overview</a></li> -<ul><li><a href="#the-api-in-detail">The API in Detail</a></li> +<ul><li><a href="#overview">Overview</a></li> +<ul><li><a href="#migration-to-qt-4-7-or-higher">Migration to Qt 4.7 or higher</a></li> +<li><a href="#the-api-in-detail">The API in Detail</a></li> <ul><li><a href="#service-networks">Service networks</a></li> <li><a href="#managing-network-sessions">Managing network sessions</a></li> <li><a href="#roaming">Roaming</a></li> @@ -33,14 +33,16 @@ </ul> <li><a href="#classes">Classes</a></li> </ul> -<a name="namespace"></a> -<h3>Namespace</h3> -<p>The QtMobility API's are placed into the <i>QtMobility</i> 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="overview"></a> <h3>Overview</h3> <p>The Bearer Management API controls the system's connectivity state. This incorporates simple information such as whether the device is online and how many interfaces there are as well as enables the application developer to start, stop network interfaces and influences other connection specific details. Depending on the platform's capabilities it may even provide session management so that a network interface remains up for as long as clients have a registered interest in them while at the same time optimizes the interface's uptime.</p> -<p>This API is a key enabler for HTTP level roaming in <a href="http://qt.nokia.com/doc/4.6/qnetworkaccessmanager.html">QNetworkAccessManager</a>.</p> <p>This API does not provide support for management of network configurations themselves. It is up to the platform to provide infrastructure which enables to user to create, edit or delete network configurations.</p> +<a name="migration-to-qt-4-7-or-higher"></a> +<h4>Migration to Qt 4.7 or higher</h4> +<p>The Bearer API has been migrated to the Qt 4.7 <a href="http://qt.nokia.com/doc/4.6/qtnetwork.html">QtNetwork</a> library. This enables connection manager and roaming support for <a href="http://qt.nokia.com/doc/4.6/qnetworkaccessmanager.html">QNetworkAccessManager</a>. Starting with Qt 4.7 the Mobility version has been deprecated in favor of Qt's Bearer API. Furthermore the roaming enabled <a href="http://qt.nokia.com/doc/4.6/qnetworkaccessmanager.html">QNetworkAccessManager</a> cannot be used in connection with Mobility's Bearer API.</p> +<p>The porting effort from Mobility Bearer to Qt Bearer is minimal as the relevant classes are source compatible. The only exception is the removal of the QtMobility namespace. Already deployed applications will continue to work but cannot make use of the new features in Qt 4.7 and <a href="http://qt.nokia.com/doc/4.6/qnetworkaccessmanager.html">QNetworkAccessManager</a>.</p> +<p>An application can select the Bearer API to be used via its project file. As long as the MOBILITY variable contains the <tt>bearer</tt> string the project will link Mobility's bearer library (even if the project links against <a href="http://qt.nokia.com/doc/4.6/qtnetwork.html">QtNetwork</a> at the same time).</p> +<pre> MOBILITY+=bearer #choose Mobility bearer</pre> <a name="the-api-in-detail"></a> <h4>The API in Detail</h4> <p>Computer systems manage their network interfaces via a set of configurations. Each configuration describes a set of parameters which instruct the system how a particular network interface is started. One of the most simplistic examples might be an Ethernet configuration that links a network card to a DHCP server. A more complex example might be a Wireless LAN configuration which may comprise of hardware details such as the WLAN card address, WLAN access point details (e.g ESSID, encryption details) and user specific information (for example username and password). Once the network interface was configured and started according to the configuration blue print, multiple applications are free to use this link layer connection/session for their own socket operations. Note that the <a href="qnetworkconfiguration.html">QNetworkConfiguration</a> object only provides limited information about the configuration details themselves. It's main purpose is to act as a configuration identifier through which link layer connections can be created, destroyed and monitored.</p> @@ -133,8 +135,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/bearer.html b/doc/html/bearer.html index 8d70dbae68..c4a85a9e97 100644 --- a/doc/html/bearer.html +++ b/doc/html/bearer.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- bearermanagement.qdoc --> <head> - <title>Qt Mobility Project 1.0: Qt Bearer Management API</title> + <title>Qt Mobility Project 1.1: Qt Bearer Management API</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -22,8 +22,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 e7a7408d78..3a12dc7365 100644 --- a/doc/html/bearercloud-bearercloud-cpp.html +++ b/doc/html/bearercloud-bearercloud-cpp.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: bearercloud.cpp Example File (bearercloud/bearercloud.cpp)</title> + <title>Qt Mobility Project 1.1: bearercloud.cpp Example File (bearercloud/bearercloud.cpp)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -200,8 +200,8 @@ }</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 3372a3249d..09b4226062 100644 --- a/doc/html/bearercloud-bearercloud-h.html +++ b/doc/html/bearercloud-bearercloud-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: bearercloud.h Example File (bearercloud/bearercloud.h)</title> + <title>Qt Mobility Project 1.1: bearercloud.h Example File (bearercloud/bearercloud.h)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -94,8 +94,8 @@ };</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 535b851dc3..cf7f4da482 100644 --- a/doc/html/bearercloud-bearercloud-pro.html +++ b/doc/html/bearercloud-bearercloud-pro.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: bearercloud.pro Example File (bearercloud/bearercloud.pro)</title> + <title>Qt Mobility Project 1.1: bearercloud.pro Example File (bearercloud/bearercloud.pro)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -38,8 +38,8 @@ symbian:TARGET.CAPABILITY = NetworkServices 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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 cf48a5100d..c4315acbb3 100644 --- a/doc/html/bearercloud-cloud-cpp.html +++ b/doc/html/bearercloud-cloud-cpp.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: cloud.cpp Example File (bearercloud/cloud.cpp)</title> + <title>Qt Mobility Project 1.1: cloud.cpp Example File (bearercloud/cloud.cpp)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -364,8 +364,8 @@ }</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 f0d80ffbfd..b837ed3dd9 100644 --- a/doc/html/bearercloud-cloud-h.html +++ b/doc/html/bearercloud-cloud-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: cloud.h Example File (bearercloud/cloud.h)</title> + <title>Qt Mobility Project 1.1: cloud.h Example File (bearercloud/cloud.h)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -110,8 +110,8 @@ };</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 6f59d99748..59356fcb2d 100644 --- a/doc/html/bearercloud-icons-qrc.html +++ b/doc/html/bearercloud-icons-qrc.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: icons.qrc Example File (bearercloud/icons.qrc)</title> + <title>Qt Mobility Project 1.1: icons.qrc Example File (bearercloud/icons.qrc)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -22,8 +22,8 @@ </RCC></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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 6684b83522..1ef9507b45 100644 --- a/doc/html/bearercloud-lan-svg.html +++ b/doc/html/bearercloud-lan-svg.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: lan.svg Example File (bearercloud/lan.svg)</title> + <title>Qt Mobility Project 1.1: lan.svg Example File (bearercloud/lan.svg)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -91,8 +91,8 @@ </svg></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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 8ec7c4d9ce..b634c4f096 100644 --- a/doc/html/bearercloud-main-cpp.html +++ b/doc/html/bearercloud-main-cpp.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: main.cpp Example File (bearercloud/main.cpp)</title> + <title>Qt Mobility Project 1.1: main.cpp Example File (bearercloud/main.cpp)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -102,8 +102,8 @@ }</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 39344f0156..10906ae7aa 100644 --- a/doc/html/bearercloud-unknown-svg.html +++ b/doc/html/bearercloud-unknown-svg.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: unknown.svg Example File (bearercloud/unknown.svg)</title> + <title>Qt Mobility Project 1.1: unknown.svg Example File (bearercloud/unknown.svg)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -91,8 +91,8 @@ </svg></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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 37f6be14da..105d98d987 100644 --- a/doc/html/bearercloud-wlan-svg.html +++ b/doc/html/bearercloud-wlan-svg.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: wlan.svg Example File (bearercloud/wlan.svg)</title> + <title>Qt Mobility Project 1.1: wlan.svg Example File (bearercloud/wlan.svg)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -166,8 +166,8 @@ </svg></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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/bearercloud.html b/doc/html/bearercloud.html index 8b589ad6f0..d6d64977ac 100644 --- a/doc/html/bearercloud.html +++ b/doc/html/bearercloud.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- bearercloud.qdoc --> <head> - <title>Qt Mobility Project 1.0: Bearer Cloud Example</title> + <title>Qt Mobility Project 1.1: Bearer Cloud Example</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -307,8 +307,8 @@ <p>The remainder of the code for the Cloud object implements the animations. The calculateForces() function calculates the new position of the Cloud object based on the position of all the other Cloud objects in the scene. The new position is set when the advance() function is called to update the Cloud object for the current animation frame.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 07a12a5b6c..d2ca3aecd4 100644 --- a/doc/html/bearermonitor-bearermonitor-cpp.html +++ b/doc/html/bearermonitor-bearermonitor-cpp.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: bearermonitor.cpp Example File (bearermonitor/bearermonitor.cpp)</title> + <title>Qt Mobility Project 1.1: bearermonitor.cpp Example File (bearermonitor/bearermonitor.cpp)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -428,8 +428,8 @@ }</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 5bce2a8fdd..406971b567 100644 --- a/doc/html/bearermonitor-bearermonitor-h.html +++ b/doc/html/bearermonitor-bearermonitor-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: bearermonitor.h Example File (bearermonitor/bearermonitor.h)</title> + <title>Qt Mobility Project 1.1: bearermonitor.h Example File (bearermonitor/bearermonitor.h)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -109,8 +109,8 @@ #endif <span class="comment">//BEARERMONITOR_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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 f41d8f87f5..386c98970a 100644 --- a/doc/html/bearermonitor-bearermonitor-pro.html +++ b/doc/html/bearermonitor-bearermonitor-pro.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: bearermonitor.pro Example File (bearermonitor/bearermonitor.pro)</title> + <title>Qt Mobility Project 1.1: bearermonitor.pro Example File (bearermonitor/bearermonitor.pro)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -46,8 +46,8 @@ symbian:TARGET.CAPABILITY = NetworkServices 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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 87e4e96e30..06bb882ac3 100644 --- a/doc/html/bearermonitor-main-cpp.html +++ b/doc/html/bearermonitor-main-cpp.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: main.cpp Example File (bearermonitor/main.cpp)</title> + <title>Qt Mobility Project 1.1: main.cpp Example File (bearermonitor/main.cpp)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -68,8 +68,8 @@ }</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 959d93771f..c803ae2c89 100644 --- a/doc/html/bearermonitor-sessionwidget-cpp.html +++ b/doc/html/bearermonitor-sessionwidget-cpp.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: sessionwidget.cpp Example File (bearermonitor/sessionwidget.cpp)</title> + <title>Qt Mobility Project 1.1: sessionwidget.cpp Example File (bearermonitor/sessionwidget.cpp)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -196,8 +196,8 @@ }</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 6494d92c8d..6f65279d3b 100644 --- a/doc/html/bearermonitor-sessionwidget-h.html +++ b/doc/html/bearermonitor-sessionwidget-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: sessionwidget.h Example File (bearermonitor/sessionwidget.h)</title> + <title>Qt Mobility Project 1.1: sessionwidget.h Example File (bearermonitor/sessionwidget.h)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -95,8 +95,8 @@ #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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/bearermonitor.html b/doc/html/bearermonitor.html index c146ae46da..7c6bcb8f08 100644 --- a/doc/html/bearermonitor.html +++ b/doc/html/bearermonitor.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- bearermonitor.qdoc --> <head> - <title>Qt Mobility Project 1.0: Bearer Monitor Example</title> + <title>Qt Mobility Project 1.1: Bearer Monitor Example</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -26,8 +26,8 @@ <p>The Bearer Monitor example shows how to use the Bearer Management API.</p> <p align="center"><img src="images/bearermonitor-example.png" /></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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 25051cd4d4..f9165067b2 100644 --- a/doc/html/bluetoothtransferplugin-bluetoothtransfer-cpp.html +++ b/doc/html/bluetoothtransferplugin-bluetoothtransfer-cpp.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: bluetoothtransfer.cpp Example File (bluetoothtransferplugin/bluetoothtransfer.cpp)</title> + <title>Qt Mobility Project 1.1: bluetoothtransfer.cpp Example File (bluetoothtransferplugin/bluetoothtransfer.cpp)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -68,8 +68,8 @@ }</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 dcb206bc3b..0bd1a55172 100644 --- a/doc/html/bluetoothtransferplugin-bluetoothtransfer-h.html +++ b/doc/html/bluetoothtransferplugin-bluetoothtransfer-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: bluetoothtransfer.h Example File (bluetoothtransferplugin/bluetoothtransfer.h)</title> + <title>Qt Mobility Project 1.1: bluetoothtransfer.h Example File (bluetoothtransferplugin/bluetoothtransfer.h)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -71,8 +71,8 @@ #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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 6f795aabab..03b8794511 100644 --- a/doc/html/bluetoothtransferplugin-bluetoothtransferplugin-cpp.html +++ b/doc/html/bluetoothtransferplugin-bluetoothtransferplugin-cpp.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: bluetoothtransferplugin.cpp Example File (bluetoothtransferplugin/bluetoothtransferplugin.cpp)</title> + <title>Qt Mobility Project 1.1: bluetoothtransferplugin.cpp Example File (bluetoothtransferplugin/bluetoothtransferplugin.cpp)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -73,8 +73,8 @@ Q_EXPORT_PLUGIN2(serviceframework_bluetoothtransferplugin, BluetoothTransferPlugin)</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 61b7d690a5..7b0cd07f61 100644 --- a/doc/html/bluetoothtransferplugin-bluetoothtransferplugin-h.html +++ b/doc/html/bluetoothtransferplugin-bluetoothtransferplugin-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: bluetoothtransferplugin.h Example File (bluetoothtransferplugin/bluetoothtransferplugin.h)</title> + <title>Qt Mobility Project 1.1: bluetoothtransferplugin.h Example File (bluetoothtransferplugin/bluetoothtransferplugin.h)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -76,8 +76,8 @@ #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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 3bf7fa2f9a..eaefbec401 100644 --- a/doc/html/bluetoothtransferplugin-bluetoothtransferplugin-pro.html +++ b/doc/html/bluetoothtransferplugin-bluetoothtransferplugin-pro.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: bluetoothtransferplugin.pro Example File (bluetoothtransferplugin/bluetoothtransferplugin.pro)</title> + <title>Qt Mobility Project 1.1: bluetoothtransferplugin.pro Example File (bluetoothtransferplugin/bluetoothtransferplugin.pro)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,9 @@ </h1> <pre> TEMPLATE = lib CONFIG += plugin + PLUGIN_TYPE=serviceframework INCLUDEPATH += ../../src/serviceframework + HEADERS += bluetoothtransferplugin.h \ bluetoothtransfer.h SOURCES += bluetoothtransferplugin.cpp \ @@ -37,15 +39,13 @@ TARGET.CAPABILITY = LocalServices Location NetworkServices ReadUserData WriteUserData UserEnvironment } - xml.path = $$DESTDIR/xmldata + xml.path = $$QT_MOBILITY_PREFIX/bin/xmldata xml.files = bluetoothtransferservice.xml - xml.CONFIG = no_link no_dependencies explicit_dependencies no_build combine ignore_no_exist no_clean - INSTALLS += xml - build_pass:ALL_DEPS+=install_xml</pre> + INSTALLS += xml</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/bluetoothtransferplugin.html b/doc/html/bluetoothtransferplugin.html index dec54b066c..9f58fac737 100644 --- a/doc/html/bluetoothtransferplugin.html +++ b/doc/html/bluetoothtransferplugin.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- bluetoothtransferplugin.qdoc --> <head> - <title>Qt Mobility Project 1.0: Bluetooth Transfer Plugin Example</title> + <title>Qt Mobility Project 1.1: Bluetooth Transfer Plugin Example</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -37,8 +37,8 @@ }</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/classes.html b/doc/html/classes.html index bb084d46ff..2ebdf3b8eb 100644 --- a/doc/html/classes.html +++ b/doc/html/classes.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- classes.qdoc --> <head> - <title>Qt Mobility Project 1.0: All Qt Mobility Classes</title> + <title>Qt Mobility Project 1.1: All Qt Mobility Classes</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -649,8 +649,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/classlists.html b/doc/html/classlists.html index ad70c4417f..affbe2a9e1 100644 --- a/doc/html/classlists.html +++ b/doc/html/classlists.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- classes.qdoc --> <head> - <title>Qt Mobility Project 1.0: Class and Function Documentation</title> + <title>Qt Mobility Project 1.1: Class and Function Documentation</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -31,8 +31,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/contacts.html b/doc/html/contacts.html index 151552a413..d118403a13 100644 --- a/doc/html/contacts.html +++ b/doc/html/contacts.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- contacts.qdoc --> <head> - <title>Qt Mobility Project 1.0: Contacts</title> + <title>Qt Mobility Project 1.1: Contacts</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -220,8 +220,8 @@ <p>See also: <a href="contactsusagehtml.html">Contacts API Usage</a></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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/contactsasync.html b/doc/html/contactsasync.html index 975132e5e6..936b44d7fa 100644 --- a/doc/html/contactsasync.html +++ b/doc/html/contactsasync.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- contactsasync.qdoc --> <head> - <title>Qt Mobility Project 1.0: Contacts Asynchronous API</title> + <title>Qt Mobility Project 1.1: Contacts Asynchronous API</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -146,8 +146,8 @@ <p>All other asynchronous operations are performed in a similar manner to the previous example. A request of the desired type (which is derived from <a href="qcontactabstractrequest.html">QContactAbstractRequest</a>) is created, certain criteria are set which determine the intent of the request, and the signals of the request are connected to slots which deals with the results. The request can then be started.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/contactsengines.html b/doc/html/contactsengines.html index df3a57395d..356b40c8bf 100644 --- a/doc/html/contactsengines.html +++ b/doc/html/contactsengines.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- contactsengines.qdoc --> <head> - <title>Qt Mobility Project 1.0: Qt Contacts Manager Engines</title> + <title>Qt Mobility Project 1.1: Qt Contacts Manager Engines</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -242,8 +242,8 @@ <p>There are several implementations of <a href="qcontactmanagerengine.html">QContactManagerEngine</a> available in the Qt Mobility source code repository. In particular, the "memory" engine provides an implementation of an in-memory, anonymous datastore which supports every feature in the API, and therefore is useful for demonstration purposes. Be aware, however, that the implementation of all functionality in the "memory" engine is naive and not performant, and should not be copied in any real engine implementation (e.g., to perform filtering, it reads all contacts from the (in-memory) database, and checks one by one for matches; a real engine, on the other hand, might perform a database query to return the results directly, rather than performing n-reads).</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/contactsschema.html b/doc/html/contactsschema.html index 0d7cc64819..0deed4058f 100644 --- a/doc/html/contactsschema.html +++ b/doc/html/contactsschema.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- contactsschema.qdoc --> <head> - <title>Qt Mobility Project 1.0: Qt Contacts Schema</title> + <title>Qt Mobility Project 1.1: Qt Contacts Schema</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -92,8 +92,8 @@ <p>Precisely which details are backend-provided is backend specific; some backends provide more details than others.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/contactssync.html b/doc/html/contactssync.html index b756e5c7aa..a5b5f5f080 100644 --- a/doc/html/contactssync.html +++ b/doc/html/contactssync.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- contactssync.qdoc --> <head> - <title>Qt Mobility Project 1.0: Contacts Synchronous API</title> + <title>Qt Mobility Project 1.1: Contacts Synchronous API</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -221,8 +221,8 @@ }</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/contactsusagehtml.html b/doc/html/contactsusagehtml.html index 0d50e5305a..e24de7dba5 100644 --- a/doc/html/contactsusagehtml.html +++ b/doc/html/contactsusagehtml.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- contactsusage.qdoc --> <head> - <title>Qt Mobility Project 1.0: Contacts API Usage</title> + <title>Qt Mobility Project 1.1: Contacts API Usage</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -500,8 +500,8 @@ <p>Note that some managers do not support mutable definitions, and hence attempting to modify or remove detail definitions in those managers will fail.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/creating-a-sensor-plugin.html b/doc/html/creating-a-sensor-plugin.html index aad6f615e6..bb89ce26df 100644 --- a/doc/html/creating-a-sensor-plugin.html +++ b/doc/html/creating-a-sensor-plugin.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- sensors.qdoc --> <head> - <title>Qt Mobility Project 1.0: Creating a sensor plugin</title> + <title>Qt Mobility Project 1.1: Creating a sensor plugin</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -39,8 +39,8 @@ <p>If you woud like to build a backend into a library or application you can use the <a href="qsensormanager.html#REGISTER_STATIC_PLUGIN">REGISTER_STATIC_PLUGIN</a>() macro although it may not work in all situations as it uses static initialization.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/declarative-sfw-dialer-declarative-sfw-dialer-pro.html b/doc/html/declarative-sfw-dialer-declarative-sfw-dialer-pro.html index 2c3de99c42..a23759df21 100644 --- a/doc/html/declarative-sfw-dialer-declarative-sfw-dialer-pro.html +++ b/doc/html/declarative-sfw-dialer-declarative-sfw-dialer-pro.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: declarative-sfw-dialer.pro Example File (declarative-sfw-dialer/declarative-sfw-dialer.pro)</title> + <title>Qt Mobility Project 1.1: declarative-sfw-dialer.pro Example File (declarative-sfw-dialer/declarative-sfw-dialer.pro)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -14,14 +14,12 @@ <td align="right" valign="top" width="230"><img src="images/codeless.png" border="0" /></td></tr></table><h1 class="title">declarative-sfw-dialer.pro Example File<br /><span class="small-subtitle">declarative-sfw-dialer/declarative-sfw-dialer.pro</span> </h1> <pre> TEMPLATE = subdirs - SUBDIRS += sfwexample \ - voipdialer \ - landlinedialer - #gsmdialer</pre> + SUBDIRS += voipdialer \ + landlinedialer</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/declarative-sfw-dialer-landlinedialer-landlinedialer-cpp.html b/doc/html/declarative-sfw-dialer-landlinedialer-landlinedialer-cpp.html index 5efd35b4d0..8ed8c4de63 100644 --- a/doc/html/declarative-sfw-dialer-landlinedialer-landlinedialer-cpp.html +++ b/doc/html/declarative-sfw-dialer-landlinedialer-landlinedialer-cpp.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: landlinedialer.cpp Example File (declarative-sfw-dialer/landlinedialer/landlinedialer.cpp)</title> + <title>Qt Mobility Project 1.1: landlinedialer.cpp Example File (declarative-sfw-dialer/landlinedialer/landlinedialer.cpp)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,40 +15,41 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 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:BSD$ - ** You may use this file under the terms of the BSD license as follows: + ** $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. + ** + ** + ** + ** + ** + ** ** - ** "Redistribution and use in source and binary forms, with or without - ** modification, are permitted provided that the following conditions are - ** met: - ** * Redistributions of source code must retain the above copyright - ** notice, this list of conditions and the following disclaimer. - ** * Redistributions in binary form must reproduce the above copyright - ** notice, this list of conditions and the following disclaimer in - ** the documentation and/or other materials provided with the - ** distribution. - ** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor - ** the names of its contributors may be used to endorse or promote - ** products derived from this software without specific prior written - ** permission. ** - ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - ** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - ** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - ** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - ** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - ** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - ** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - ** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." ** $QT_END_LICENSE$ ** ****************************************************************************/</span> @@ -119,8 +120,8 @@ }</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/declarative-sfw-dialer-landlinedialer-landlinedialer-h.html b/doc/html/declarative-sfw-dialer-landlinedialer-landlinedialer-h.html index ba93d295c0..371d3ebf4f 100644 --- a/doc/html/declarative-sfw-dialer-landlinedialer-landlinedialer-h.html +++ b/doc/html/declarative-sfw-dialer-landlinedialer-landlinedialer-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: landlinedialer.h Example File (declarative-sfw-dialer/landlinedialer/landlinedialer.h)</title> + <title>Qt Mobility Project 1.1: landlinedialer.h Example File (declarative-sfw-dialer/landlinedialer/landlinedialer.h)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,40 +15,41 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 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:BSD$ - ** You may use this file under the terms of the BSD license as follows: + ** $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. + ** + ** + ** + ** + ** + ** ** - ** "Redistribution and use in source and binary forms, with or without - ** modification, are permitted provided that the following conditions are - ** met: - ** * Redistributions of source code must retain the above copyright - ** notice, this list of conditions and the following disclaimer. - ** * Redistributions in binary form must reproduce the above copyright - ** notice, this list of conditions and the following disclaimer in - ** the documentation and/or other materials provided with the - ** distribution. - ** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor - ** the names of its contributors may be used to endorse or promote - ** products derived from this software without specific prior written - ** permission. ** - ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - ** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - ** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - ** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - ** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - ** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - ** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - ** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." ** $QT_END_LICENSE$ ** ****************************************************************************/</span> @@ -93,8 +94,8 @@ #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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/declarative-sfw-dialer-landlinedialer-landlinedialer-pro.html b/doc/html/declarative-sfw-dialer-landlinedialer-landlinedialer-pro.html index 6b717230bd..9ed5485a2e 100644 --- a/doc/html/declarative-sfw-dialer-landlinedialer-landlinedialer-pro.html +++ b/doc/html/declarative-sfw-dialer-landlinedialer-landlinedialer-pro.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: landlinedialer.pro Example File (declarative-sfw-dialer/landlinedialer/landlinedialer.pro)</title> + <title>Qt Mobility Project 1.1: landlinedialer.pro Example File (declarative-sfw-dialer/landlinedialer/landlinedialer.pro)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -16,6 +16,7 @@ <pre> TEMPLATE = lib CONFIG += plugin INCLUDEPATH += ../../../src/serviceframework + PLUGIN_TYPE = serviceframework TARGET = serviceframework_landlinedialerservice include(../../examples.pri) @@ -32,15 +33,13 @@ TARGET.CAPABILITY = ALL -TCB } - xml.path = $$DESTDIR/xmldata + xml.path = $$QT_MOBILITY_PREFIX/bin/xmldata xml.files = landlinedialerservice.xml - xml.CONFIG = no_link no_dependencies explicit_dependencies no_build combine ignore_no_exist no_clean - INSTALLS += xml - build_pass:ALL_DEPS+=install_xml</pre> + INSTALLS += xml</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/declarative-sfw-dialer-landlinedialer-landlinedialerplugin-cpp.html b/doc/html/declarative-sfw-dialer-landlinedialer-landlinedialerplugin-cpp.html index f18e339bd6..bdd9a1d571 100644 --- a/doc/html/declarative-sfw-dialer-landlinedialer-landlinedialerplugin-cpp.html +++ b/doc/html/declarative-sfw-dialer-landlinedialer-landlinedialerplugin-cpp.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: landlinedialerplugin.cpp Example File (declarative-sfw-dialer/landlinedialer/landlinedialerplugin.cpp)</title> + <title>Qt Mobility Project 1.1: landlinedialerplugin.cpp Example File (declarative-sfw-dialer/landlinedialer/landlinedialerplugin.cpp)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,40 +15,41 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 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:BSD$ - ** You may use this file under the terms of the BSD license as follows: + ** $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. + ** + ** + ** + ** + ** + ** ** - ** "Redistribution and use in source and binary forms, with or without - ** modification, are permitted provided that the following conditions are - ** met: - ** * Redistributions of source code must retain the above copyright - ** notice, this list of conditions and the following disclaimer. - ** * Redistributions in binary form must reproduce the above copyright - ** notice, this list of conditions and the following disclaimer in - ** the documentation and/or other materials provided with the - ** distribution. - ** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor - ** the names of its contributors may be used to endorse or promote - ** products derived from this software without specific prior written - ** permission. ** - ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - ** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - ** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - ** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - ** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - ** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - ** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - ** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." ** $QT_END_LICENSE$ ** ****************************************************************************/</span> @@ -74,8 +75,8 @@ Q_EXPORT_PLUGIN2(serviceframework_landlinedialerservice, LandlineDialerPlugin)</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/declarative-sfw-dialer-landlinedialer-landlinedialerplugin-h.html b/doc/html/declarative-sfw-dialer-landlinedialer-landlinedialerplugin-h.html index 526e47e584..8b3f4efb73 100644 --- a/doc/html/declarative-sfw-dialer-landlinedialer-landlinedialerplugin-h.html +++ b/doc/html/declarative-sfw-dialer-landlinedialer-landlinedialerplugin-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: landlinedialerplugin.h Example File (declarative-sfw-dialer/landlinedialer/landlinedialerplugin.h)</title> + <title>Qt Mobility Project 1.1: landlinedialerplugin.h Example File (declarative-sfw-dialer/landlinedialer/landlinedialerplugin.h)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,40 +15,41 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 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:BSD$ - ** You may use this file under the terms of the BSD license as follows: + ** $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. + ** + ** + ** + ** + ** + ** ** - ** "Redistribution and use in source and binary forms, with or without - ** modification, are permitted provided that the following conditions are - ** met: - ** * Redistributions of source code must retain the above copyright - ** notice, this list of conditions and the following disclaimer. - ** * Redistributions in binary form must reproduce the above copyright - ** notice, this list of conditions and the following disclaimer in - ** the documentation and/or other materials provided with the - ** distribution. - ** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor - ** the names of its contributors may be used to endorse or promote - ** products derived from this software without specific prior written - ** permission. ** - ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - ** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - ** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - ** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - ** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - ** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - ** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - ** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." ** $QT_END_LICENSE$ ** ****************************************************************************/</span> @@ -76,8 +77,8 @@ #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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/declarative-sfw-dialer-sfwexample-main-cpp.html b/doc/html/declarative-sfw-dialer-sfwexample-main-cpp.html deleted file mode 100644 index b7a2b66886..0000000000 --- a/doc/html/declarative-sfw-dialer-sfwexample-main-cpp.html +++ /dev/null @@ -1,93 +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: main.cpp Example File (declarative-sfw-dialer/sfwexample/main.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">main.cpp Example File<br /><span class="small-subtitle">declarative-sfw-dialer/sfwexample/main.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:BSD$ - ** You may use this file under the terms of the BSD license as follows: - ** - ** "Redistribution and use in source and binary forms, with or without - ** modification, are permitted provided that the following conditions are - ** met: - ** * Redistributions of source code must retain the above copyright - ** notice, this list of conditions and the following disclaimer. - ** * Redistributions in binary form must reproduce the above copyright - ** notice, this list of conditions and the following disclaimer in - ** the documentation and/or other materials provided with the - ** distribution. - ** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor - ** the names of its contributors may be used to endorse or promote - ** products derived from this software without specific prior written - ** permission. - ** - ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - ** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - ** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - ** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - ** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - ** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - ** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - ** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." - ** $QT_END_LICENSE$ - ** - ****************************************************************************/</span> - - #include <QApplication> - #include <QUrl> - #include <QtCore> - -<span class="comment"> //Includes for using the declarative viewer</span> - #include <QDeclarativeView> - -<span class="comment"> //Includes for using the service framework wrapper</span> - #include "qdeclarativeservice.h" - - #include "sfwexample.h" - - int main(int argc, char* argv[]) - { - //! [1] - qmlRegisterType<QServiceWrapper>("QtMobility.serviceframework", 1, 0, "Service"); - qmlRegisterType<QServiceListWrapper>("QtMobility.serviceframework", 1, 0, "ServiceList"); - //! [1] - - QApplication app(argc, argv); - - DialerServices *ds = new DialerServices(); - - //! [2] - QDeclarativeView canvas; - canvas.setSource(QUrl("qrc:/sfwexample.qml")); - canvas.show(); - //! [2] - - return app.exec(); - }</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/declarative-sfw-dialer-sfwexample-qdeclarativeservice-cpp.html b/doc/html/declarative-sfw-dialer-sfwexample-qdeclarativeservice-cpp.html deleted file mode 100644 index 38591fcd00..0000000000 --- a/doc/html/declarative-sfw-dialer-sfwexample-qdeclarativeservice-cpp.html +++ /dev/null @@ -1,189 +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: qdeclarativeservice.cpp Example File (declarative-sfw-dialer/sfwexample/qdeclarativeservice.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">qdeclarativeservice.cpp Example File<br /><span class="small-subtitle">declarative-sfw-dialer/sfwexample/qdeclarativeservice.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:BSD$ - ** You may use this file under the terms of the BSD license as follows: - ** - ** "Redistribution and use in source and binary forms, with or without - ** modification, are permitted provided that the following conditions are - ** met: - ** * Redistributions of source code must retain the above copyright - ** notice, this list of conditions and the following disclaimer. - ** * Redistributions in binary form must reproduce the above copyright - ** notice, this list of conditions and the following disclaimer in - ** the documentation and/or other materials provided with the - ** distribution. - ** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor - ** the names of its contributors may be used to endorse or promote - ** products derived from this software without specific prior written - ** permission. - ** - ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - ** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - ** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - ** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - ** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - ** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - ** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - ** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." - ** $QT_END_LICENSE$ - ** - ****************************************************************************/</span> - - #include "qdeclarativeservice.h" - - QServiceWrapper::QServiceWrapper() - : serviceInstance(0) - { - serviceManager = new QServiceManager(); - } - - QServiceWrapper::~QServiceWrapper() - { - delete serviceInstance; - } - - bool QServiceWrapper::isValid() const - { - return m_descriptor.isValid(); - } - - void QServiceWrapper::setInterfaceDesc(const QServiceInterfaceDescriptor &desc) - { - if (desc == m_descriptor) - return; - - m_descriptor = desc; - - if (serviceInstance) - delete serviceInstance; - - serviceInstance = 0; - } - - QServiceInterfaceDescriptor QServiceWrapper::interfaceDesc() const - { - return m_descriptor; - } - - void QServiceWrapper::setInterfaceName(const QString &interface) - { - m_descriptor = serviceManager->interfaceDefault(interface); - - if (!isValid()) - qWarning() << "WARNING: No default service found for interface name: " << interface; - } - - QString QServiceWrapper::interfaceName() const - { - if (isValid()) - return m_descriptor.interfaceName(); - else - return "No Interface"; - } - - QString QServiceWrapper::serviceName() const - { - if (isValid()) - return m_descriptor.serviceName(); - else - return "No Service"; - } - - QString QServiceWrapper::versionNumber() const - { - if (isValid()) - return (QString::number(m_descriptor.majorVersion())+"."+QString::number(m_descriptor.minorVersion())); - else - return "0.0"; - } - - QObject* QServiceWrapper::serviceObject() - { - if (serviceInstance) { - return serviceInstance; - } - - if (isValid()) { - QServiceManager manager; - serviceInstance = manager.loadInterface(m_descriptor); - return serviceInstance; - } else { - return 0; - } - } - - QServiceListWrapper::QServiceListWrapper() - { - serviceManager = new QServiceManager(); - } - - QServiceListWrapper::~QServiceListWrapper() - { - } - - void QServiceListWrapper::setInterfaceName(const QString &interface) - { - m_interface = interface; - - <span class="comment">// </span>![0] - QServiceWrapper *service; - QServiceFilter filter(m_interface, m_version); - QList<QServiceInterfaceDescriptor> list = serviceManager->findInterfaces(filter); - for (int i = 0; i < list.size(); i++) { - service = new QServiceWrapper(); - service->setInterfaceDesc(list.at(i)); - m_services.append(service); - } - <span class="comment">// </span>![0] - } - - QString QServiceListWrapper::interfaceName() const - { - return m_interface; - } - - void QServiceListWrapper::setMinVersion(const QString &version) - { - m_version = version; - } - - QString QServiceListWrapper::minVersion() const - { - return m_version; - } - - QDeclarativeListProperty<QServiceWrapper> QServiceListWrapper::services() - { - return QDeclarativeListProperty<QServiceWrapper>(this, m_services); - }</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/declarative-sfw-dialer-sfwexample-qdeclarativeservice-h.html b/doc/html/declarative-sfw-dialer-sfwexample-qdeclarativeservice-h.html deleted file mode 100644 index 0ccada60dd..0000000000 --- a/doc/html/declarative-sfw-dialer-sfwexample-qdeclarativeservice-h.html +++ /dev/null @@ -1,146 +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: qdeclarativeservice.h Example File (declarative-sfw-dialer/sfwexample/qdeclarativeservice.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">qdeclarativeservice.h Example File<br /><span class="small-subtitle">declarative-sfw-dialer/sfwexample/qdeclarativeservice.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:BSD$ - ** You may use this file under the terms of the BSD license as follows: - ** - ** "Redistribution and use in source and binary forms, with or without - ** modification, are permitted provided that the following conditions are - ** met: - ** * Redistributions of source code must retain the above copyright - ** notice, this list of conditions and the following disclaimer. - ** * Redistributions in binary form must reproduce the above copyright - ** notice, this list of conditions and the following disclaimer in - ** the documentation and/or other materials provided with the - ** distribution. - ** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor - ** the names of its contributors may be used to endorse or promote - ** products derived from this software without specific prior written - ** permission. - ** - ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - ** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - ** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - ** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - ** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - ** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - ** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - ** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." - ** $QT_END_LICENSE$ - ** - ***************************************************************************/</span> - - #ifndef QDECLARATIVESERVICE_H - #define QDECLARATIVESERVICE_H - - #include <QtCore> - #include <qserviceinterfacedescriptor.h> - #include <qservicemanager.h> - #include <qdeclarative.h> - #include <qdeclarativelist.h> - - QTM_USE_NAMESPACE - - Q_DECLARE_METATYPE(QServiceInterfaceDescriptor) - - class QServiceWrapper : public QObject { - Q_OBJECT - <span class="comment">// </span>![0] - Q_PROPERTY(QString interfaceName READ interfaceName WRITE setInterfaceName); - Q_PROPERTY(QString serviceName READ serviceName); - Q_PROPERTY(QString versionNumber READ versionNumber); - Q_PROPERTY(bool valid READ isValid NOTIFY validChanged); - Q_PROPERTY(QObject* serviceObject READ serviceObject NOTIFY serviceObjectChanged); - <span class="comment">// </span>![0] - - public: - QServiceWrapper(); - ~QServiceWrapper(); - - void setInterfaceDesc(const QServiceInterfaceDescriptor& desc); - QServiceInterfaceDescriptor interfaceDesc() const; - - void setInterfaceName(const QString& interface); - QString interfaceName() const; - QString serviceName() const; - QString versionNumber() const; - - bool isValid() const; - QObject* serviceObject(); - - Q_SIGNALS: - void validChanged(); - void serviceObjectChanged(); - - private: - QServiceManager* serviceManager; - - QServiceInterfaceDescriptor m_descriptor; - QObject* serviceInstance; - }; - - QML_DECLARE_TYPE(QServiceWrapper); - - class QServiceListWrapper : public QObject { - Q_OBJECT - <span class="comment">// </span>![1] - Q_PROPERTY(QString interfaceName READ interfaceName WRITE setInterfaceName); - Q_PROPERTY(QString minVersion READ minVersion WRITE setMinVersion); - Q_PROPERTY(QDeclarativeListProperty<QServiceWrapper> services READ services NOTIFY servicesChanged); - <span class="comment">// </span>![1] - - public: - QServiceListWrapper(); - ~QServiceListWrapper(); - - QDeclarativeListProperty<QServiceWrapper> services(); - - void setInterfaceName(const QString& interface); - QString interfaceName() const; - - void setMinVersion(const QString& interface); - QString minVersion() const; - - private: - QServiceManager* serviceManager; - QList<QServiceWrapper *> m_services; - QString m_interface; - QString m_version; - - Q_SIGNALS: - void servicesChanged(const QDeclarativeListProperty<QServiceWrapper>&); - }; - - QML_DECLARE_TYPE(QServiceListWrapper) - - #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</div></td> -</tr></table></div></address></body> -</html> diff --git a/doc/html/declarative-sfw-dialer-sfwexample-resource-qrc.html b/doc/html/declarative-sfw-dialer-sfwexample-resource-qrc.html deleted file mode 100644 index a6b5bf38e0..0000000000 --- a/doc/html/declarative-sfw-dialer-sfwexample-resource-qrc.html +++ /dev/null @@ -1,32 +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: resource.qrc Example File (declarative-sfw-dialer/sfwexample/resource.qrc)</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">resource.qrc Example File<br /><span class="small-subtitle">declarative-sfw-dialer/sfwexample/resource.qrc</span> -</h1> -<pre> <RCC> - <qresource prefix="/" > - <file>sfwexample.qml</file> - <file>content/DialScreen.qml</file> - <file>content/DialButton.qml</file> - <file>content/DialerList.qml</file> - <file>content/call.png</file> - <file>content/hangup.png</file> - </qresource> - </RCC></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/declarative-sfw-dialer-sfwexample-sfwexample-cpp.html b/doc/html/declarative-sfw-dialer-sfwexample-sfwexample-cpp.html deleted file mode 100644 index ce3f51dfdc..0000000000 --- a/doc/html/declarative-sfw-dialer-sfwexample-sfwexample-cpp.html +++ /dev/null @@ -1,93 +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: sfwexample.cpp Example File (declarative-sfw-dialer/sfwexample/sfwexample.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">sfwexample.cpp Example File<br /><span class="small-subtitle">declarative-sfw-dialer/sfwexample/sfwexample.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:BSD$ - ** You may use this file under the terms of the BSD license as follows: - ** - ** "Redistribution and use in source and binary forms, with or without - ** modification, are permitted provided that the following conditions are - ** met: - ** * Redistributions of source code must retain the above copyright - ** notice, this list of conditions and the following disclaimer. - ** * Redistributions in binary form must reproduce the above copyright - ** notice, this list of conditions and the following disclaimer in - ** the documentation and/or other materials provided with the - ** distribution. - ** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor - ** the names of its contributors may be used to endorse or promote - ** products derived from this software without specific prior written - ** permission. - ** - ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - ** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - ** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - ** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - ** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - ** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - ** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - ** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." - ** $QT_END_LICENSE$ - ** - ****************************************************************************/</span> - - #include "sfwexample.h" - - DialerServices::DialerServices() - { - serviceManager = new QServiceManager(); - - registerExampleServices(); - } - - DialerServices::~DialerServices() - { - unregisterExampleServices(); - } - - void DialerServices::registerExampleServices() - { - <span class="comment">// </span>![0] - QStringList exampleXmlFiles; - exampleXmlFiles << "landlinedialerservice.xml" << "voipdialerservice.xml"; - foreach (const QString &fileName, exampleXmlFiles) { - QString path = QCoreApplication::applicationDirPath() + "/xmldata/" + fileName; - serviceManager->addService(path); - } - <span class="comment">// </span>![0] - } - - void DialerServices::unregisterExampleServices() - { - serviceManager->removeService("LandlineDialer"); - serviceManager->removeService("VoipDialer"); - }</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/declarative-sfw-dialer-sfwexample-sfwexample-h.html b/doc/html/declarative-sfw-dialer-sfwexample-sfwexample-h.html deleted file mode 100644 index ed60e14e39..0000000000 --- a/doc/html/declarative-sfw-dialer-sfwexample-sfwexample-h.html +++ /dev/null @@ -1,86 +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: sfwexample.h Example File (declarative-sfw-dialer/sfwexample/sfwexample.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">sfwexample.h Example File<br /><span class="small-subtitle">declarative-sfw-dialer/sfwexample/sfwexample.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:BSD$ - ** You may use this file under the terms of the BSD license as follows: - ** - ** "Redistribution and use in source and binary forms, with or without - ** modification, are permitted provided that the following conditions are - ** met: - ** * Redistributions of source code must retain the above copyright - ** notice, this list of conditions and the following disclaimer. - ** * Redistributions in binary form must reproduce the above copyright - ** notice, this list of conditions and the following disclaimer in - ** the documentation and/or other materials provided with the - ** distribution. - ** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor - ** the names of its contributors may be used to endorse or promote - ** products derived from this software without specific prior written - ** permission. - ** - ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - ** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - ** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - ** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - ** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - ** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - ** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - ** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." - ** $QT_END_LICENSE$ - ** - ***************************************************************************/</span> - - #ifndef SFWEXAMPLE_H - #define SFWEXAMPLE_H - - #include <QtCore> - #include <qserviceinterfacedescriptor.h> - #include <qservicemanager.h> - - QTM_USE_NAMESPACE - - class DialerServices : public QObject { - Q_OBJECT - - public: - DialerServices(); - ~DialerServices(); - - private: - void registerExampleServices(); - void unregisterExampleServices(); - - QServiceManager* serviceManager; - }; - - #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</div></td> -</tr></table></div></address></body> -</html> diff --git a/doc/html/declarative-sfw-dialer-sfwexample-sfwexample-pro.html b/doc/html/declarative-sfw-dialer-sfwexample-sfwexample-pro.html deleted file mode 100644 index a5ee8942d8..0000000000 --- a/doc/html/declarative-sfw-dialer-sfwexample-sfwexample-pro.html +++ /dev/null @@ -1,44 +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: sfwexample.pro Example File (declarative-sfw-dialer/sfwexample/sfwexample.pro)</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">sfwexample.pro Example File<br /><span class="small-subtitle">declarative-sfw-dialer/sfwexample/sfwexample.pro</span> -</h1> -<pre> TEMPLATE = app - TARGET = declarative-sfw-dialer - INCLUDEPATH += ../../../src/serviceframework - - include(../../examples.pri) - - QT += gui declarative - - HEADERS += sfwexample.h \ - qdeclarativeservice.h - SOURCES += sfwexample.cpp \ - qdeclarativeservice.cpp \ - main.cpp - - CONFIG += mobility - MOBILITY = serviceframework - - RESOURCES += resource.qrc - - symbian { - TARGET.CAPABILITY = ALL -TCB - }</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/declarative-sfw-dialer-voipdialer-voipdialer-cpp.html b/doc/html/declarative-sfw-dialer-voipdialer-voipdialer-cpp.html index b2659aebaf..94014a3394 100644 --- a/doc/html/declarative-sfw-dialer-voipdialer-voipdialer-cpp.html +++ b/doc/html/declarative-sfw-dialer-voipdialer-voipdialer-cpp.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: voipdialer.cpp Example File (declarative-sfw-dialer/voipdialer/voipdialer.cpp)</title> + <title>Qt Mobility Project 1.1: voipdialer.cpp Example File (declarative-sfw-dialer/voipdialer/voipdialer.cpp)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,40 +15,41 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 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:BSD$ - ** You may use this file under the terms of the BSD license as follows: + ** $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. + ** + ** + ** + ** + ** + ** ** - ** "Redistribution and use in source and binary forms, with or without - ** modification, are permitted provided that the following conditions are - ** met: - ** * Redistributions of source code must retain the above copyright - ** notice, this list of conditions and the following disclaimer. - ** * Redistributions in binary form must reproduce the above copyright - ** notice, this list of conditions and the following disclaimer in - ** the documentation and/or other materials provided with the - ** distribution. - ** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor - ** the names of its contributors may be used to endorse or promote - ** products derived from this software without specific prior written - ** permission. ** - ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - ** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - ** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - ** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - ** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - ** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - ** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - ** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." ** $QT_END_LICENSE$ ** ****************************************************************************/</span> @@ -119,8 +120,8 @@ }</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/declarative-sfw-dialer-voipdialer-voipdialer-h.html b/doc/html/declarative-sfw-dialer-voipdialer-voipdialer-h.html index 9530b1be83..6f2f7e3657 100644 --- a/doc/html/declarative-sfw-dialer-voipdialer-voipdialer-h.html +++ b/doc/html/declarative-sfw-dialer-voipdialer-voipdialer-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: voipdialer.h Example File (declarative-sfw-dialer/voipdialer/voipdialer.h)</title> + <title>Qt Mobility Project 1.1: voipdialer.h Example File (declarative-sfw-dialer/voipdialer/voipdialer.h)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,40 +15,41 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 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:BSD$ - ** You may use this file under the terms of the BSD license as follows: + ** $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. + ** + ** + ** + ** + ** + ** ** - ** "Redistribution and use in source and binary forms, with or without - ** modification, are permitted provided that the following conditions are - ** met: - ** * Redistributions of source code must retain the above copyright - ** notice, this list of conditions and the following disclaimer. - ** * Redistributions in binary form must reproduce the above copyright - ** notice, this list of conditions and the following disclaimer in - ** the documentation and/or other materials provided with the - ** distribution. - ** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor - ** the names of its contributors may be used to endorse or promote - ** products derived from this software without specific prior written - ** permission. ** - ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - ** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - ** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - ** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - ** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - ** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - ** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - ** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." ** $QT_END_LICENSE$ ** ****************************************************************************/</span> @@ -95,8 +96,8 @@ #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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/declarative-sfw-dialer-voipdialer-voipdialer-pro.html b/doc/html/declarative-sfw-dialer-voipdialer-voipdialer-pro.html index 761c687b80..87025ff749 100644 --- a/doc/html/declarative-sfw-dialer-voipdialer-voipdialer-pro.html +++ b/doc/html/declarative-sfw-dialer-voipdialer-voipdialer-pro.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: voipdialer.pro Example File (declarative-sfw-dialer/voipdialer/voipdialer.pro)</title> + <title>Qt Mobility Project 1.1: voipdialer.pro Example File (declarative-sfw-dialer/voipdialer/voipdialer.pro)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -16,6 +16,8 @@ <pre> TEMPLATE = lib CONFIG += plugin INCLUDEPATH += ../../../src/serviceframework + PLUGIN_TYPE = serviceframework + HEADERS += voipdialer.h \ voipdialerplugin.h SOURCES += voipdialer.cpp \ @@ -32,15 +34,13 @@ TARGET.CAPABILITY = ALL -TCB } - xml.path = $$DESTDIR/xmldata + xml.path = $$QT_MOBILITY_PREFIX/bin/xmldata xml.files = voipdialerservice.xml - xml.CONFIG = no_link no_dependencies explicit_dependencies no_build combine ignore_no_exist no_clean - INSTALLS += xml - build_pass:ALL_DEPS+=install_xml</pre> + INSTALLS += xml</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/declarative-sfw-dialer-voipdialer-voipdialerplugin-cpp.html b/doc/html/declarative-sfw-dialer-voipdialer-voipdialerplugin-cpp.html index 68d6b68ed7..fc858cb8c3 100644 --- a/doc/html/declarative-sfw-dialer-voipdialer-voipdialerplugin-cpp.html +++ b/doc/html/declarative-sfw-dialer-voipdialer-voipdialerplugin-cpp.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: voipdialerplugin.cpp Example File (declarative-sfw-dialer/voipdialer/voipdialerplugin.cpp)</title> + <title>Qt Mobility Project 1.1: voipdialerplugin.cpp Example File (declarative-sfw-dialer/voipdialer/voipdialerplugin.cpp)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,40 +15,41 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 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:BSD$ - ** You may use this file under the terms of the BSD license as follows: + ** $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. + ** + ** + ** + ** + ** + ** ** - ** "Redistribution and use in source and binary forms, with or without - ** modification, are permitted provided that the following conditions are - ** met: - ** * Redistributions of source code must retain the above copyright - ** notice, this list of conditions and the following disclaimer. - ** * Redistributions in binary form must reproduce the above copyright - ** notice, this list of conditions and the following disclaimer in - ** the documentation and/or other materials provided with the - ** distribution. - ** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor - ** the names of its contributors may be used to endorse or promote - ** products derived from this software without specific prior written - ** permission. ** - ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - ** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - ** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - ** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - ** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - ** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - ** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - ** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." ** $QT_END_LICENSE$ ** ****************************************************************************/</span> @@ -71,8 +72,8 @@ Q_EXPORT_PLUGIN2(serviceframework_voipdialerservice, VoipDialerPlugin)</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/declarative-sfw-dialer-voipdialer-voipdialerplugin-h.html b/doc/html/declarative-sfw-dialer-voipdialer-voipdialerplugin-h.html index 7a350a6cfc..ed8d1e42ef 100644 --- a/doc/html/declarative-sfw-dialer-voipdialer-voipdialerplugin-h.html +++ b/doc/html/declarative-sfw-dialer-voipdialer-voipdialerplugin-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: voipdialerplugin.h Example File (declarative-sfw-dialer/voipdialer/voipdialerplugin.h)</title> + <title>Qt Mobility Project 1.1: voipdialerplugin.h Example File (declarative-sfw-dialer/voipdialer/voipdialerplugin.h)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,40 +15,41 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 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:BSD$ - ** You may use this file under the terms of the BSD license as follows: + ** $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. + ** + ** + ** + ** + ** + ** ** - ** "Redistribution and use in source and binary forms, with or without - ** modification, are permitted provided that the following conditions are - ** met: - ** * Redistributions of source code must retain the above copyright - ** notice, this list of conditions and the following disclaimer. - ** * Redistributions in binary form must reproduce the above copyright - ** notice, this list of conditions and the following disclaimer in - ** the documentation and/or other materials provided with the - ** distribution. - ** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor - ** the names of its contributors may be used to endorse or promote - ** products derived from this software without specific prior written - ** permission. ** - ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - ** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - ** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - ** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - ** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - ** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - ** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - ** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." ** $QT_END_LICENSE$ ** ****************************************************************************/</span> @@ -77,8 +78,8 @@ #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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/declarative-sfw-dialer.html b/doc/html/declarative-sfw-dialer.html index c192c162df..8d35480d83 100644 --- a/doc/html/declarative-sfw-dialer.html +++ b/doc/html/declarative-sfw-dialer.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- declarative-sfw-dialer.qdoc --> <head> - <title>Qt Mobility Project 1.0: Service Framework using QML Example</title> + <title>Qt Mobility Project 1.1: Service Framework using QML Example</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -20,19 +20,12 @@ <li><a href="declarative-sfw-dialer-landlinedialer-landlinedialer-h.html">declarative-sfw-dialer/landlinedialer/landlinedialer.h</a></li> <li><a href="declarative-sfw-dialer-landlinedialer-landlinedialerplugin-cpp.html">declarative-sfw-dialer/landlinedialer/landlinedialerplugin.cpp</a></li> <li><a href="declarative-sfw-dialer-landlinedialer-landlinedialerplugin-h.html">declarative-sfw-dialer/landlinedialer/landlinedialerplugin.h</a></li> -<li><a href="declarative-sfw-dialer-sfwexample-qdeclarativeservice-cpp.html">declarative-sfw-dialer/sfwexample/qdeclarativeservice.cpp</a></li> -<li><a href="declarative-sfw-dialer-sfwexample-qdeclarativeservice-h.html">declarative-sfw-dialer/sfwexample/qdeclarativeservice.h</a></li> -<li><a href="declarative-sfw-dialer-sfwexample-sfwexample-cpp.html">declarative-sfw-dialer/sfwexample/sfwexample.cpp</a></li> -<li><a href="declarative-sfw-dialer-sfwexample-sfwexample-h.html">declarative-sfw-dialer/sfwexample/sfwexample.h</a></li> <li><a href="declarative-sfw-dialer-voipdialer-voipdialer-cpp.html">declarative-sfw-dialer/voipdialer/voipdialer.cpp</a></li> <li><a href="declarative-sfw-dialer-voipdialer-voipdialer-h.html">declarative-sfw-dialer/voipdialer/voipdialer.h</a></li> <li><a href="declarative-sfw-dialer-voipdialer-voipdialerplugin-cpp.html">declarative-sfw-dialer/voipdialer/voipdialerplugin.cpp</a></li> <li><a href="declarative-sfw-dialer-voipdialer-voipdialerplugin-h.html">declarative-sfw-dialer/voipdialer/voipdialerplugin.h</a></li> -<li><a href="declarative-sfw-dialer-sfwexample-main-cpp.html">declarative-sfw-dialer/sfwexample/main.cpp</a></li> <li><a href="declarative-sfw-dialer-declarative-sfw-dialer-pro.html">declarative-sfw-dialer/declarative-sfw-dialer.pro</a></li> <li><a href="declarative-sfw-dialer-landlinedialer-landlinedialer-pro.html">declarative-sfw-dialer/landlinedialer/landlinedialer.pro</a></li> -<li><a href="declarative-sfw-dialer-sfwexample-resource-qrc.html">declarative-sfw-dialer/sfwexample/resource.qrc</a></li> -<li><a href="declarative-sfw-dialer-sfwexample-sfwexample-pro.html">declarative-sfw-dialer/sfwexample/sfwexample.pro</a></li> <li><a href="declarative-sfw-dialer-voipdialer-voipdialer-pro.html">declarative-sfw-dialer/voipdialer/voipdialer.pro</a></li> </ul> <p><b>Explanation:</b></p> @@ -47,31 +40,19 @@ <li>Include the QML canvas to be displayed</li> </ol> <p>Step is shown below:</p> -<pre><span class="comment"> //Includes for using the declarative viewer</span> - #include <QDeclarativeView> - -<span class="comment"> //Includes for using the service framework wrapper</span> - #include "qdeclarativeservice.h"</pre> +<pre></pre> <p>Now to make our service framework wrappers known to QML as registered types we need the following inline method:</p> -<pre> qmlRegisterType<QServiceWrapper>("QtMobility.serviceframework", 1, 0, "Service"); - qmlRegisterType<QServiceListWrapper>("QtMobility.serviceframework", 1, 0, "ServiceList");</pre> +<pre></pre> <p>This allows us to import our new types in QML by:</p> -<pre> import QtMobility.serviceframework 1.0</pre> +<pre></pre> <p>We are using QDeclarativeView to load and show our QML content</p> -<pre> QDeclarativeView canvas; - canvas.setSource(QUrl("qrc:/sfwexample.qml")); - canvas.show();</pre> +<pre></pre> <p><b>The Services:</b></p> <p>The services are implemented in a shared library and can be register in the service framework. After the service is registered it can be used in different applications. In our case we'll access the services over an application that is based on QML scripting. We will be able to change between different services and call their properties, receiving their signals and so forth.</p> <p>In this example we've implemented 2 services called Landdialer and Voipdialer. You can find the projects for those services in:</p> <p>declarative-sfw-dialer\landlinedialer and declarative-sfw-dialer\voipdialer. Those projects will create a shared library in each case.</p> <p>If the library needs to be available over the Service Framework, we need to register the library. You can do this by using the <a href="qservicemanager.html">QServiceManager</a> function addService(...). In our example this will be done in the function registerExampleServices in the registration class accompanying the main function:</p> -<pre> QStringList exampleXmlFiles; - exampleXmlFiles << "landlinedialerservice.xml" << "voipdialerservice.xml"; - foreach (const QString &fileName, exampleXmlFiles) { - QString path = QCoreApplication::applicationDirPath() + "/xmldata/" + fileName; - serviceManager->addService(path); - }</pre> +<pre></pre> <p>As you can see we register the services using a xml file. This xml file basically contains all information to register the shared library in the Service Framework enviroment. For more information please read more about the Qt Service Framework <a href="service-frameworks.html#adding-and-removing-of-services">XML Format</a></p> <p>The <a href="qservicemanager.html">QServiceManager</a> creates an instance of a services over a <a href="qserviceplugininterface.html">QServicePluginInterface</a>. For each services we provide a Plugin.</p> <pre> class VoipDialerPlugin : public QObject, @@ -110,186 +91,38 @@ void stateChanged();</pre> <p><b>The ServiceWrapper:</b></p> <p>The ServiceWarpper is our object that is accessible in the QML script. Over the ServiceWrapper we can access several service details by calling the properties of the wrapper.</p> -<pre> Q_PROPERTY(QString interfaceName READ interfaceName WRITE setInterfaceName); - Q_PROPERTY(QString serviceName READ serviceName); - Q_PROPERTY(QString versionNumber READ versionNumber); - Q_PROPERTY(bool valid READ isValid NOTIFY validChanged); - Q_PROPERTY(QObject* serviceObject READ serviceObject NOTIFY serviceObjectChanged);</pre> +<pre></pre> <p>Additionally, there is a <a href="http://qt.nokia.com/doc/4.6/qlist.html">QList</a> of ServiceWrapper objects that is also available through QML which can be used to obtain a list of services and their details by supplying an interface with an optional minimum version number. QML can gain access to these details including the list using the QML-specific QDeclarativeListProperty with the following properties.</p> -<pre> Q_PROPERTY(QString interfaceName READ interfaceName WRITE setInterfaceName); - Q_PROPERTY(QString minVersion READ minVersion WRITE setMinVersion); - Q_PROPERTY(QDeclarativeListProperty<QServiceWrapper> services READ services NOTIFY servicesChanged);</pre> +<pre></pre> <p>The ServiceWrapperList contains a list of all available services that contain the com.nokia.qt.examples.Dialer interface. In the setInterfaceName(..) function which is QML accessible, a <a href="http://qt.nokia.com/doc/4.6/qlist.html">QList</a> of ServiceWrapper objects is populated for the dialer services (LandLineDialer and VoipDaler). Each ServiceWrapper object containts the <a href="qserviceinterfacedescriptor.html">QServiceInterfaceDescriptor</a> and properties which allow QML to access the service library functions. This is done by utilising the code below:</p> -<pre> QServiceWrapper *service; - QServiceFilter filter(m_interface, m_version); - QList<QServiceInterfaceDescriptor> list = serviceManager->findInterfaces(filter); - for (int i = 0; i < list.size(); i++) { - service = new QServiceWrapper(); - service->setInterfaceDesc(list.at(i)); - m_services.append(service); - }</pre> +<pre></pre> <p>QML context requires a special declarative list when declaring the property, in this case the property services will provide QML with the list of ServiceWrappers which can call serviceObject(..) to reference the service library functions.</p> <p><b>Service access on the QML site</b></p> <p>The QML elements are implemented in 4 different qml scripting files <a href="#guidesign"> see GUI design</a>.</p> <p>The first step is to use our ServiceWrapperList to specify the interface and minimum version (optional) through QML item context, which will produce a list of ServiceWrapper objects.</p> -<pre> ServiceList { - id: dialerServiceList - interfaceName: "com.nokia.qt.examples.Dialer" - minVersion: "1.0" - }</pre> +<pre></pre> <p>In the DialerList.qml file the services property is assigned to the ListView model property.</p> -<pre> ListView { - id: serviceListView - height: 100 - width: 260 - anchors.topMargin: 5 - anchors.leftMargin: 5 - anchors.rightMargin: 5 - model: dialerServiceList.services - opacity: 1 - delegate: delegate - currentIndex: -1 - clip: true - }</pre> +<pre></pre> <p>To show the items of the model property we need to create a delegate component and assign it to the ListView Delegate property:</p> -<pre> Component { - id: delegate</pre> +<pre></pre> <p>In this component you can define how you want to draw one ListView item. You can acces insite of this component the current ListWiew item by using the variable modelData. In our example we are using two text lines. Furthermore we can define whats happening if we click on a ListView item by using the MouseRegion.</p> -<a name="dialerlist-qml-2"></a><pre> MouseArea { - id: listItemMouseRegion - anchors.fill: parent - onClicked: { - if(listFrame.nohighlightlistitem){ - serviceListView.highlight = highlight - listFrame.nohighlightlistitem = false; - } - serviceListView.currentIndex = index; - dialService = model.modelData; - signalSelected() - } - } - - Text { - id: serviceItemInfo - anchors.top: parent.top - anchors.left: parent.left - anchors.topMargin: 5 - anchors.leftMargin: 3 - text: " <b>Service:</b> " + serviceName + " (" + versionNumber + ")" - } - - Text { - id: serviceItemInterfaceName - anchors.top: serviceItemInfo.bottom - anchors.left: parent.left - anchors.topMargin: 2 - anchors.leftMargin: 3 - text: " <b>Interface:</b> " + interfaceName; - }</pre> +<a name="dialerlist-qml-2"></a><pre></pre> <p>Another component can be created for highliting a list item:</p> -<pre> Component { - id: highlight - - Rectangle { - width: childrenRect.width - border.color: "black"; border.width: 2 - height: 30 - color : "lightsteelblue" - gradient: Gradient { - GradientStop {position: 0.0; color: "steelblue"} - GradientStop {position: 0.5; color: "lightsteelblue"} - GradientStop {position: 1.0; color: "steelblue"} - } - } - }</pre> +<pre></pre> <p><b>Service signals and function calls on the QML site</b></p> <p>In sfw-kinetic-example.qml we define a control named DialScreen and implement the function onDial and onHangup. As you can see in the onDial event we call the service function dialNumber and the onHangup calls hangup. Both function are implemented in the service <a href="#voipdialer-h-0"> (see voipdialer header file).</a></p> -<pre> DialScreen { - id: dialScreen - property bool activeCall : false - property var currentDialer: 0; - anchors.topMargin: 5 - anchors.leftMargin: 5 - anchors.rightMargin: 5 - anchors.right: parent.right - anchors.top: parent.top - onDial: { - if (activeCall == false) { - if (dialerList.dialService != 0) { - var o = dialerObject; - status.text = "Dialing " + numberToDial +"..."; - dialScreen.currentDialer = o; - o.dialNumber(numberToDial); - activeCall = true; - } - } - } - onHangup: { - if (activeCall) { - if (dialScreen.currentDialer != 0) { - dialScreen.currentDialer.hangup(); - } - status.text = "Hang up"; - } - } - }</pre> +<pre></pre> <p>In DialScreen.qml the dial and the hangup signals are defined. The hangup signal will be emited if the HangUpButton was clicked:</p> -<pre> DialButton { - id: hangUpButton - height: { (numberPad.height / 2) - 2 } - width: 50 - anchors.top: numberPad.top - anchors.left: numberPad.right - anchors.leftMargin: 5 - hoverColor: "red" - color: "crimson" - onClicked: { - dialString = "" - hangup() - }</pre> +<pre></pre> <p>The dial signal will be emited if the CallButton was clicked:</p> -<pre> DialButton { - id: callButton - width: 50 - height: {(numberPad.height/2) -2} - anchors.top: hangUpButton.bottom - anchors.left: numberPad.right - anchors.leftMargin: 5 - anchors.topMargin: 4 - color: "mediumseagreen" - hoverColor: "lightgreen" - onClicked: { - if (dialString != "") { - dial(dialString) - dialString = "" - } - }</pre> +<pre></pre> <p>Now we need to connect the stateChanged signal form the services with an event handler on the QML site. This is done in our main declarative file:</p> -<pre> Connections { - target: dialerObject - - onStateChanged: { - if (dialScreen.currentDialer.state == 1) { - status.text += "\nRinging"; - } - else if (dialScreen.currentDialer.state == 2) { - status.text += "\nConnected"; - } - else if (dialScreen.currentDialer.state == 0) { - status.text += "\nConnection terminated"; - dialScreen.activeCall = false; - clearStatusTimer.running = true; - } - else if (dialScreen.currentDialer.state == 3) { - status.text += "\nPhone already engaged"; - } - } - }</pre> +<pre></pre> <p>The DialScreen.currentDialer is assigned during a ListView item click in the <a href="#dialerlist-qml-2"> ServiceList.qml file</a>.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/declarative-sfw-notes-declarative-sfw-notes-pro.html b/doc/html/declarative-sfw-notes-declarative-sfw-notes-pro.html deleted file mode 100644 index 6e541f8044..0000000000 --- a/doc/html/declarative-sfw-notes-declarative-sfw-notes-pro.html +++ /dev/null @@ -1,42 +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: declarative-sfw-notes.pro Example File (declarative-sfw-notes/declarative-sfw-notes.pro)</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">declarative-sfw-notes.pro Example File<br /><span class="small-subtitle">declarative-sfw-notes/declarative-sfw-notes.pro</span> -</h1> -<pre> TEMPLATE = app - TARGET = declarative-sfw-notes - INCLUDEPATH += ../../src/serviceframework - - include(../examples.pri) - - QT += declarative - - HEADERS += sfwnotes.h \ - qdeclarativeservice.h - SOURCES += sfwnotes.cpp \ - qdeclarativeservice.cpp \ - main.cpp - - CONFIG += mobility - MOBILITY = serviceframework - - RESOURCES += sfwnotes.qrc - - OTHER_FILES = declarative-sfw-notes.qml</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/declarative-sfw-notes-main-cpp.html b/doc/html/declarative-sfw-notes-main-cpp.html deleted file mode 100644 index 0b719ecd92..0000000000 --- a/doc/html/declarative-sfw-notes-main-cpp.html +++ /dev/null @@ -1,86 +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: main.cpp Example File (declarative-sfw-notes/main.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">main.cpp Example File<br /><span class="small-subtitle">declarative-sfw-notes/main.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:BSD$ - ** You may use this file under the terms of the BSD license as follows: - ** - ** "Redistribution and use in source and binary forms, with or without - ** modification, are permitted provided that the following conditions are - ** met: - ** * Redistributions of source code must retain the above copyright - ** notice, this list of conditions and the following disclaimer. - ** * Redistributions in binary form must reproduce the above copyright - ** notice, this list of conditions and the following disclaimer in - ** the documentation and/or other materials provided with the - ** distribution. - ** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor - ** the names of its contributors may be used to endorse or promote - ** products derived from this software without specific prior written - ** permission. - ** - ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - ** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - ** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - ** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - ** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - ** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - ** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - ** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." - ** $QT_END_LICENSE$ - ** - ****************************************************************************/</span> - - #include <QApplication> - #include <QUrl> - #include <QtCore> - - #include <QDeclarativeView> - #include <qdeclarative.h> - - #include "sfwnotes.h" - #include "qdeclarativeservice.h" - - int main(int argc, char* argv[]) - { - qmlRegisterType<QServiceWrapper>("QtMobility.serviceframework", 1, 0, "Service"); - - QApplication app(argc, argv); - - ToDoTool *td = new ToDoTool(); - - QDeclarativeView canvas; - canvas.setSource(QUrl("qrc:/declarative-sfw-notes.qml")); - canvas.show(); - - return app.exec(); - }</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/declarative-sfw-notes-qdeclarativeservice-cpp.html b/doc/html/declarative-sfw-notes-qdeclarativeservice-cpp.html deleted file mode 100644 index 181da4ae6c..0000000000 --- a/doc/html/declarative-sfw-notes-qdeclarativeservice-cpp.html +++ /dev/null @@ -1,187 +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: qdeclarativeservice.cpp Example File (declarative-sfw-notes/qdeclarativeservice.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">qdeclarativeservice.cpp Example File<br /><span class="small-subtitle">declarative-sfw-notes/qdeclarativeservice.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:BSD$ - ** You may use this file under the terms of the BSD license as follows: - ** - ** "Redistribution and use in source and binary forms, with or without - ** modification, are permitted provided that the following conditions are - ** met: - ** * Redistributions of source code must retain the above copyright - ** notice, this list of conditions and the following disclaimer. - ** * Redistributions in binary form must reproduce the above copyright - ** notice, this list of conditions and the following disclaimer in - ** the documentation and/or other materials provided with the - ** distribution. - ** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor - ** the names of its contributors may be used to endorse or promote - ** products derived from this software without specific prior written - ** permission. - ** - ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - ** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - ** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - ** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - ** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - ** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - ** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - ** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." - ** $QT_END_LICENSE$ - ** - ****************************************************************************/</span> - - #include "qdeclarativeservice.h" - - QServiceWrapper::QServiceWrapper() - : serviceInstance(0) - { - serviceManager = new QServiceManager(); - } - - QServiceWrapper::~QServiceWrapper() - { - delete serviceInstance; - } - - bool QServiceWrapper::isValid() const - { - return m_descriptor.isValid(); - } - - void QServiceWrapper::setInterfaceDesc(const QServiceInterfaceDescriptor &desc) - { - if (desc == m_descriptor) - return; - - m_descriptor = desc; - - if (serviceInstance) - delete serviceInstance; - - serviceInstance = 0; - } - - QServiceInterfaceDescriptor QServiceWrapper::interfaceDesc() const - { - return m_descriptor; - } - - void QServiceWrapper::setInterfaceName(const QString &interface) - { - m_descriptor = serviceManager->interfaceDefault(interface); - - if (!isValid()) - qWarning() << "WARNING: No default service found for interface name: " << interface; - } - - QString QServiceWrapper::interfaceName() const - { - if (isValid()) - return m_descriptor.interfaceName(); - else - return "No Interface"; - } - - QString QServiceWrapper::serviceName() const - { - if (isValid()) - return m_descriptor.serviceName(); - else - return "No Service"; - } - - QString QServiceWrapper::versionNumber() const - { - if (isValid()) - return (QString::number(m_descriptor.majorVersion())+"."+QString::number(m_descriptor.minorVersion())); - else - return "0.0"; - } - - QObject* QServiceWrapper::serviceObject() - { - if (serviceInstance) { - return serviceInstance; - } - - if (isValid()) { - QServiceManager manager; - serviceInstance = manager.loadInterface(m_descriptor); - return serviceInstance; - } else { - return 0; - } - } - - QServiceListWrapper::QServiceListWrapper() - { - serviceManager = new QServiceManager(); - } - - QServiceListWrapper::~QServiceListWrapper() - { - } - - void QServiceListWrapper::setInterfaceName(const QString &interface) - { - m_interface = interface; - - QServiceWrapper *service; - QServiceFilter filter(m_interface, m_version); - QList<QServiceInterfaceDescriptor> list = serviceManager->findInterfaces(filter); - for (int i = 0; i < list.size(); i++) { - service = new QServiceWrapper(); - service->setInterfaceDesc(list.at(i)); - m_services.append(service); - } - } - - QString QServiceListWrapper::interfaceName() const - { - return m_interface; - } - - void QServiceListWrapper::setMinVersion(const QString &version) - { - m_version = version; - } - - QString QServiceListWrapper::minVersion() const - { - return m_version; - } - - QDeclarativeListProperty<QServiceWrapper> QServiceListWrapper::services() - { - return QDeclarativeListProperty<QServiceWrapper>(this, m_services); - }</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/declarative-sfw-notes-qdeclarativeservice-h.html b/doc/html/declarative-sfw-notes-qdeclarativeservice-h.html deleted file mode 100644 index 3edc036f23..0000000000 --- a/doc/html/declarative-sfw-notes-qdeclarativeservice-h.html +++ /dev/null @@ -1,142 +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: qdeclarativeservice.h Example File (declarative-sfw-notes/qdeclarativeservice.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">qdeclarativeservice.h Example File<br /><span class="small-subtitle">declarative-sfw-notes/qdeclarativeservice.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:BSD$ - ** You may use this file under the terms of the BSD license as follows: - ** - ** "Redistribution and use in source and binary forms, with or without - ** modification, are permitted provided that the following conditions are - ** met: - ** * Redistributions of source code must retain the above copyright - ** notice, this list of conditions and the following disclaimer. - ** * Redistributions in binary form must reproduce the above copyright - ** notice, this list of conditions and the following disclaimer in - ** the documentation and/or other materials provided with the - ** distribution. - ** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor - ** the names of its contributors may be used to endorse or promote - ** products derived from this software without specific prior written - ** permission. - ** - ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - ** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - ** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - ** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - ** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - ** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - ** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - ** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." - ** $QT_END_LICENSE$ - ** - ***************************************************************************/</span> - - #ifndef QDECLARATIVESERVICE_H - #define QDECLARATIVESERVICE_H - - #include <QtCore> - #include <qserviceinterfacedescriptor.h> - #include <qservicemanager.h> - #include <qdeclarative.h> - #include <qdeclarativelist.h> - - QTM_USE_NAMESPACE - - Q_DECLARE_METATYPE(QServiceInterfaceDescriptor) - - class QServiceWrapper : public QObject { - Q_OBJECT - Q_PROPERTY(QString interfaceName READ interfaceName WRITE setInterfaceName); - Q_PROPERTY(QString serviceName READ serviceName); - Q_PROPERTY(QString versionNumber READ versionNumber); - Q_PROPERTY(bool valid READ isValid NOTIFY validChanged); - Q_PROPERTY(QObject* serviceObject READ serviceObject NOTIFY serviceObjectChanged); - - public: - QServiceWrapper(); - ~QServiceWrapper(); - - void setInterfaceDesc(const QServiceInterfaceDescriptor& desc); - QServiceInterfaceDescriptor interfaceDesc() const; - - void setInterfaceName(const QString& interface); - QString interfaceName() const; - QString serviceName() const; - QString versionNumber() const; - - bool isValid() const; - QObject* serviceObject(); - - Q_SIGNALS: - void validChanged(); - void serviceObjectChanged(); - - private: - QServiceManager* serviceManager; - - QServiceInterfaceDescriptor m_descriptor; - QObject* serviceInstance; - }; - - QML_DECLARE_TYPE(QServiceWrapper); - - class QServiceListWrapper : public QObject { - Q_OBJECT - Q_PROPERTY(QString interfaceName READ interfaceName WRITE setInterfaceName); - Q_PROPERTY(QString minVersion READ minVersion WRITE setMinVersion); - Q_PROPERTY(QDeclarativeListProperty<QServiceWrapper> services READ services NOTIFY servicesChanged); - - public: - QServiceListWrapper(); - ~QServiceListWrapper(); - - QDeclarativeListProperty<QServiceWrapper> services(); - - void setInterfaceName(const QString& interface); - QString interfaceName() const; - - void setMinVersion(const QString& interface); - QString minVersion() const; - - private: - QServiceManager* serviceManager; - QList<QServiceWrapper *> m_services; - QString m_interface; - QString m_version; - - Q_SIGNALS: - void servicesChanged(const QDeclarativeListProperty<QServiceWrapper>&); - }; - - QML_DECLARE_TYPE(QServiceListWrapper) - - #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</div></td> -</tr></table></div></address></body> -</html> diff --git a/doc/html/declarative-sfw-notes-sfwnotes-cpp.html b/doc/html/declarative-sfw-notes-sfwnotes-cpp.html deleted file mode 100644 index 9413806fa6..0000000000 --- a/doc/html/declarative-sfw-notes-sfwnotes-cpp.html +++ /dev/null @@ -1,90 +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: sfwnotes.cpp Example File (declarative-sfw-notes/sfwnotes.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">sfwnotes.cpp Example File<br /><span class="small-subtitle">declarative-sfw-notes/sfwnotes.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:BSD$ - ** You may use this file under the terms of the BSD license as follows: - ** - ** "Redistribution and use in source and binary forms, with or without - ** modification, are permitted provided that the following conditions are - ** met: - ** * Redistributions of source code must retain the above copyright - ** notice, this list of conditions and the following disclaimer. - ** * Redistributions in binary form must reproduce the above copyright - ** notice, this list of conditions and the following disclaimer in - ** the documentation and/or other materials provided with the - ** distribution. - ** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor - ** the names of its contributors may be used to endorse or promote - ** products derived from this software without specific prior written - ** permission. - ** - ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - ** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - ** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - ** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - ** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - ** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - ** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - ** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." - ** $QT_END_LICENSE$ - ** - ****************************************************************************/</span> - - #include "sfwnotes.h" - - ToDoTool::ToDoTool() - { - serviceManager = new QServiceManager(); - - registerExampleServices(); - } - - ToDoTool::~ToDoTool() - { - unregisterExampleServices(); - } - - void ToDoTool::registerExampleServices() - { - QStringList exampleXmlFiles; - exampleXmlFiles << "notesmanagerservice.xml"; - foreach (const QString &fileName, exampleXmlFiles) { - QString path = QCoreApplication::applicationDirPath() + "/xmldata/" + fileName; - serviceManager->addService(path); - } - } - - void ToDoTool::unregisterExampleServices() - { - serviceManager->removeService("NotesManagerService"); - }</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/declarative-sfw-notes-sfwnotes-h.html b/doc/html/declarative-sfw-notes-sfwnotes-h.html deleted file mode 100644 index 7f5773bce8..0000000000 --- a/doc/html/declarative-sfw-notes-sfwnotes-h.html +++ /dev/null @@ -1,86 +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: sfwnotes.h Example File (declarative-sfw-notes/sfwnotes.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">sfwnotes.h Example File<br /><span class="small-subtitle">declarative-sfw-notes/sfwnotes.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:BSD$ - ** You may use this file under the terms of the BSD license as follows: - ** - ** "Redistribution and use in source and binary forms, with or without - ** modification, are permitted provided that the following conditions are - ** met: - ** * Redistributions of source code must retain the above copyright - ** notice, this list of conditions and the following disclaimer. - ** * Redistributions in binary form must reproduce the above copyright - ** notice, this list of conditions and the following disclaimer in - ** the documentation and/or other materials provided with the - ** distribution. - ** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor - ** the names of its contributors may be used to endorse or promote - ** products derived from this software without specific prior written - ** permission. - ** - ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - ** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - ** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - ** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - ** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - ** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - ** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - ** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." - ** $QT_END_LICENSE$ - ** - ***************************************************************************/</span> - - #ifndef SFWNOTES_H - #define SFWNOTES_H - - #include <QtCore> - #include <qserviceinterfacedescriptor.h> - #include <qservicemanager.h> - - QTM_USE_NAMESPACE - - class ToDoTool : public QObject { - Q_OBJECT - - public: - ToDoTool(); - ~ToDoTool(); - - private: - void registerExampleServices(); - void unregisterExampleServices(); - - QServiceManager* serviceManager; - }; - - #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</div></td> -</tr></table></div></address></body> -</html> diff --git a/doc/html/declarative-sfw-notes-sfwnotes-qrc.html b/doc/html/declarative-sfw-notes-sfwnotes-qrc.html deleted file mode 100644 index 86d757f10c..0000000000 --- a/doc/html/declarative-sfw-notes-sfwnotes-qrc.html +++ /dev/null @@ -1,35 +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: sfwnotes.qrc Example File (declarative-sfw-notes/sfwnotes.qrc)</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">sfwnotes.qrc Example File<br /><span class="small-subtitle">declarative-sfw-notes/sfwnotes.qrc</span> -</h1> -<pre> <RCC> - <qresource prefix="/" > - <file>declarative-sfw-notes.qml</file> - <file>content/Button.qml</file> - <file>content/Dialog.qml</file> - <file>content/InputDialog.qml</file> - <file>content/icons/addIcon.png</file> - <file>content/icons/deleteIcon.png</file> - <file>content/icons/searchIcon.png</file> - <file>content/icons/nextIcon.png</file> - <file>content/icons/prevIcon.png</file> - </qresource> - </RCC></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/declarative-sfw-notes.html b/doc/html/declarative-sfw-notes.html index 818dc697af..2195cfa211 100644 --- a/doc/html/declarative-sfw-notes.html +++ b/doc/html/declarative-sfw-notes.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- declarative-sfw-notes.qdoc --> <head> - <title>Qt Mobility Project 1.0: Declarative Service Framework Notes Manager</title> + <title>Qt Mobility Project 1.1: Declarative Service Framework Notes Manager</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -14,16 +14,6 @@ <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">Declarative Service Framework Notes Manager<br /><span class="subtitle"></span> </h1> -<p>Files:</p> -<ul> -<li><a href="declarative-sfw-notes-qdeclarativeservice-cpp.html">declarative-sfw-notes/qdeclarativeservice.cpp</a></li> -<li><a href="declarative-sfw-notes-qdeclarativeservice-h.html">declarative-sfw-notes/qdeclarativeservice.h</a></li> -<li><a href="declarative-sfw-notes-sfwnotes-cpp.html">declarative-sfw-notes/sfwnotes.cpp</a></li> -<li><a href="declarative-sfw-notes-sfwnotes-h.html">declarative-sfw-notes/sfwnotes.h</a></li> -<li><a href="declarative-sfw-notes-main-cpp.html">declarative-sfw-notes/main.cpp</a></li> -<li><a href="declarative-sfw-notes-declarative-sfw-notes-pro.html">declarative-sfw-notes/declarative-sfw-notes.pro</a></li> -<li><a href="declarative-sfw-notes-sfwnotes-qrc.html">declarative-sfw-notes/sfwnotes.qrc</a></li> -</ul> <p>This example demonstrates how to use the <a href="notesmanagerplugin.html">Notes Manager service plugin</a> to implement a notes managing application with QML as the declarative user-interface. There is also a non-QML counterpart which demonstrates an identical application using standard Qt user-interface tool. See <a href="sfw-notes.html">Service Framework Notes Manager</a> for more details.</p> <p><b>Explanation</b></p> <p>In general, QML requires external types and registrations to be provided via a plugin-based system, which the service framework does not currently provide. Instead, we have a wrapper class which provides access to the <a href="qservicemanager.html">QServiceManager</a> and <a href="qserviceinterfacedescriptor.html">QServiceInterfaceDescriptor</a> API that needs to be included in the project and declared in the main funciton of the application. The wrapper is referred to as QDeclarativeService.</p> @@ -39,7 +29,7 @@ interfaceName: "com.nokia.qt.examples.NotesManager" }</pre> <p>In most cases we will need the service to be avaiable to all parts of the QML file, meaning the actual <a href="http://qt.nokia.com/doc/4.6/qobject.html">QObject</a> returned from the service wrapper needs to be a global property.</p> -<pre> property var notesManager: notesService.serviceObject</pre> +<pre> property variant notesManager: notesService.serviceObject</pre> <p>The interfaceName property of the Service item has READ and WRITE methods which can be used to obtain a new service instance and check if there was a valid default service.</p> <pre> notesService.interfaceName = input; @@ -59,8 +49,8 @@ }</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/editions.html b/doc/html/editions.html index f14cfa27b4..00c00f0446 100644 --- a/doc/html/editions.html +++ b/doc/html/editions.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- editions.qdoc --> <head> - <title>Qt Mobility Project 1.0: Qt Editions</title> + <title>Qt Mobility Project 1.1: Qt Editions</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -23,8 +23,8 @@ <p>On the Qt web site, you can find a <a href="http://qt.nokia.com/doc/4.6/http-qt-nokia-com-products-licensing.html">Qt Licensing Overview</a> and information on <a href="http://qt.nokia.com/doc/4.6/http-qt-nokia-com-products-pricing.html">Qt License Pricing</a> for commercial editions of Qt and other Qt-related products.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/examples.html b/doc/html/examples.html index a9d2ff0942..fc038d98d9 100644 --- a/doc/html/examples.html +++ b/doc/html/examples.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- examples.qdoc --> <head> - <title>Qt Mobility Project 1.0: Qt Mobility Examples</title> + <title>Qt Mobility Project 1.1: Qt Mobility Examples</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -72,8 +72,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 b37f9b44f6..2b02e57056 100644 --- a/doc/html/fetchgooglemaps-fetchgooglemaps-pro.html +++ b/doc/html/fetchgooglemaps-fetchgooglemaps-pro.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: fetchgooglemaps.pro Example File (fetchgooglemaps/fetchgooglemaps.pro)</title> + <title>Qt Mobility Project 1.1: fetchgooglemaps.pro Example File (fetchgooglemaps/fetchgooglemaps.pro)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -30,25 +30,29 @@ include(../examples.pri) CONFIG += mobility - MOBILITY = location - !maemo5:MOBILITY += bearer + MOBILITY = location bearer - symbian: { - addFiles.sources = nmealog.txt - DEPLOYMENT += addFiles - - TARGET.CAPABILITY = Location NetworkServices + symbian|wince* { + symbian { + addFiles.sources = nmealog.txt + DEPLOYMENT += addFiles + TARGET.CAPABILITY += Location \ + NetworkServices + } + wince* { + addFiles.sources = ./nmealog.txt + addFiles.path = . + DEPLOYMENT += addFiles + } } else { - logfile.path = $$DESTDIR + logfile.path = $$QT_MOBILITY_PREFIX/bin 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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 ab819ef949..f260965809 100644 --- a/doc/html/fetchgooglemaps-main-cpp.html +++ b/doc/html/fetchgooglemaps-main-cpp.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: main.cpp Example File (fetchgooglemaps/main.cpp)</title> + <title>Qt Mobility Project 1.1: main.cpp Example File (fetchgooglemaps/main.cpp)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -69,8 +69,8 @@ }</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 2b481ab711..dc31a02b13 100644 --- a/doc/html/fetchgooglemaps-mapwindow-cpp.html +++ b/doc/html/fetchgooglemaps-mapwindow-cpp.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: mapwindow.cpp Example File (fetchgooglemaps/mapwindow.cpp)</title> + <title>Qt Mobility Project 1.1: mapwindow.cpp Example File (fetchgooglemaps/mapwindow.cpp)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -59,10 +59,8 @@ #include <qgeopositioninfosource.h> #include <qnmeapositioninfosource.h> #include <qgeosatelliteinfosource.h> - #ifndef Q_WS_MAEMO_5 #include <qnetworksession.h> #include <qnetworkconfigmanager.h> - #endif #include "satellitedialog.h" @@ -150,9 +148,7 @@ MapWindow::~MapWindow() { location->stopUpdates(); - #ifndef Q_WS_MAEMO_5 session->close(); - #endif } void MapWindow::delayedInit() @@ -165,7 +161,6 @@ location->stopUpdates(); } - #ifndef Q_WS_MAEMO_5 <span class="comment">// Set Internet Access Point</span> QNetworkConfigurationManager manager; const bool canStartIAP = (manager.capabilities() @@ -181,7 +176,6 @@ session = new QTM_PREPEND_NAMESPACE(QNetworkSession)(cfg, this); session->open(); session->waitForOpened(-1); - #endif connect(location, SIGNAL(updateTimeout()), this, SLOT(waitForFix())); location->startUpdates(); @@ -269,8 +263,8 @@ }</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 6f534462ab..b84b3ff3d9 100644 --- a/doc/html/fetchgooglemaps-mapwindow-h.html +++ b/doc/html/fetchgooglemaps-mapwindow-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: mapwindow.h Example File (fetchgooglemaps/mapwindow.h)</title> + <title>Qt Mobility Project 1.1: mapwindow.h Example File (fetchgooglemaps/mapwindow.h)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -66,9 +66,7 @@ QTM_BEGIN_NAMESPACE class QGeoPositionInfo; class QGeoPositionInfoSource; - #ifndef Q_WS_MAEMO_5 class QNetworkSession; - #endif QTM_END_NAMESPACE QTM_USE_NAMESPACE @@ -94,9 +92,7 @@ QLabel *headingAndSpeedLabel; QLabel *dateTimeLabel; bool loading; - #ifndef Q_WS_MAEMO_5 QTM_PREPEND_NAMESPACE(QNetworkSession) *session; - #endif bool usingLogFile; QGeoPositionInfoSource *location; bool waitingForFix; @@ -105,8 +101,8 @@ #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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/fetchgooglemaps.html b/doc/html/fetchgooglemaps.html index a35a75496f..31c30c8e11 100644 --- a/doc/html/fetchgooglemaps.html +++ b/doc/html/fetchgooglemaps.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- undocumented.qdoc --> <head> - <title>Qt Mobility Project 1.0: Fetch Google Maps Example</title> + <title>Qt Mobility Project 1.1: Fetch Google Maps Example</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -23,8 +23,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 6369d43b7e..080bbe87d3 100644 --- a/doc/html/filemanagerplugin-filemanagerplugin-cpp.html +++ b/doc/html/filemanagerplugin-filemanagerplugin-cpp.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: filemanagerplugin.cpp Example File (filemanagerplugin/filemanagerplugin.cpp)</title> + <title>Qt Mobility Project 1.1: filemanagerplugin.cpp Example File (filemanagerplugin/filemanagerplugin.cpp)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -77,8 +77,8 @@ Q_EXPORT_PLUGIN2(serviceframework_filemanagerplugin, FileManagerPlugin)</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 099cb33ff5..ddb8c7d379 100644 --- a/doc/html/filemanagerplugin-filemanagerplugin-h.html +++ b/doc/html/filemanagerplugin-filemanagerplugin-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: filemanagerplugin.h Example File (filemanagerplugin/filemanagerplugin.h)</title> + <title>Qt Mobility Project 1.1: filemanagerplugin.h Example File (filemanagerplugin/filemanagerplugin.h)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -76,8 +76,8 @@ #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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 9a1dcea4da..4cb30ec38b 100644 --- a/doc/html/filemanagerplugin-filemanagerplugin-pro.html +++ b/doc/html/filemanagerplugin-filemanagerplugin-pro.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: filemanagerplugin.pro Example File (filemanagerplugin/filemanagerplugin.pro)</title> + <title>Qt Mobility Project 1.1: filemanagerplugin.pro Example File (filemanagerplugin/filemanagerplugin.pro)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,6 +15,7 @@ </h1> <pre> TEMPLATE = lib CONFIG += plugin + PLUGIN_TYPE=serviceframework INCLUDEPATH += ../../src/serviceframework HEADERS += filemanagerplugin.h \ filemanagerstorage.h \ @@ -39,15 +40,13 @@ TARGET.CAPABILITY = LocalServices Location NetworkServices ReadUserData WriteUserData UserEnvironment } - xml.path = $$DESTDIR/xmldata + xml.path = $$QT_MOBILITY_PREFIX/bin/xmldata xml.files = filemanagerservice.xml - xml.CONFIG = no_link no_dependencies explicit_dependencies no_build combine ignore_no_exist no_clean - INSTALLS += xml - build_pass:ALL_DEPS+=install_xml</pre> + INSTALLS += xml</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 a4fa0a0485..d841c4223f 100644 --- a/doc/html/filemanagerplugin-filemanagerstorage-cpp.html +++ b/doc/html/filemanagerplugin-filemanagerstorage-cpp.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: filemanagerstorage.cpp Example File (filemanagerplugin/filemanagerstorage.cpp)</title> + <title>Qt Mobility Project 1.1: filemanagerstorage.cpp Example File (filemanagerplugin/filemanagerstorage.cpp)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -80,8 +80,8 @@ }</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 3163535fd5..efd74fe475 100644 --- a/doc/html/filemanagerplugin-filemanagerstorage-h.html +++ b/doc/html/filemanagerplugin-filemanagerstorage-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: filemanagerstorage.h Example File (filemanagerplugin/filemanagerstorage.h)</title> + <title>Qt Mobility Project 1.1: filemanagerstorage.h Example File (filemanagerplugin/filemanagerstorage.h)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -82,8 +82,8 @@ #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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 fcb4be4777..c492b5a24d 100644 --- a/doc/html/filemanagerplugin-filemanagertransfer-cpp.html +++ b/doc/html/filemanagerplugin-filemanagertransfer-cpp.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: filemanagertransfer.cpp Example File (filemanagerplugin/filemanagertransfer.cpp)</title> + <title>Qt Mobility Project 1.1: filemanagertransfer.cpp Example File (filemanagerplugin/filemanagertransfer.cpp)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -73,8 +73,8 @@ }</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 dc2c2f4092..729945b185 100644 --- a/doc/html/filemanagerplugin-filemanagertransfer-h.html +++ b/doc/html/filemanagerplugin-filemanagertransfer-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: filemanagertransfer.h Example File (filemanagerplugin/filemanagertransfer.h)</title> + <title>Qt Mobility Project 1.1: filemanagertransfer.h Example File (filemanagerplugin/filemanagertransfer.h)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -73,8 +73,8 @@ #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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/filemanagerplugin.html b/doc/html/filemanagerplugin.html index 4b7b1d3f0b..54dd7150c2 100644 --- a/doc/html/filemanagerplugin.html +++ b/doc/html/filemanagerplugin.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- filemanagerplugin.qdoc --> <head> - <title>Qt Mobility Project 1.0: File Manager Plugin Example</title> + <title>Qt Mobility Project 1.1: File Manager Plugin Example</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -41,8 +41,8 @@ <p>The functionality of the FileManager and the FileTransfer classes are in the separate classes FileManagerStorage and FileManagerTransfer respectively. The existing functions are merely test stubs to demonstrate the concept.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/flickrdemo-connectivityhelper-cpp.html b/doc/html/flickrdemo-connectivityhelper-cpp.html index c3fc4bb412..966fcd661b 100644 --- a/doc/html/flickrdemo-connectivityhelper-cpp.html +++ b/doc/html/flickrdemo-connectivityhelper-cpp.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: connectivityhelper.cpp Example File (flickrdemo/connectivityhelper.cpp)</title> + <title>Qt Mobility Project 1.1: connectivityhelper.cpp Example File (flickrdemo/connectivityhelper.cpp)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -102,8 +102,8 @@ }</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/flickrdemo-connectivityhelper-h.html b/doc/html/flickrdemo-connectivityhelper-h.html index 6b7c70c8e7..06115436ba 100644 --- a/doc/html/flickrdemo-connectivityhelper-h.html +++ b/doc/html/flickrdemo-connectivityhelper-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: connectivityhelper.h Example File (flickrdemo/connectivityhelper.h)</title> + <title>Qt Mobility Project 1.1: connectivityhelper.h Example File (flickrdemo/connectivityhelper.h)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -90,8 +90,8 @@ #endif <span class="comment">// #ifndef CONNECTIVITYHELPER_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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/flickrdemo-flickr-icon-svg.html b/doc/html/flickrdemo-flickr-icon-svg.html index 3ee031f9cb..8925b120a3 100644 --- a/doc/html/flickrdemo-flickr-icon-svg.html +++ b/doc/html/flickrdemo-flickr-icon-svg.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: flickr_icon.svg Example File (flickrdemo/flickr_icon.svg)</title> + <title>Qt Mobility Project 1.1: flickr_icon.svg Example File (flickrdemo/flickr_icon.svg)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -1065,8 +1065,8 @@ </svg></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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/flickrdemo-flickrdemo-cpp.html b/doc/html/flickrdemo-flickrdemo-cpp.html index 60529381c8..7a6eb93815 100644 --- a/doc/html/flickrdemo-flickrdemo-cpp.html +++ b/doc/html/flickrdemo-flickrdemo-cpp.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: flickrdemo.cpp Example File (flickrdemo/flickrdemo.cpp)</title> + <title>Qt Mobility Project 1.1: flickrdemo.cpp Example File (flickrdemo/flickrdemo.cpp)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -644,8 +644,8 @@ }</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/flickrdemo-flickrdemo-h.html b/doc/html/flickrdemo-flickrdemo-h.html index 5282d33f63..a84cc320cb 100644 --- a/doc/html/flickrdemo-flickrdemo-h.html +++ b/doc/html/flickrdemo-flickrdemo-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: flickrdemo.h Example File (flickrdemo/flickrdemo.h)</title> + <title>Qt Mobility Project 1.1: flickrdemo.h Example File (flickrdemo/flickrdemo.h)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -198,8 +198,8 @@ #endif <span class="comment">// FLICKRDEMO_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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/flickrdemo-flickrdemo-pro.html b/doc/html/flickrdemo-flickrdemo-pro.html index dfa40b6297..884bddf96f 100644 --- a/doc/html/flickrdemo-flickrdemo-pro.html +++ b/doc/html/flickrdemo-flickrdemo-pro.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: flickrdemo.pro Example File (flickrdemo/flickrdemo.pro)</title> + <title>Qt Mobility Project 1.1: flickrdemo.pro Example File (flickrdemo/flickrdemo.pro)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -39,19 +39,23 @@ ICON = flickr_icon.svg - symbian:TARGET.CAPABILITY += Location \ - NetworkServices \ - ReadUserData - - symbian: { - addFiles.sources = nmealog.txt - DEPLOYMENT += addFiles + symbian|wince* { + symbian { + addFiles.sources = nmealog.txt + DEPLOYMENT += addFiles + TARGET.CAPABILITY += Location \ + NetworkServices \ + ReadUserData + } + wince* { + addFiles.sources = ./nmealog.txt + addFiles.path = . + DEPLOYMENT += addFiles + } } else { - logfile.path = $$DESTDIR + logfile.path = $$QT_MOBILITY_PREFIX/bin 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 } wince*: { @@ -59,8 +63,8 @@ }</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/flickrdemo-main-cpp.html b/doc/html/flickrdemo-main-cpp.html index bb52636bf4..ebffd3d445 100644 --- a/doc/html/flickrdemo-main-cpp.html +++ b/doc/html/flickrdemo-main-cpp.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: main.cpp Example File (flickrdemo/main.cpp)</title> + <title>Qt Mobility Project 1.1: main.cpp Example File (flickrdemo/main.cpp)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -69,8 +69,8 @@ }</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/flickrdemo-xqlistwidget-cpp.html b/doc/html/flickrdemo-xqlistwidget-cpp.html index 2da0a7bb24..5d395a7bf2 100644 --- a/doc/html/flickrdemo-xqlistwidget-cpp.html +++ b/doc/html/flickrdemo-xqlistwidget-cpp.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: xqlistwidget.cpp Example File (flickrdemo/xqlistwidget.cpp)</title> + <title>Qt Mobility Project 1.1: xqlistwidget.cpp Example File (flickrdemo/xqlistwidget.cpp)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -77,8 +77,8 @@ }</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/flickrdemo-xqlistwidget-h.html b/doc/html/flickrdemo-xqlistwidget-h.html index b45d882ecb..92a24e66b4 100644 --- a/doc/html/flickrdemo-xqlistwidget-h.html +++ b/doc/html/flickrdemo-xqlistwidget-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: xqlistwidget.h Example File (flickrdemo/xqlistwidget.h)</title> + <title>Qt Mobility Project 1.1: xqlistwidget.h Example File (flickrdemo/xqlistwidget.h)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -71,8 +71,8 @@ #endif <span class="comment">// XQLISTWIDGET_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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/flickrdemo.html b/doc/html/flickrdemo.html index 3cb6cae759..12379f9e6f 100644 --- a/doc/html/flickrdemo.html +++ b/doc/html/flickrdemo.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- flickrdemo.qdoc --> <head> - <title>Qt Mobility Project 1.0: Flickr Demo Example</title> + <title>Qt Mobility Project 1.1: Flickr Demo Example</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -29,8 +29,8 @@ <p>The Flickr Demo example displays a list of flickr images relating to the current location of the device, or a hard-coded location if there is no GPS source.</p> <p align="center"><img src="images/flickr-demo.png" /></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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/functions.html b/doc/html/functions.html index f72170259f..2e98a93b93 100644 --- a/doc/html/functions.html +++ b/doc/html/functions.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- classes.qdoc --> <head> - <title>Qt Mobility Project 1.0: All Functions</title> + <title>Qt Mobility Project 1.1: All Functions</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -1620,8 +1620,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/future.html b/doc/html/future.html index 660a9ea1f4..cf4f5357df 100644 --- a/doc/html/future.html +++ b/doc/html/future.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- future.qdoc --> <head> - <title>Qt Mobility Project 1.0: Future Additional APIs</title> + <title>Qt Mobility Project 1.1: Future Additional APIs</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -32,8 +32,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/hierarchy.html b/doc/html/hierarchy.html index a65a7c3b2b..cf3ccff042 100644 --- a/doc/html/hierarchy.html +++ b/doc/html/hierarchy.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- classes.qdoc --> <head> - <title>Qt Mobility Project 1.0: Inheritance Hierarchy</title> + <title>Qt Mobility Project 1.1: Inheritance Hierarchy</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -172,8 +172,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/index.html b/doc/html/index.html index ff90ace066..cd5effe8f0 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 Overview</title> + <title>Qt Mobility Project 1.1: Qt Mobility Project APIs Overview</title> <link rel="start" href="index.html" /> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> @@ -20,7 +20,9 @@ <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> <ul><li><a href="#introducing-the-new-qt-apis">Introducing the New Qt APIs</a></li> -<li><a href="#getting-started">Getting Started</a></li> +</ul> +<li><a href="#namespace">Namespace</a></li> +<ul><li><a href="#getting-started">Getting Started</a></li> <li><a href="#known-issues">Known Issues</a></li> </ul> <li><a href="#the-new-qt-apis">The New Qt APIs</a></li> @@ -66,6 +68,9 @@ <li>Publish-Subscribe enables communication between separate objects whether local or remote to the device.</li> </ul> <p>The New Qt APIs deliver to developers an enabling package. It will be used by developers to build a variety of applications and services that are mobile capable or familiar to mobile users, irrespective of whether the platform is mobile or not. This means that there is the possibility of easy transfer of user experience from PC to phone or vice versa.</p> +<a name="namespace"></a> +<h3>Namespace</h3> +<p>The QtMobility API's are placed into the <i>QtMobility</i> 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="getting-started"></a> <h4>Getting Started</h4> <p>To get started with Qt Mobility see the</p> @@ -357,8 +362,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/installation.html b/doc/html/installation.html index 4f496f541f..ecadb3bfab 100644 --- a/doc/html/installation.html +++ b/doc/html/installation.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- installation.qdoc --> <head> - <title>Qt Mobility Project 1.0: Installation Guide</title> + <title>Qt Mobility Project 1.1: Installation Guide</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -161,8 +161,8 @@ <p>And now the installation is complete, we hope you enjoy using Qt Mobility.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 c2c25c086b..86da1f604d 100644 --- a/doc/html/keepintouch-addressfinder-cpp.html +++ b/doc/html/keepintouch-addressfinder-cpp.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: addressfinder.cpp Example File (keepintouch/addressfinder.cpp)</title> + <title>Qt Mobility Project 1.1: addressfinder.cpp Example File (keepintouch/addressfinder.cpp)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -569,8 +569,8 @@ }</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 77921c5239..a44278a5df 100644 --- a/doc/html/keepintouch-addressfinder-h.html +++ b/doc/html/keepintouch-addressfinder-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: addressfinder.h Example File (keepintouch/addressfinder.h)</title> + <title>Qt Mobility Project 1.1: addressfinder.h Example File (keepintouch/addressfinder.h)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -134,8 +134,8 @@ #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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 f514186675..1775a24e8a 100644 --- a/doc/html/keepintouch-keepintouch-pro.html +++ b/doc/html/keepintouch-keepintouch-pro.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: keepintouch.pro Example File (keepintouch/keepintouch.pro)</title> + <title>Qt Mobility Project 1.1: keepintouch.pro Example File (keepintouch/keepintouch.pro)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -48,8 +48,8 @@ WriteDeviceData</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 e4e8a37cea..f282dd68ed 100644 --- a/doc/html/keepintouch-main-cpp.html +++ b/doc/html/keepintouch-main-cpp.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: main.cpp Example File (keepintouch/main.cpp)</title> + <title>Qt Mobility Project 1.1: main.cpp Example File (keepintouch/main.cpp)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -76,8 +76,8 @@ }</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/keepintouch.html b/doc/html/keepintouch.html index 0bf54bf784..b2749780f5 100644 --- a/doc/html/keepintouch.html +++ b/doc/html/keepintouch.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- keepintouch.qdoc --> <head> - <title>Qt Mobility Project 1.0: 'Keep in Touch' Example</title> + <title>Qt Mobility Project 1.1: 'Keep in Touch' Example</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -249,8 +249,8 @@ }</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/landmarks.html b/doc/html/landmarks.html index d1eefea3ab..cda1cba467 100644 --- a/doc/html/landmarks.html +++ b/doc/html/landmarks.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qlandmarks.qdoc --> <head> - <title>Qt Mobility Project 1.0: Landmarks</title> + <title>Qt Mobility Project 1.1: Landmarks</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -345,8 +345,8 @@ }</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/lgpl.html b/doc/html/lgpl.html index 37e60d4139..598a37c158 100644 --- a/doc/html/lgpl.html +++ b/doc/html/lgpl.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- gpl.qdoc --> <head> - <title>Qt Mobility Project 1.0: GNU Lesser General Public License (LGPL)</title> + <title>Qt Mobility Project 1.1: GNU Lesser General Public License (LGPL)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -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">GNU Lesser General Public License (LGPL)<br /><span class="subtitle"></span> </h1> -<p>The Qt GUI Toolkit is Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).<br/> Contact: Nokia Corporation (qt-info@nokia.com)</p> +<p>The Qt GUI Toolkit is Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).<br/> Contact: Nokia Corporation (qt-info@nokia.com)</p> <p>Qt is available under the LGPL.</p> <a name="the-gnu-lesser-general-public-license-version-2-1"></a> <h3>The GNU Lesser General Public License (Version 2.1)</h3> @@ -526,8 +526,8 @@ <p>As a special exception to the GNU Lesser General Public License version 2.1, the object code form of a "work that uses the Library" may incorporate material from a header file that is part of the Library. You may distribute such object code under terms of your choice, provided that the incorporated material (i) does not exceed more than 5% of the total size of the Library; and (ii) is limited to numerical parameters, data structure layouts, accessors, macros, inline functions and templates.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/lightmaps-lightmaps-cpp.html b/doc/html/lightmaps-lightmaps-cpp.html index f50e9a0a3f..bdfb26a48e 100644 --- a/doc/html/lightmaps-lightmaps-cpp.html +++ b/doc/html/lightmaps-lightmaps-cpp.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: lightmaps.cpp Example File (lightmaps/lightmaps.cpp)</title> + <title>Qt Mobility Project 1.1: lightmaps.cpp Example File (lightmaps/lightmaps.cpp)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -808,8 +808,8 @@ }</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/lightmaps-lightmaps-pro.html b/doc/html/lightmaps-lightmaps-pro.html index 4846a01896..fc7b403267 100644 --- a/doc/html/lightmaps-lightmaps-pro.html +++ b/doc/html/lightmaps-lightmaps-pro.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: lightmaps.pro Example File (lightmaps/lightmaps.pro)</title> + <title>Qt Mobility Project 1.1: lightmaps.pro Example File (lightmaps/lightmaps.pro)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -32,28 +32,30 @@ include(../examples.pri) - symbian { - TARGET.CAPABILITY = NetworkServices Location ReadUserData - TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 - } - CONFIG += mobility MOBILITY = location bearer - symbian: { - addFiles.sources = nmealog.txt - DEPLOYMENT += addFiles + symbian|wince* { + symbian { + addFiles.sources = nmealog.txt + DEPLOYMENT += addFiles + TARGET.CAPABILITY = NetworkServices Location ReadUserData + TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 + } + wince*: { + addFiles.sources = ./nmealog.txt + addFiles.path = . + DEPLOYMENT += addFiles + } } else { - logfile.path = $$DESTDIR + logfile.path = $$QT_MOBILITY_PREFIX/bin 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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/lightmaps.html b/doc/html/lightmaps.html index e6a1f95fc5..7783a7601d 100644 --- a/doc/html/lightmaps.html +++ b/doc/html/lightmaps.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- lightmaps.qdoc --> <head> - <title>Qt Mobility Project 1.0: LightMap Example</title> + <title>Qt Mobility Project 1.1: LightMap Example</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -22,8 +22,8 @@ <p>This demo shows a lookup of the local street map based on the users location as determined by GPS. If no GPS is detected a default location is selected. Also from the Options menu the user can select a sample city. There is also an option to select night view.</p> <p align="center"><img src="images/lightmaps-oslo.png" /></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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/location-overview.html b/doc/html/location-overview.html index e6be8b9d5d..2a1cdf90db 100644 --- a/doc/html/location-overview.html +++ b/doc/html/location-overview.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- location.qdoc --> <head> - <title>Qt Mobility Project 1.0: Location</title> + <title>Qt Mobility Project 1.1: Location</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -297,8 +297,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/location.html b/doc/html/location.html index b8018f65c4..e93679e775 100644 --- a/doc/html/location.html +++ b/doc/html/location.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- location.qdoc --> <head> - <title>Qt Mobility Project 1.0: Location API</title> + <title>Qt Mobility Project 1.1: Location API</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -45,8 +45,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 e67d82de85..65b8636a52 100644 --- a/doc/html/logfilepositionsource-clientapplication-cpp.html +++ b/doc/html/logfilepositionsource-clientapplication-cpp.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: clientapplication.cpp Example File (logfilepositionsource/clientapplication.cpp)</title> + <title>Qt Mobility Project 1.1: clientapplication.cpp Example File (logfilepositionsource/clientapplication.cpp)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -77,8 +77,8 @@ }</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 ba9bd253a9..e5963c1232 100644 --- a/doc/html/logfilepositionsource-clientapplication-h.html +++ b/doc/html/logfilepositionsource-clientapplication-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: clientapplication.h Example File (logfilepositionsource/clientapplication.h)</title> + <title>Qt Mobility Project 1.1: clientapplication.h Example File (logfilepositionsource/clientapplication.h)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -81,8 +81,8 @@ #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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 8954fe5db6..595dc89855 100644 --- a/doc/html/logfilepositionsource-logfilepositionsource-cpp.html +++ b/doc/html/logfilepositionsource-logfilepositionsource-cpp.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: logfilepositionsource.cpp Example File (logfilepositionsource/logfilepositionsource.cpp)</title> + <title>Qt Mobility Project 1.1: logfilepositionsource.cpp Example File (logfilepositionsource/logfilepositionsource.cpp)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -133,8 +133,8 @@ }</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 6326fe9620..077497900f 100644 --- a/doc/html/logfilepositionsource-logfilepositionsource-h.html +++ b/doc/html/logfilepositionsource-logfilepositionsource-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: logfilepositionsource.h Example File (logfilepositionsource/logfilepositionsource.h)</title> + <title>Qt Mobility Project 1.1: logfilepositionsource.h Example File (logfilepositionsource/logfilepositionsource.h)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -91,8 +91,8 @@ #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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 99ec8eb52d..a2067acc8e 100644 --- a/doc/html/logfilepositionsource-logfilepositionsource-pro.html +++ b/doc/html/logfilepositionsource-logfilepositionsource-pro.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: logfilepositionsource.pro Example File (logfilepositionsource/logfilepositionsource.pro)</title> + <title>Qt Mobility Project 1.1: logfilepositionsource.pro Example File (logfilepositionsource/logfilepositionsource.pro)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -29,29 +29,27 @@ CONFIG += mobility MOBILITY = location - symbian|wince*: { - symbian: { + symbian|wince* { + symbian { addFiles.sources = simplelog.txt DEPLOYMENT += addFiles TARGET.CAPABILITY = Location } - wince*: { + wince* { addFiles.sources = ./simplelog.txt addFiles.path = . DEPLOYMENT += addFiles } } else { - logfileexample.path = $$DESTDIR + logfileexample.path = $$QT_MOBILITY_PREFIX/bin 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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 5e929f92c0..e41210d9a2 100644 --- a/doc/html/logfilepositionsource-main-cpp.html +++ b/doc/html/logfilepositionsource-main-cpp.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: main.cpp Example File (logfilepositionsource/main.cpp)</title> + <title>Qt Mobility Project 1.1: main.cpp Example File (logfilepositionsource/main.cpp)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -71,8 +71,8 @@ }</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/logfilepositionsource.html b/doc/html/logfilepositionsource.html index a4092add84..53459b326d 100644 --- a/doc/html/logfilepositionsource.html +++ b/doc/html/logfilepositionsource.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- undocumented.qdoc --> <head> - <title>Qt Mobility Project 1.0: Log File Position Source Example</title> + <title>Qt Mobility Project 1.1: Log File Position Source Example</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -25,8 +25,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/messaging.html b/doc/html/messaging.html index e9046aa1cf..a83bc6fd3f 100644 --- a/doc/html/messaging.html +++ b/doc/html/messaging.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- messaging.qdoc --> <head> - <title>Qt Mobility Project 1.0: Messaging</title> + <title>Qt Mobility Project 1.1: Messaging</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -151,8 +151,8 @@ <p>The <a href="serviceactions.html">Service Actions</a> example is a program to demonstrate how to compose, send, show, query and retrieve messages, and also react to message store events using the Qt Mobility Messaging API.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/mobility.html b/doc/html/mobility.html index cccfa18235..b35ebdeb4f 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</title> + <title>Qt Mobility Project 1.1: Qt Mobility Project APIs</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -19,8 +19,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/multimedia.html b/doc/html/multimedia.html index 71880aa8c5..af04aedb3d 100644 --- a/doc/html/multimedia.html +++ b/doc/html/multimedia.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- multimedia.qdoc --> <head> - <title>Qt Mobility Project 1.0: Multimedia</title> + <title>Qt Mobility Project 1.1: Multimedia</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -115,8 +115,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/notesmanagerplugin-note-h.html b/doc/html/notesmanagerplugin-note-h.html index 50c9f634f5..d349eccff0 100644 --- a/doc/html/notesmanagerplugin-note-h.html +++ b/doc/html/notesmanagerplugin-note-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: note.h Example File (notesmanagerplugin/note.h)</title> + <title>Qt Mobility Project 1.1: note.h Example File (notesmanagerplugin/note.h)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -89,8 +89,8 @@ #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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/notesmanagerplugin-notesmanager-cpp.html b/doc/html/notesmanagerplugin-notesmanager-cpp.html index 3c5c85ee00..769a1d1bf5 100644 --- a/doc/html/notesmanagerplugin-notesmanager-cpp.html +++ b/doc/html/notesmanagerplugin-notesmanager-cpp.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: notesmanager.cpp Example File (notesmanagerplugin/notesmanager.cpp)</title> + <title>Qt Mobility Project 1.1: notesmanager.cpp Example File (notesmanagerplugin/notesmanager.cpp)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -164,8 +164,8 @@ #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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/notesmanagerplugin-notesmanager-h.html b/doc/html/notesmanagerplugin-notesmanager-h.html index b62ee106f3..cb7b65e13b 100644 --- a/doc/html/notesmanagerplugin-notesmanager-h.html +++ b/doc/html/notesmanagerplugin-notesmanager-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: notesmanager.h Example File (notesmanagerplugin/notesmanager.h)</title> + <title>Qt Mobility Project 1.1: notesmanager.h Example File (notesmanagerplugin/notesmanager.h)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -115,8 +115,8 @@ #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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/notesmanagerplugin-notesmanagerplugin-cpp.html b/doc/html/notesmanagerplugin-notesmanagerplugin-cpp.html index ee01c761b1..9f562b8719 100644 --- a/doc/html/notesmanagerplugin-notesmanagerplugin-cpp.html +++ b/doc/html/notesmanagerplugin-notesmanagerplugin-cpp.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: notesmanagerplugin.cpp Example File (notesmanagerplugin/notesmanagerplugin.cpp)</title> + <title>Qt Mobility Project 1.1: notesmanagerplugin.cpp Example File (notesmanagerplugin/notesmanagerplugin.cpp)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -71,8 +71,8 @@ Q_EXPORT_PLUGIN2(serviceframework_notesmanagerplugin, NotesManagerPlugin)</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/notesmanagerplugin-notesmanagerplugin-h.html b/doc/html/notesmanagerplugin-notesmanagerplugin-h.html index f73f009321..9bcc4c920d 100644 --- a/doc/html/notesmanagerplugin-notesmanagerplugin-h.html +++ b/doc/html/notesmanagerplugin-notesmanagerplugin-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: notesmanagerplugin.h Example File (notesmanagerplugin/notesmanagerplugin.h)</title> + <title>Qt Mobility Project 1.1: notesmanagerplugin.h Example File (notesmanagerplugin/notesmanagerplugin.h)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -76,8 +76,8 @@ #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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/notesmanagerplugin-notesmanagerplugin-pro.html b/doc/html/notesmanagerplugin-notesmanagerplugin-pro.html index 6de0cf1627..aa2d3a87a6 100644 --- a/doc/html/notesmanagerplugin-notesmanagerplugin-pro.html +++ b/doc/html/notesmanagerplugin-notesmanagerplugin-pro.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: notesmanagerplugin.pro Example File (notesmanagerplugin/notesmanagerplugin.pro)</title> + <title>Qt Mobility Project 1.1: notesmanagerplugin.pro Example File (notesmanagerplugin/notesmanagerplugin.pro)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -16,6 +16,7 @@ <pre> TEMPLATE = lib CONFIG += plugin INCLUDEPATH += ../../src/serviceframework + PLUGIN_TYPE = serviceframework HEADERS += note.h \ notesmanagerplugin.h \ notesmanager.h @@ -23,7 +24,6 @@ notesmanager.cpp QT += sql TARGET = serviceframework_notesmanagerplugin - DESTDIR = . contains(QT_CONFIG, declarative):DEFINES += DECLARATIVE @@ -41,15 +41,13 @@ TARGET.CAPABILITY = ALL -TCB } - xml.path = $$DESTDIR/xmldata + xml.path = $$QT_MOBILITY_PREFIX/bin/xmldata xml.files = notesmanagerservice.xml - xml.CONFIG = no_link no_dependencies explicit_dependencies no_build combine ignore_no_exist no_clean - INSTALLS += xml - build_pass:ALL_DEPS+=install_xml</pre> + INSTALLS += xml</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/notesmanagerplugin.html b/doc/html/notesmanagerplugin.html index 7ec8550472..833c0e5ee1 100644 --- a/doc/html/notesmanagerplugin.html +++ b/doc/html/notesmanagerplugin.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- notesmanagerplugin.qdoc --> <head> - <title>Qt Mobility Project 1.0: Notes Manager Plugin Example</title> + <title>Qt Mobility Project 1.1: Notes Manager Plugin Example</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -26,8 +26,8 @@ <p>This example shows how to write a service plugin that manages textual notes by using a database to add, delete and store note objects. This plugin is QML compatible and is therefore used in the example <a href="declarative-sfw-notes.html">Declarative Notes Manager</a> as well as its non-QML counterpart <a href="sfw-notes.html">Notes Manager</a> which uses standard user-interface files (*.ui).</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/opensourceedition.html b/doc/html/opensourceedition.html index 2ee1b3730a..c83dddd9ec 100644 --- a/doc/html/opensourceedition.html +++ b/doc/html/opensourceedition.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- opensourceedition.qdoc --> <head> - <title>Qt Mobility Project 1.0: Open Source Versions of Qt</title> + <title>Qt Mobility Project 1.1: Open Source Versions of Qt</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -29,8 +29,8 @@ <p>If you are in doubt what edition of Qt is right for your project, please contact <a href="mailto:qt-info@nokia.com">qt-info@nokia.com</a>.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 48bcdb7114..bb76d3360a 100644 --- a/doc/html/player-main-cpp.html +++ b/doc/html/player-main-cpp.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: main.cpp Example File (player/main.cpp)</title> + <title>Qt Mobility Project 1.1: main.cpp Example File (player/main.cpp)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -74,8 +74,8 @@ };</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/player-mediakeysobserver-cpp.html b/doc/html/player-mediakeysobserver-cpp.html index 79922cc33c..787ca198eb 100644 --- a/doc/html/player-mediakeysobserver-cpp.html +++ b/doc/html/player-mediakeysobserver-cpp.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: mediakeysobserver.cpp Example File (player/mediakeysobserver.cpp)</title> + <title>Qt Mobility Project 1.1: mediakeysobserver.cpp Example File (player/mediakeysobserver.cpp)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -147,8 +147,8 @@ }</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/player-mediakeysobserver-h.html b/doc/html/player-mediakeysobserver-h.html index 899c2f1fd2..1ea5facdc4 100644 --- a/doc/html/player-mediakeysobserver-h.html +++ b/doc/html/player-mediakeysobserver-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: mediakeysobserver.h Example File (player/mediakeysobserver.h)</title> + <title>Qt Mobility Project 1.1: mediakeysobserver.h Example File (player/mediakeysobserver.h)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -99,8 +99,8 @@ #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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 25682562d1..5f8220d8c5 100644 --- a/doc/html/player-player-cpp.html +++ b/doc/html/player-player-cpp.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: player.cpp Example File (player/player.cpp)</title> + <title>Qt Mobility Project 1.1: player.cpp Example File (player/player.cpp)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -771,8 +771,8 @@ #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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 57ad11d95e..67249bfc7d 100644 --- a/doc/html/player-player-h.html +++ b/doc/html/player-player-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: player.h Example File (player/player.h)</title> + <title>Qt Mobility Project 1.1: player.h Example File (player/player.h)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -173,8 +173,8 @@ #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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 cc8ca5adfa..f4be283c93 100644 --- a/doc/html/player-player-pro.html +++ b/doc/html/player-player-pro.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: player.pro Example File (player/player.pro)</title> + <title>Qt Mobility Project 1.1: player.pro Example File (player/player.pro)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -44,8 +44,8 @@ }</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 d06fe58c54..a58fad6c56 100644 --- a/doc/html/player-playercontrols-cpp.html +++ b/doc/html/player-playercontrols-cpp.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: playercontrols.cpp Example File (player/playercontrols.cpp)</title> + <title>Qt Mobility Project 1.1: playercontrols.cpp Example File (player/playercontrols.cpp)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -287,8 +287,8 @@ }</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 7258fbe3ae..720bebe03f 100644 --- a/doc/html/player-playercontrols-h.html +++ b/doc/html/player-playercontrols-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: playercontrols.h Example File (player/playercontrols.h)</title> + <title>Qt Mobility Project 1.1: playercontrols.h Example File (player/playercontrols.h)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -125,8 +125,8 @@ #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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 1584ad6b93..93491858d0 100644 --- a/doc/html/player-playlistmodel-cpp.html +++ b/doc/html/player-playlistmodel-cpp.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: playlistmodel.cpp Example File (player/playlistmodel.cpp)</title> + <title>Qt Mobility Project 1.1: playlistmodel.cpp Example File (player/playlistmodel.cpp)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -171,8 +171,8 @@ }</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 26c880908a..810a2a7bc1 100644 --- a/doc/html/player-playlistmodel-h.html +++ b/doc/html/player-playlistmodel-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: playlistmodel.h Example File (player/playlistmodel.h)</title> + <title>Qt Mobility Project 1.1: playlistmodel.h Example File (player/playlistmodel.h)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -103,8 +103,8 @@ #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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 ff344cad94..2e85292429 100644 --- a/doc/html/player-videowidget-cpp.html +++ b/doc/html/player-videowidget-cpp.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: videowidget.cpp Example File (player/videowidget.cpp)</title> + <title>Qt Mobility Project 1.1: videowidget.cpp Example File (player/videowidget.cpp)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -109,8 +109,8 @@ }</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 2d1c1f36ef..ee9014c76b 100644 --- a/doc/html/player-videowidget-h.html +++ b/doc/html/player-videowidget-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: videowidget.h Example File (player/videowidget.h)</title> + <title>Qt Mobility Project 1.1: videowidget.h Example File (player/videowidget.h)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -74,8 +74,8 @@ #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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/player.html b/doc/html/player.html index 181085aa13..b6b46d15ba 100644 --- a/doc/html/player.html +++ b/doc/html/player.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- player.qdoc --> <head> - <title>Qt Mobility Project 1.0: Media Player Example</title> + <title>Qt Mobility Project 1.1: Media Player Example</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -61,8 +61,8 @@ saturationSlider, SLOT(setValue(int)));</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/preview.html b/doc/html/preview.html index cf461b2230..b7443eedb3 100644 --- a/doc/html/preview.html +++ b/doc/html/preview.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- preview.qdoc --> <head> - <title>Qt Mobility Project 1.0: Technology Preview</title> + <title>Qt Mobility Project 1.1: Technology Preview</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -55,8 +55,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/publ-subs.html b/doc/html/publ-subs.html index ffe79ca52a..0f398e29c0 100644 --- a/doc/html/publ-subs.html +++ b/doc/html/publ-subs.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- publ-subs.qdoc --> <head> - <title>Qt Mobility Project 1.0: Publish and Subscribe</title> + <title>Qt Mobility Project 1.1: Publish and Subscribe</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -130,8 +130,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 7808f6b56b..6811a35bc4 100644 --- a/doc/html/publish-subscribe-main-cpp.html +++ b/doc/html/publish-subscribe-main-cpp.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: main.cpp Example File (publish-subscribe/main.cpp)</title> + <title>Qt Mobility Project 1.1: main.cpp Example File (publish-subscribe/main.cpp)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -121,8 +121,8 @@ }</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 2cf56575ba..0bc2d7c95b 100644 --- a/doc/html/publish-subscribe-publish-subscribe-pro.html +++ b/doc/html/publish-subscribe-publish-subscribe-pro.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: publish-subscribe.pro Example File (publish-subscribe/publish-subscribe.pro)</title> + <title>Qt Mobility Project 1.1: publish-subscribe.pro Example File (publish-subscribe/publish-subscribe.pro)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -49,8 +49,8 @@ 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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 f66275e394..30479082b1 100644 --- a/doc/html/publish-subscribe-publisherdialog-cpp.html +++ b/doc/html/publish-subscribe-publisherdialog-cpp.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: publisherdialog.cpp Example File (publish-subscribe/publisherdialog.cpp)</title> + <title>Qt Mobility Project 1.1: publisherdialog.cpp Example File (publish-subscribe/publisherdialog.cpp)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -143,8 +143,8 @@ }</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 5f6e0072cd..2a8ea2d787 100644 --- a/doc/html/publish-subscribe-publisherdialog-h.html +++ b/doc/html/publish-subscribe-publisherdialog-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: publisherdialog.h Example File (publish-subscribe/publisherdialog.h)</title> + <title>Qt Mobility Project 1.1: publisherdialog.h Example File (publish-subscribe/publisherdialog.h)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -100,8 +100,8 @@ #endif <span class="comment">// PUBLISHERDIALOG_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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 d00dd48221..f6a9c5bcea 100644 --- a/doc/html/publish-subscribe-subscriberdialog-cpp.html +++ b/doc/html/publish-subscribe-subscriberdialog-cpp.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: subscriberdialog.cpp Example File (publish-subscribe/subscriberdialog.cpp)</title> + <title>Qt Mobility Project 1.1: subscriberdialog.cpp Example File (publish-subscribe/subscriberdialog.cpp)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -191,8 +191,8 @@ }</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 b54340e873..97ce720716 100644 --- a/doc/html/publish-subscribe-subscriberdialog-h.html +++ b/doc/html/publish-subscribe-subscriberdialog-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: subscriberdialog.h Example File (publish-subscribe/subscriberdialog.h)</title> + <title>Qt Mobility Project 1.1: subscriberdialog.h Example File (publish-subscribe/subscriberdialog.h)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -103,8 +103,8 @@ #endif <span class="comment">// SUBSCRIBERDIALOG_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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/publish-subscribe.html b/doc/html/publish-subscribe.html index 0e158dc6e2..c0167350ad 100644 --- a/doc/html/publish-subscribe.html +++ b/doc/html/publish-subscribe.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- publish-subscribe.qdoc --> <head> - <title>Qt Mobility Project 1.0: Publish and Subscribe Example</title> + <title>Qt Mobility Project 1.1: Publish and Subscribe Example</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -143,8 +143,8 @@ }</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qabstractsecuritysession-members.html b/doc/html/qabstractsecuritysession-members.html index 95c1da2941..e98f5b8d98 100644 --- a/doc/html/qabstractsecuritysession-members.html +++ b/doc/html/qabstractsecuritysession-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qabstractsecuritysession.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QAbstractSecuritySession</title> + <title>Qt Mobility Project 1.1: List of All Members for QAbstractSecuritySession</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -70,8 +70,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qabstractsecuritysession.html b/doc/html/qabstractsecuritysession.html index 8a5cf3e50a..ae3d145e35 100644 --- a/doc/html/qabstractsecuritysession.html +++ b/doc/html/qabstractsecuritysession.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qabstractsecuritysession.cpp --> <head> - <title>Qt Mobility Project 1.0: QAbstractSecuritySession Class Reference</title> + <title>Qt Mobility Project 1.1: QAbstractSecuritySession Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -63,8 +63,8 @@ <p>Returns true if the security session has sufficient rights to access the required service <i>capabilities</i>.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qabstractvaluespacelayer-members.html b/doc/html/qabstractvaluespacelayer-members.html index b69304b19f..b91c7d7725 100644 --- a/doc/html/qabstractvaluespacelayer-members.html +++ b/doc/html/qabstractvaluespacelayer-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qvaluespace.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QAbstractValueSpaceLayer</title> + <title>Qt Mobility Project 1.1: List of All Members for QAbstractValueSpaceLayer</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -89,8 +89,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qabstractvaluespacelayer.html b/doc/html/qabstractvaluespacelayer.html index 52600d74b6..46fb02ff19 100644 --- a/doc/html/qabstractvaluespacelayer.html +++ b/doc/html/qabstractvaluespacelayer.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qvaluespace.cpp --> <head> - <title>Qt Mobility Project 1.0: QAbstractValueSpaceLayer Class Reference</title> + <title>Qt Mobility Project 1.1: QAbstractValueSpaceLayer Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -203,8 +203,8 @@ <p>This macro can only be used once for any given class and it should be used where the implementation is written rather than in a header file.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qaccelerometer-members.html b/doc/html/qaccelerometer-members.html index 799a9c5ae8..25136c9fbc 100644 --- a/doc/html/qaccelerometer-members.html +++ b/doc/html/qaccelerometer-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qaccelerometer.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QAccelerometer</title> + <title>Qt Mobility Project 1.1: List of All Members for QAccelerometer</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -96,8 +96,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qaccelerometer.html b/doc/html/qaccelerometer.html index b0c7b2c359..ba24f82f99 100644 --- a/doc/html/qaccelerometer.html +++ b/doc/html/qaccelerometer.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qaccelerometer.cpp --> <head> - <title>Qt Mobility Project 1.0: QAccelerometer Class Reference</title> + <title>Qt Mobility Project 1.1: QAccelerometer Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -67,8 +67,8 @@ <p>See also <a href="qsensor.html#reading-prop">QSensor::reading</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qaccelerometerfilter-members.html b/doc/html/qaccelerometerfilter-members.html index 95eae912ea..94d21da9c5 100644 --- a/doc/html/qaccelerometerfilter-members.html +++ b/doc/html/qaccelerometerfilter-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qaccelerometer.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QAccelerometerFilter</title> + <title>Qt Mobility Project 1.1: List of All Members for QAccelerometerFilter</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -20,8 +20,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qaccelerometerfilter.html b/doc/html/qaccelerometerfilter.html index 76ad2ce10d..30517cae72 100644 --- a/doc/html/qaccelerometerfilter.html +++ b/doc/html/qaccelerometerfilter.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qaccelerometer.cpp --> <head> - <title>Qt Mobility Project 1.0: QAccelerometerFilter Class Reference</title> + <title>Qt Mobility Project 1.1: QAccelerometerFilter Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -41,8 +41,8 @@ <p>See also <a href="qsensorfilter.html#filter">QSensorFilter::filter</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qaccelerometerreading-members.html b/doc/html/qaccelerometerreading-members.html index c1c02e7136..5d68354c0a 100644 --- a/doc/html/qaccelerometerreading-members.html +++ b/doc/html/qaccelerometerreading-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qaccelerometer.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QAccelerometerReading</title> + <title>Qt Mobility Project 1.1: List of All Members for QAccelerometerReading</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -77,8 +77,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qaccelerometerreading.html b/doc/html/qaccelerometerreading.html index 66032dd40c..99f5d4f19e 100644 --- a/doc/html/qaccelerometerreading.html +++ b/doc/html/qaccelerometerreading.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qaccelerometer.cpp --> <head> - <title>Qt Mobility Project 1.0: QAccelerometerReading Class Reference</title> + <title>Qt Mobility Project 1.1: QAccelerometerReading Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -108,8 +108,8 @@ <p>See also <a href="qaccelerometerreading.html#z-prop">z</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qambientlightfilter-members.html b/doc/html/qambientlightfilter-members.html index 4b6bbcfa28..9961403a75 100644 --- a/doc/html/qambientlightfilter-members.html +++ b/doc/html/qambientlightfilter-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qambientlightsensor.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QAmbientLightFilter</title> + <title>Qt Mobility Project 1.1: List of All Members for QAmbientLightFilter</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -20,8 +20,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qambientlightfilter.html b/doc/html/qambientlightfilter.html index d07dea8642..fa3ed66a57 100644 --- a/doc/html/qambientlightfilter.html +++ b/doc/html/qambientlightfilter.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qambientlightsensor.cpp --> <head> - <title>Qt Mobility Project 1.0: QAmbientLightFilter Class Reference</title> + <title>Qt Mobility Project 1.1: QAmbientLightFilter Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -41,8 +41,8 @@ <p>See also <a href="qsensorfilter.html#filter">QSensorFilter::filter</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qambientlightreading-members.html b/doc/html/qambientlightreading-members.html index ebaec79fcc..be135e1002 100644 --- a/doc/html/qambientlightreading-members.html +++ b/doc/html/qambientlightreading-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qambientlightsensor.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QAmbientLightReading</title> + <title>Qt Mobility Project 1.1: List of All Members for QAmbientLightReading</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -74,8 +74,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qambientlightreading.html b/doc/html/qambientlightreading.html index 6913a517a2..1ca4561871 100644 --- a/doc/html/qambientlightreading.html +++ b/doc/html/qambientlightreading.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qambientlightsensor.cpp --> <head> - <title>Qt Mobility Project 1.0: QAmbientLightReading Class Reference</title> + <title>Qt Mobility Project 1.1: QAmbientLightReading Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -101,8 +101,8 @@ <p>See also <a href="qambientlightreading.html#lightLevel-prop">lightLevel</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qambientlightsensor-members.html b/doc/html/qambientlightsensor-members.html index 18fed6ff81..d1701535be 100644 --- a/doc/html/qambientlightsensor-members.html +++ b/doc/html/qambientlightsensor-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qambientlightsensor.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QAmbientLightSensor</title> + <title>Qt Mobility Project 1.1: List of All Members for QAmbientLightSensor</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -96,8 +96,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qambientlightsensor.html b/doc/html/qambientlightsensor.html index 7123f8c279..92e3a615c2 100644 --- a/doc/html/qambientlightsensor.html +++ b/doc/html/qambientlightsensor.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qambientlightsensor.cpp --> <head> - <title>Qt Mobility Project 1.0: QAmbientLightSensor Class Reference</title> + <title>Qt Mobility Project 1.1: QAmbientLightSensor Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -67,8 +67,8 @@ <p>See also <a href="qsensor.html#reading-prop">QSensor::reading</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qaudiocapturesource-members.html b/doc/html/qaudiocapturesource-members.html index f9471b54ea..b1613cc9b4 100644 --- a/doc/html/qaudiocapturesource-members.html +++ b/doc/html/qaudiocapturesource-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qaudiocapturesource.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QAudioCaptureSource</title> + <title>Qt Mobility Project 1.1: List of All Members for QAudioCaptureSource</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -97,8 +97,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qaudiocapturesource.html b/doc/html/qaudiocapturesource.html index 6daabcec4b..9e55bce2c3 100644 --- a/doc/html/qaudiocapturesource.html +++ b/doc/html/qaudiocapturesource.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qaudiocapturesource.cpp --> <head> - <title>Qt Mobility Project 1.0: QAudioCaptureSource Class Reference</title> + <title>Qt Mobility Project 1.1: QAudioCaptureSource Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -130,8 +130,8 @@ <p>Set the active audio input to <i>name</i>.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qaudioencodercontrol-members.html b/doc/html/qaudioencodercontrol-members.html index e4295f99cd..a02f6d17c1 100644 --- a/doc/html/qaudioencodercontrol-members.html +++ b/doc/html/qaudioencodercontrol-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qaudioencodercontrol.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QAudioEncoderControl</title> + <title>Qt Mobility Project 1.1: List of All Members for QAudioEncoderControl</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -77,8 +77,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qaudioencodercontrol.html b/doc/html/qaudioencodercontrol.html index 711a367c38..bb958df0b4 100644 --- a/doc/html/qaudioencodercontrol.html +++ b/doc/html/qaudioencodercontrol.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qaudioencodercontrol.cpp --> <head> - <title>Qt Mobility Project 1.0: QAudioEncoderControl Class Reference</title> + <title>Qt Mobility Project 1.1: QAudioEncoderControl Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -116,8 +116,8 @@ <p>Defines the interface name of the <a href="qaudioencodercontrol.html">QAudioEncoderControl</a> class.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qaudioencodersettings-members.html b/doc/html/qaudioencodersettings-members.html index ef12e4051c..d15ac31343 100644 --- a/doc/html/qaudioencodersettings-members.html +++ b/doc/html/qaudioencodersettings-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmediaencodersettings.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QAudioEncoderSettings</title> + <title>Qt Mobility Project 1.1: List of All Members for QAudioEncoderSettings</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -41,8 +41,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qaudioencodersettings.html b/doc/html/qaudioencodersettings.html index de6f607cec..9854361f99 100644 --- a/doc/html/qaudioencodersettings.html +++ b/doc/html/qaudioencodersettings.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmediaencodersettings.cpp --> <head> - <title>Qt Mobility Project 1.0: QAudioEncoderSettings Class Reference</title> + <title>Qt Mobility Project 1.1: QAudioEncoderSettings Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -135,8 +135,8 @@ <p>Returns true if the settings objects are of equal value, and true if they are not of equal value.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qaudioendpointselector-members.html b/doc/html/qaudioendpointselector-members.html index c871ac5557..9e8bd27b6a 100644 --- a/doc/html/qaudioendpointselector-members.html +++ b/doc/html/qaudioendpointselector-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qaudioendpointselector.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QAudioEndpointSelector</title> + <title>Qt Mobility Project 1.1: List of All Members for QAudioEndpointSelector</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -76,8 +76,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qaudioendpointselector.html b/doc/html/qaudioendpointselector.html index 0f95bcd7e5..9d55f87561 100644 --- a/doc/html/qaudioendpointselector.html +++ b/doc/html/qaudioendpointselector.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qaudioendpointselector.cpp --> <head> - <title>Qt Mobility Project 1.0: QAudioEndpointSelector Class Reference</title> + <title>Qt Mobility Project 1.1: QAudioEndpointSelector Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -120,8 +120,8 @@ <p>Defines the interface name of the <a href="qaudioendpointselector.html">QAudioEndpointSelector</a> class.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcompass-members.html b/doc/html/qcompass-members.html index 3a02f45f4c..88391b4d94 100644 --- a/doc/html/qcompass-members.html +++ b/doc/html/qcompass-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcompass.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QCompass</title> + <title>Qt Mobility Project 1.1: List of All Members for QCompass</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -96,8 +96,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcompass.html b/doc/html/qcompass.html index 5d57db76ba..b14e93e6dd 100644 --- a/doc/html/qcompass.html +++ b/doc/html/qcompass.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcompass.cpp --> <head> - <title>Qt Mobility Project 1.0: QCompass Class Reference</title> + <title>Qt Mobility Project 1.1: QCompass Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -67,8 +67,8 @@ <p>See also <a href="qsensor.html#reading-prop">QSensor::reading</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcompassfilter-members.html b/doc/html/qcompassfilter-members.html index f054c43bd2..d2017b8283 100644 --- a/doc/html/qcompassfilter-members.html +++ b/doc/html/qcompassfilter-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcompass.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QCompassFilter</title> + <title>Qt Mobility Project 1.1: List of All Members for QCompassFilter</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -20,8 +20,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcompassfilter.html b/doc/html/qcompassfilter.html index b692b27660..2f6d8891d3 100644 --- a/doc/html/qcompassfilter.html +++ b/doc/html/qcompassfilter.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcompass.cpp --> <head> - <title>Qt Mobility Project 1.0: QCompassFilter Class Reference</title> + <title>Qt Mobility Project 1.1: QCompassFilter Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -41,8 +41,8 @@ <p>See also <a href="qsensorfilter.html#filter">QSensorFilter::filter</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcompassreading-members.html b/doc/html/qcompassreading-members.html index 67c678fd64..4625139d1a 100644 --- a/doc/html/qcompassreading-members.html +++ b/doc/html/qcompassreading-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcompass.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QCompassReading</title> + <title>Qt Mobility Project 1.1: List of All Members for QCompassReading</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -75,8 +75,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcompassreading.html b/doc/html/qcompassreading.html index 22ed4d5ecf..95eb5df29e 100644 --- a/doc/html/qcompassreading.html +++ b/doc/html/qcompassreading.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcompass.cpp --> <head> - <title>Qt Mobility Project 1.0: QCompassReading Class Reference</title> + <title>Qt Mobility Project 1.1: QCompassReading Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -93,8 +93,8 @@ <p>See also <a href="qcompassreading.html#calibrationLevel-prop">calibrationLevel</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontact-members.html b/doc/html/qcontact-members.html index ddb38ccc0b..c02a468f6c 100644 --- a/doc/html/qcontact-members.html +++ b/doc/html/qcontact-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontact.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QContact</title> + <title>Qt Mobility Project 1.1: List of All Members for QContact</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -50,8 +50,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontact.html b/doc/html/qcontact.html index be2877c6c5..7e8b794c84 100644 --- a/doc/html/qcontact.html +++ b/doc/html/qcontact.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontact.cpp --> <head> - <title>Qt Mobility Project 1.0: QContact Class Reference</title> + <title>Qt Mobility Project 1.1: QContact Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -213,8 +213,8 @@ <p>Returns true if this contact is equal to the <i>other</i> contact, false if either the id or stored details are not the same</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactabstractrequest-members.html b/doc/html/qcontactabstractrequest-members.html index 7f5857a3ff..d36006cb45 100644 --- a/doc/html/qcontactabstractrequest-members.html +++ b/doc/html/qcontactabstractrequest-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactabstractrequest.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QContactAbstractRequest</title> + <title>Qt Mobility Project 1.1: List of All Members for QContactAbstractRequest</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -84,8 +84,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactabstractrequest.html b/doc/html/qcontactabstractrequest.html index e06cf45a17..3b152fe40e 100644 --- a/doc/html/qcontactabstractrequest.html +++ b/doc/html/qcontactabstractrequest.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactabstractrequest.cpp --> <head> - <title>Qt Mobility Project 1.0: QContactAbstractRequest Class Reference</title> + <title>Qt Mobility Project 1.1: QContactAbstractRequest Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -181,8 +181,8 @@ <p>Blocks until the request has been completed by the manager engine, or until <i>msecs</i> milliseconds has elapsed. If <i>msecs</i> is zero, this function will block indefinitely. Returns true if the request was cancelled or completed successfully within the given period, otherwise false. Some backends are unable to support this operation safely, and will return false immediately.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactaddress-members.html b/doc/html/qcontactaddress-members.html index 1cb1f8dabf..7c53034dfe 100644 --- a/doc/html/qcontactaddress-members.html +++ b/doc/html/qcontactaddress-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactdetails.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QContactAddress</title> + <title>Qt Mobility Project 1.1: List of All Members for QContactAddress</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -86,8 +86,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactaddress.html b/doc/html/qcontactaddress.html index 592ec991b5..9546ccfe1a 100644 --- a/doc/html/qcontactaddress.html +++ b/doc/html/qcontactaddress.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactdetails.cpp --> <head> - <title>Qt Mobility Project 1.0: QContactAddress Class Reference</title> + <title>Qt Mobility Project 1.1: QContactAddress Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -174,8 +174,8 @@ <p>See also <a href="qcontactaddress.html#subTypes">subTypes</a>() and <a href="qcontactaddress.html#setSubTypes">setSubTypes</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactanniversary-members.html b/doc/html/qcontactanniversary-members.html index 8afddc6725..cc9bd67c26 100644 --- a/doc/html/qcontactanniversary-members.html +++ b/doc/html/qcontactanniversary-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactdetails.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QContactAnniversary</title> + <title>Qt Mobility Project 1.1: List of All Members for QContactAnniversary</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -76,8 +76,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactanniversary.html b/doc/html/qcontactanniversary.html index 91b6117aeb..66a1281fa1 100644 --- a/doc/html/qcontactanniversary.html +++ b/doc/html/qcontactanniversary.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactdetails.cpp --> <head> - <title>Qt Mobility Project 1.0: QContactAnniversary Class Reference</title> + <title>Qt Mobility Project 1.1: QContactAnniversary Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -126,8 +126,8 @@ <p>See also <a href="qcontactanniversary.html#subType">subType</a>() and <a href="qcontactanniversary.html#setSubType">setSubType</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactavatar-members.html b/doc/html/qcontactavatar-members.html index df47cdbb3f..ef3a222b3f 100644 --- a/doc/html/qcontactavatar-members.html +++ b/doc/html/qcontactavatar-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactdetails.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QContactAvatar</title> + <title>Qt Mobility Project 1.1: List of All Members for QContactAvatar</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -66,8 +66,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactavatar.html b/doc/html/qcontactavatar.html index 160ece2c3d..9b016ce08f 100644 --- a/doc/html/qcontactavatar.html +++ b/doc/html/qcontactavatar.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactdetails.cpp --> <head> - <title>Qt Mobility Project 1.0: QContactAvatar Class Reference</title> + <title>Qt Mobility Project 1.1: QContactAvatar Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -76,8 +76,8 @@ <p>See also <a href="qcontactavatar.html#videoUrl">videoUrl</a>() and <a href="qcontactavatar.html#setVideoUrl">setVideoUrl</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactbirthday-members.html b/doc/html/qcontactbirthday-members.html index b00f8a7999..c1866e4291 100644 --- a/doc/html/qcontactbirthday-members.html +++ b/doc/html/qcontactbirthday-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactdetails.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QContactBirthday</title> + <title>Qt Mobility Project 1.1: List of All Members for QContactBirthday</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -63,8 +63,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactbirthday.html b/doc/html/qcontactbirthday.html index b4d1498772..4e2b4ecdc1 100644 --- a/doc/html/qcontactbirthday.html +++ b/doc/html/qcontactbirthday.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactdetails.cpp --> <head> - <title>Qt Mobility Project 1.0: QContactBirthday Class Reference</title> + <title>Qt Mobility Project 1.1: QContactBirthday Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -61,8 +61,8 @@ <p>See also <a href="qcontactbirthday.html#date">date</a>() and <a href="qcontactbirthday.html#setDate">setDate</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactchangelogfilter-members.html b/doc/html/qcontactchangelogfilter-members.html index 7971749712..8e47db5e94 100644 --- a/doc/html/qcontactchangelogfilter-members.html +++ b/doc/html/qcontactchangelogfilter-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactchangelogfilter.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QContactChangeLogFilter</title> + <title>Qt Mobility Project 1.1: List of All Members for QContactChangeLogFilter</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -33,8 +33,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactchangelogfilter.html b/doc/html/qcontactchangelogfilter.html index c0d7438783..b41e01fe1d 100644 --- a/doc/html/qcontactchangelogfilter.html +++ b/doc/html/qcontactchangelogfilter.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactchangelogfilter.cpp --> <head> - <title>Qt Mobility Project 1.0: QContactChangeLogFilter Class Reference</title> + <title>Qt Mobility Project 1.1: QContactChangeLogFilter Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -83,8 +83,8 @@ <p>See also <a href="qcontactchangelogfilter.html#setSince">setSince</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactchangeset-members.html b/doc/html/qcontactchangeset-members.html index 073355932b..ee00bd0656 100644 --- a/doc/html/qcontactchangeset-members.html +++ b/doc/html/qcontactchangeset-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactchangeset.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QContactChangeSet</title> + <title>Qt Mobility Project 1.1: List of All Members for QContactChangeSet</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -52,8 +52,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactchangeset.html b/doc/html/qcontactchangeset.html index eec0d21a6c..4cb31408f5 100644 --- a/doc/html/qcontactchangeset.html +++ b/doc/html/qcontactchangeset.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactchangeset.cpp --> <head> - <title>Qt Mobility Project 1.0: QContactChangeSet Class Reference</title> + <title>Qt Mobility Project 1.1: QContactChangeSet Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -156,8 +156,8 @@ <p>Assigns this change set to be equal to <i>other</i></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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactdetail-members.html b/doc/html/qcontactdetail-members.html index 159d451285..2a8ce76e73 100644 --- a/doc/html/qcontactdetail-members.html +++ b/doc/html/qcontactdetail-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactdetail.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QContactDetail</title> + <title>Qt Mobility Project 1.1: List of All Members for QContactDetail</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -64,8 +64,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactdetail.html b/doc/html/qcontactdetail.html index f8cab30a0e..cec44cf220 100644 --- a/doc/html/qcontactdetail.html +++ b/doc/html/qcontactdetail.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactdetail.cpp --> <head> - <title>Qt Mobility Project 1.0: QContactDetail Class Reference</title> + <title>Qt Mobility Project 1.1: QContactDetail Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -304,8 +304,8 @@ };</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactdetaildefinition-members.html b/doc/html/qcontactdetaildefinition-members.html index 372d3a4dbb..3c185cdc5e 100644 --- a/doc/html/qcontactdetaildefinition-members.html +++ b/doc/html/qcontactdetaildefinition-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactdetaildefinition.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QContactDetailDefinition</title> + <title>Qt Mobility Project 1.1: List of All Members for QContactDetailDefinition</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -33,8 +33,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactdetaildefinition.html b/doc/html/qcontactdetaildefinition.html index 4f8378b893..4fc43988c9 100644 --- a/doc/html/qcontactdetaildefinition.html +++ b/doc/html/qcontactdetaildefinition.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactdetaildefinition.cpp --> <head> - <title>Qt Mobility Project 1.0: QContactDetailDefinition Class Reference</title> + <title>Qt Mobility Project 1.1: QContactDetailDefinition Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -94,8 +94,8 @@ <p>Returns true if the definition has the same type, uniqueness and allowable value datatypes as <i>other</i></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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactdetaildefinitionfetchrequest-members.html b/doc/html/qcontactdetaildefinitionfetchrequest-members.html index b6a7fd6707..9fbfd81b66 100644 --- a/doc/html/qcontactdetaildefinitionfetchrequest-members.html +++ b/doc/html/qcontactdetaildefinitionfetchrequest-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactdetaildefinitionfetchrequest.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QContactDetailDefinitionFetchRequest</title> + <title>Qt Mobility Project 1.1: List of All Members for QContactDetailDefinitionFetchRequest</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -91,8 +91,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactdetaildefinitionfetchrequest.html b/doc/html/qcontactdetaildefinitionfetchrequest.html index 6cd9b76417..3ab2a6b34f 100644 --- a/doc/html/qcontactdetaildefinitionfetchrequest.html +++ b/doc/html/qcontactdetaildefinitionfetchrequest.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactdetaildefinitionfetchrequest.cpp --> <head> - <title>Qt Mobility Project 1.0: QContactDetailDefinitionFetchRequest Class Reference</title> + <title>Qt Mobility Project 1.1: QContactDetailDefinitionFetchRequest Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -86,8 +86,8 @@ <p>See also <a href="qcontactdetaildefinitionfetchrequest.html#definitionNames">definitionNames</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactdetaildefinitionremoverequest-members.html b/doc/html/qcontactdetaildefinitionremoverequest-members.html index 6b0639370c..4455830645 100644 --- a/doc/html/qcontactdetaildefinitionremoverequest-members.html +++ b/doc/html/qcontactdetaildefinitionremoverequest-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactdetaildefinitionremoverequest.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QContactDetailDefinitionRemoveRequest</title> + <title>Qt Mobility Project 1.1: List of All Members for QContactDetailDefinitionRemoveRequest</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -90,8 +90,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactdetaildefinitionremoverequest.html b/doc/html/qcontactdetaildefinitionremoverequest.html index 6b6667347e..85e1562a0c 100644 --- a/doc/html/qcontactdetaildefinitionremoverequest.html +++ b/doc/html/qcontactdetaildefinitionremoverequest.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactdetaildefinitionremoverequest.cpp --> <head> - <title>Qt Mobility Project 1.0: QContactDetailDefinitionRemoveRequest Class Reference</title> + <title>Qt Mobility Project 1.1: QContactDetailDefinitionRemoveRequest Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -83,8 +83,8 @@ <p>See also <a href="qcontactdetaildefinitionremoverequest.html#definitionNames">definitionNames</a>() and <a href="qcontactdetaildefinitionremoverequest.html#setContactType">setContactType</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactdetaildefinitionsaverequest-members.html b/doc/html/qcontactdetaildefinitionsaverequest-members.html index d3667959a9..5ace5dc023 100644 --- a/doc/html/qcontactdetaildefinitionsaverequest-members.html +++ b/doc/html/qcontactdetaildefinitionsaverequest-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactdetaildefinitionsaverequest.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QContactDetailDefinitionSaveRequest</title> + <title>Qt Mobility Project 1.1: List of All Members for QContactDetailDefinitionSaveRequest</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -90,8 +90,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactdetaildefinitionsaverequest.html b/doc/html/qcontactdetaildefinitionsaverequest.html index 319d0c9379..2243c8356e 100644 --- a/doc/html/qcontactdetaildefinitionsaverequest.html +++ b/doc/html/qcontactdetaildefinitionsaverequest.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactdetaildefinitionsaverequest.cpp --> <head> - <title>Qt Mobility Project 1.0: QContactDetailDefinitionSaveRequest Class Reference</title> + <title>Qt Mobility Project 1.1: QContactDetailDefinitionSaveRequest Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -82,8 +82,8 @@ <p>See also <a href="qcontactdetaildefinitionsaverequest.html#definitions">definitions</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactdetailfielddefinition-members.html b/doc/html/qcontactdetailfielddefinition-members.html index b9ff2acd93..ac9e0a5a04 100644 --- a/doc/html/qcontactdetailfielddefinition-members.html +++ b/doc/html/qcontactdetailfielddefinition-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactdetailfielddefinition.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QContactDetailFieldDefinition</title> + <title>Qt Mobility Project 1.1: List of All Members for QContactDetailFieldDefinition</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -28,8 +28,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactdetailfielddefinition.html b/doc/html/qcontactdetailfielddefinition.html index c1f82fd87d..a45d6da9a4 100644 --- a/doc/html/qcontactdetailfielddefinition.html +++ b/doc/html/qcontactdetailfielddefinition.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactdetailfielddefinition.cpp --> <head> - <title>Qt Mobility Project 1.0: QContactDetailFieldDefinition Class Reference</title> + <title>Qt Mobility Project 1.1: QContactDetailFieldDefinition Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -75,8 +75,8 @@ <p>Returns true if the allowable values and data type of the <i>other</i> field are equal to those of this field</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactdetailfilter-members.html b/doc/html/qcontactdetailfilter-members.html index f058c7cc64..5889cdc7d3 100644 --- a/doc/html/qcontactdetailfilter-members.html +++ b/doc/html/qcontactdetailfilter-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactdetailfilter.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QContactDetailFilter</title> + <title>Qt Mobility Project 1.1: List of All Members for QContactDetailFilter</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -39,8 +39,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactdetailfilter.html b/doc/html/qcontactdetailfilter.html index 0ec57da667..ee34a02f3e 100644 --- a/doc/html/qcontactdetailfilter.html +++ b/doc/html/qcontactdetailfilter.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactdetailfilter.cpp --> <head> - <title>Qt Mobility Project 1.0: QContactDetailFilter Class Reference</title> + <title>Qt Mobility Project 1.1: QContactDetailFilter Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -78,8 +78,8 @@ <p>See also <a href="qcontactdetailfilter.html#setValue">setValue</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactdetailrangefilter-members.html b/doc/html/qcontactdetailrangefilter-members.html index c3d12dac41..4612d5615d 100644 --- a/doc/html/qcontactdetailrangefilter-members.html +++ b/doc/html/qcontactdetailrangefilter-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactdetailrangefilter.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QContactDetailRangeFilter</title> + <title>Qt Mobility Project 1.1: List of All Members for QContactDetailRangeFilter</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -43,8 +43,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactdetailrangefilter.html b/doc/html/qcontactdetailrangefilter.html index 23053dc94a..91abf618c1 100644 --- a/doc/html/qcontactdetailrangefilter.html +++ b/doc/html/qcontactdetailrangefilter.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactdetailrangefilter.cpp --> <head> - <title>Qt Mobility Project 1.0: QContactDetailRangeFilter Class Reference</title> + <title>Qt Mobility Project 1.1: QContactDetailRangeFilter Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -113,8 +113,8 @@ <p>See also <a href="qcontactdetailrangefilter.html#minValue">minValue</a>() and <a href="qcontactdetailrangefilter.html#maxValue">maxValue</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactdisplaylabel-members.html b/doc/html/qcontactdisplaylabel-members.html index 1f2ed78796..b11d9cd91d 100644 --- a/doc/html/qcontactdisplaylabel-members.html +++ b/doc/html/qcontactdisplaylabel-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactdetails.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QContactDisplayLabel</title> + <title>Qt Mobility Project 1.1: List of All Members for QContactDisplayLabel</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -63,8 +63,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactdisplaylabel.html b/doc/html/qcontactdisplaylabel.html index bbb844f99f..c074967bbc 100644 --- a/doc/html/qcontactdisplaylabel.html +++ b/doc/html/qcontactdisplaylabel.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactdetails.cpp --> <head> - <title>Qt Mobility Project 1.0: QContactDisplayLabel Class Reference</title> + <title>Qt Mobility Project 1.1: QContactDisplayLabel Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -59,8 +59,8 @@ <p>See also <a href="qcontactdisplaylabel.html#label">label</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactemailaddress-members.html b/doc/html/qcontactemailaddress-members.html index 70ede415d8..cc4bc213bc 100644 --- a/doc/html/qcontactemailaddress-members.html +++ b/doc/html/qcontactemailaddress-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactdetails.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QContactEmailAddress</title> + <title>Qt Mobility Project 1.1: List of All Members for QContactEmailAddress</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -64,8 +64,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactemailaddress.html b/doc/html/qcontactemailaddress.html index 52ee9d88c8..72153b2a0e 100644 --- a/doc/html/qcontactemailaddress.html +++ b/doc/html/qcontactemailaddress.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactdetails.cpp --> <head> - <title>Qt Mobility Project 1.0: QContactEmailAddress Class Reference</title> + <title>Qt Mobility Project 1.1: QContactEmailAddress Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -65,8 +65,8 @@ <p>See also <a href="qcontactemailaddress.html#emailAddress">emailAddress</a>() and <a href="qcontactemailaddress.html#setEmailAddress">setEmailAddress</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactfamily-members.html b/doc/html/qcontactfamily-members.html index c3f3f7b666..d05674377d 100644 --- a/doc/html/qcontactfamily-members.html +++ b/doc/html/qcontactfamily-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactdetails.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QContactFamily</title> + <title>Qt Mobility Project 1.1: List of All Members for QContactFamily</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -66,8 +66,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactfamily.html b/doc/html/qcontactfamily.html index f79e84bd4a..0008904c35 100644 --- a/doc/html/qcontactfamily.html +++ b/doc/html/qcontactfamily.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactdetails.cpp --> <head> - <title>Qt Mobility Project 1.0: QContactFamily Class Reference</title> + <title>Qt Mobility Project 1.1: QContactFamily Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -76,8 +76,8 @@ <p>See also <a href="qcontactfamily.html#spouse">spouse</a>() and <a href="qcontactfamily.html#setSpouse">setSpouse</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactfetchhint-members.html b/doc/html/qcontactfetchhint-members.html index 0c6b715670..6fe8005fe1 100644 --- a/doc/html/qcontactfetchhint-members.html +++ b/doc/html/qcontactfetchhint-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactfetchhint.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QContactFetchHint</title> + <title>Qt Mobility Project 1.1: List of All Members for QContactFetchHint</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -30,8 +30,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactfetchhint.html b/doc/html/qcontactfetchhint.html index 6a8f9d51e0..5488e8675f 100644 --- a/doc/html/qcontactfetchhint.html +++ b/doc/html/qcontactfetchhint.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactfetchhint.cpp --> <head> - <title>Qt Mobility Project 1.0: QContactFetchHint Class Reference</title> + <title>Qt Mobility Project 1.1: QContactFetchHint Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -108,8 +108,8 @@ <p>Assigns this fetch hint to be equal to the <i>other</i> fetch hint</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactfetchrequest-members.html b/doc/html/qcontactfetchrequest-members.html index 11c053668e..b4c1da8405 100644 --- a/doc/html/qcontactfetchrequest-members.html +++ b/doc/html/qcontactfetchrequest-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactfetchrequest.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QContactFetchRequest</title> + <title>Qt Mobility Project 1.1: List of All Members for QContactFetchRequest</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -91,8 +91,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactfetchrequest.html b/doc/html/qcontactfetchrequest.html index 2622199e58..47b07de758 100644 --- a/doc/html/qcontactfetchrequest.html +++ b/doc/html/qcontactfetchrequest.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactfetchrequest.cpp --> <head> - <title>Qt Mobility Project 1.0: QContactFetchRequest Class Reference</title> + <title>Qt Mobility Project 1.1: QContactFetchRequest Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -87,8 +87,8 @@ <p>See also <a href="qcontactfetchrequest.html#setSorting">setSorting</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactfilter-members.html b/doc/html/qcontactfilter-members.html index 7d6751228b..ed76c9a9a7 100644 --- a/doc/html/qcontactfilter-members.html +++ b/doc/html/qcontactfilter-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactfilter.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QContactFilter</title> + <title>Qt Mobility Project 1.1: List of All Members for QContactFilter</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -29,8 +29,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactfilter.html b/doc/html/qcontactfilter.html index 652e72c350..595535d94b 100644 --- a/doc/html/qcontactfilter.html +++ b/doc/html/qcontactfilter.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactfilter.cpp --> <head> - <title>Qt Mobility Project 1.0: QContactFilter Class Reference</title> + <title>Qt Mobility Project 1.1: QContactFilter Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -135,8 +135,8 @@ <p>See also <a href="qcontactunionfilter.html">QContactUnionFilter</a>.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactgender-members.html b/doc/html/qcontactgender-members.html index b4aa0e65c6..7df56eeff5 100644 --- a/doc/html/qcontactgender-members.html +++ b/doc/html/qcontactgender-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactdetails.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QContactGender</title> + <title>Qt Mobility Project 1.1: List of All Members for QContactGender</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -66,8 +66,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactgender.html b/doc/html/qcontactgender.html index c501442dbc..bcef0c98e7 100644 --- a/doc/html/qcontactgender.html +++ b/doc/html/qcontactgender.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactdetails.cpp --> <head> - <title>Qt Mobility Project 1.0: QContactGender Class Reference</title> + <title>Qt Mobility Project 1.1: QContactGender Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -73,8 +73,8 @@ <p>The value that identifies this contact as being of unspecified gender.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactgeolocation-members.html b/doc/html/qcontactgeolocation-members.html index 8f1a066415..81554a008d 100644 --- a/doc/html/qcontactgeolocation-members.html +++ b/doc/html/qcontactgeolocation-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactdetails.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QContactGeoLocation</title> + <title>Qt Mobility Project 1.1: List of All Members for QContactGeoLocation</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -87,8 +87,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactgeolocation.html b/doc/html/qcontactgeolocation.html index 828c21daf5..d08799956a 100644 --- a/doc/html/qcontactgeolocation.html +++ b/doc/html/qcontactgeolocation.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactdetails.cpp --> <head> - <title>Qt Mobility Project 1.0: QContactGeoLocation Class Reference</title> + <title>Qt Mobility Project 1.1: QContactGeoLocation Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -181,8 +181,8 @@ <p>See also <a href="qcontactgeolocation.html#timestamp">timestamp</a>() and <a href="qcontactgeolocation.html#setTimestamp">setTimestamp</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactglobalpresence-members.html b/doc/html/qcontactglobalpresence-members.html index 33923109b1..5b6360951b 100644 --- a/doc/html/qcontactglobalpresence-members.html +++ b/doc/html/qcontactglobalpresence-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactdetails.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QContactGlobalPresence</title> + <title>Qt Mobility Project 1.1: List of All Members for QContactGlobalPresence</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -78,8 +78,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactglobalpresence.html b/doc/html/qcontactglobalpresence.html index e7995673b4..d5375c95cd 100644 --- a/doc/html/qcontactglobalpresence.html +++ b/doc/html/qcontactglobalpresence.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactdetails.cpp --> <head> - <title>Qt Mobility Project 1.0: QContactGlobalPresence Class Reference</title> + <title>Qt Mobility Project 1.1: QContactGlobalPresence Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -136,8 +136,8 @@ <p>See also <a href="qcontactglobalpresence.html#setTimestamp">setTimestamp</a>() and <a href="qcontactglobalpresence.html#timestamp">timestamp</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactguid-members.html b/doc/html/qcontactguid-members.html index e19c22137e..04454afd54 100644 --- a/doc/html/qcontactguid-members.html +++ b/doc/html/qcontactguid-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactdetails.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QContactGuid</title> + <title>Qt Mobility Project 1.1: List of All Members for QContactGuid</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -63,8 +63,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactguid.html b/doc/html/qcontactguid.html index 8256d41054..cf368ab9cd 100644 --- a/doc/html/qcontactguid.html +++ b/doc/html/qcontactguid.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactdetails.cpp --> <head> - <title>Qt Mobility Project 1.0: QContactGuid Class Reference</title> + <title>Qt Mobility Project 1.1: QContactGuid Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -61,8 +61,8 @@ <p>See also <a href="qcontactguid.html#guid">guid</a>() and <a href="qcontactguid.html#setGuid">setGuid</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactid-members.html b/doc/html/qcontactid-members.html index e4298df2a3..52215649f0 100644 --- a/doc/html/qcontactid-members.html +++ b/doc/html/qcontactid-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactid.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QContactId</title> + <title>Qt Mobility Project 1.1: List of All Members for QContactId</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -29,8 +29,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactid.html b/doc/html/qcontactid.html index 2e4b8973c8..9451002678 100644 --- a/doc/html/qcontactid.html +++ b/doc/html/qcontactid.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactid.cpp --> <head> - <title>Qt Mobility Project 1.0: QContactId Class Reference</title> + <title>Qt Mobility Project 1.1: QContactId Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -97,8 +97,8 @@ <p>See also <a href="qcontactid.html">QContactId</a>.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactintersectionfilter-members.html b/doc/html/qcontactintersectionfilter-members.html index df46645cc8..3114d93edb 100644 --- a/doc/html/qcontactintersectionfilter-members.html +++ b/doc/html/qcontactintersectionfilter-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactintersectionfilter.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QContactIntersectionFilter</title> + <title>Qt Mobility Project 1.1: List of All Members for QContactIntersectionFilter</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -38,8 +38,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactintersectionfilter.html b/doc/html/qcontactintersectionfilter.html index 5c0857905e..f6a759fa55 100644 --- a/doc/html/qcontactintersectionfilter.html +++ b/doc/html/qcontactintersectionfilter.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactintersectionfilter.cpp --> <head> - <title>Qt Mobility Project 1.0: QContactIntersectionFilter Class Reference</title> + <title>Qt Mobility Project 1.1: QContactIntersectionFilter Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -73,8 +73,8 @@ <p>See also <a href="qcontactintersectionfilter.html#append">append</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactinvalidengine-members.html b/doc/html/qcontactinvalidengine-members.html index a4b5e63dc2..593b974111 100644 --- a/doc/html/qcontactinvalidengine-members.html +++ b/doc/html/qcontactinvalidengine-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactinvalidbackend.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QContactInvalidEngine</title> + <title>Qt Mobility Project 1.1: List of All Members for QContactInvalidEngine</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -131,8 +131,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactinvalidengine.html b/doc/html/qcontactinvalidengine.html index 2f7f800bc2..7e47c24480 100644 --- a/doc/html/qcontactinvalidengine.html +++ b/doc/html/qcontactinvalidengine.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactinvalidbackend.cpp --> <head> - <title>Qt Mobility Project 1.0: QContactInvalidEngine Class Reference</title> + <title>Qt Mobility Project 1.1: QContactInvalidEngine Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -62,8 +62,8 @@ <p>Reimplemented from <a href="qcontactmanagerengine.html#managerName">QContactManagerEngine::managerName</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactinvalidfilter-members.html b/doc/html/qcontactinvalidfilter-members.html index f12e6f24fc..ae6abed1bf 100644 --- a/doc/html/qcontactinvalidfilter-members.html +++ b/doc/html/qcontactinvalidfilter-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactinvalidfilter.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QContactInvalidFilter</title> + <title>Qt Mobility Project 1.1: List of All Members for QContactInvalidFilter</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -28,8 +28,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactinvalidfilter.html b/doc/html/qcontactinvalidfilter.html index 5006a54952..b886c7ebbe 100644 --- a/doc/html/qcontactinvalidfilter.html +++ b/doc/html/qcontactinvalidfilter.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactinvalidfilter.cpp --> <head> - <title>Qt Mobility Project 1.0: QContactInvalidFilter Class Reference</title> + <title>Qt Mobility Project 1.1: QContactInvalidFilter Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -43,8 +43,8 @@ <p>Constructs a new invalid filter, ignoring the <i>other</i> filter</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactlocalidfetchrequest-members.html b/doc/html/qcontactlocalidfetchrequest-members.html index 25569f21b2..545a657911 100644 --- a/doc/html/qcontactlocalidfetchrequest-members.html +++ b/doc/html/qcontactlocalidfetchrequest-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactlocalidfetchrequest.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QContactLocalIdFetchRequest</title> + <title>Qt Mobility Project 1.1: List of All Members for QContactLocalIdFetchRequest</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -89,8 +89,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactlocalidfetchrequest.html b/doc/html/qcontactlocalidfetchrequest.html index 0f97b77ea3..9e3d476ea0 100644 --- a/doc/html/qcontactlocalidfetchrequest.html +++ b/doc/html/qcontactlocalidfetchrequest.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactlocalidfetchrequest.cpp --> <head> - <title>Qt Mobility Project 1.0: QContactLocalIdFetchRequest Class Reference</title> + <title>Qt Mobility Project 1.1: QContactLocalIdFetchRequest Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -77,8 +77,8 @@ <p>See also <a href="qcontactlocalidfetchrequest.html#setSorting">setSorting</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactlocalidfilter-members.html b/doc/html/qcontactlocalidfilter-members.html index 2ab72c8ca5..7eec76ac17 100644 --- a/doc/html/qcontactlocalidfilter-members.html +++ b/doc/html/qcontactlocalidfilter-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactlocalidfilter.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QContactLocalIdFilter</title> + <title>Qt Mobility Project 1.1: List of All Members for QContactLocalIdFilter</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -30,8 +30,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactlocalidfilter.html b/doc/html/qcontactlocalidfilter.html index 6b5230914e..2b01717d61 100644 --- a/doc/html/qcontactlocalidfilter.html +++ b/doc/html/qcontactlocalidfilter.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactlocalidfilter.cpp --> <head> - <title>Qt Mobility Project 1.0: QContactLocalIdFilter Class Reference</title> + <title>Qt Mobility Project 1.1: QContactLocalIdFilter Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -53,8 +53,8 @@ <p>See also <a href="qcontactlocalidfilter.html#ids">ids</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactmanager-members.html b/doc/html/qcontactmanager-members.html index 2e371b237e..7553bc659c 100644 --- a/doc/html/qcontactmanager-members.html +++ b/doc/html/qcontactmanager-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactmanager.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QContactManager</title> + <title>Qt Mobility Project 1.1: List of All Members for QContactManager</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -118,8 +118,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactmanager.html b/doc/html/qcontactmanager.html index 05cf0c671b..214dd561f7 100644 --- a/doc/html/qcontactmanager.html +++ b/doc/html/qcontactmanager.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactmanager.cpp --> <head> - <title>Qt Mobility Project 1.0: QContactManager Class Reference</title> + <title>Qt Mobility Project 1.1: QContactManager Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -371,8 +371,8 @@ <p>See also <a href="qcontactmanager.html#synthesizeContactDisplayLabel">synthesizeContactDisplayLabel</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactmanagerengine-members.html b/doc/html/qcontactmanagerengine-members.html index 380f208734..0ea615406d 100644 --- a/doc/html/qcontactmanagerengine-members.html +++ b/doc/html/qcontactmanagerengine-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactmanagerengine.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QContactManagerEngine</title> + <title>Qt Mobility Project 1.1: List of All Members for QContactManagerEngine</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -131,8 +131,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactmanagerengine.html b/doc/html/qcontactmanagerengine.html index 77ba4eb627..59f81c80c7 100644 --- a/doc/html/qcontactmanagerengine.html +++ b/doc/html/qcontactmanagerengine.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactmanagerengine.cpp --> <head> - <title>Qt Mobility Project 1.0: QContactManagerEngine Class Reference</title> + <title>Qt Mobility Project 1.1: QContactManagerEngine Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -418,8 +418,8 @@ <p>See also <a href="qcontactmanagerengine.html#startRequest">startRequest</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactmanagerenginefactory-members.html b/doc/html/qcontactmanagerenginefactory-members.html index 10662aa114..af83dab6e4 100644 --- a/doc/html/qcontactmanagerenginefactory-members.html +++ b/doc/html/qcontactmanagerenginefactory-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactmanagerenginefactory.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QContactManagerEngineFactory</title> + <title>Qt Mobility Project 1.1: List of All Members for QContactManagerEngineFactory</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -22,8 +22,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactmanagerenginefactory.html b/doc/html/qcontactmanagerenginefactory.html index 3e97dfd65c..e01d731d0a 100644 --- a/doc/html/qcontactmanagerenginefactory.html +++ b/doc/html/qcontactmanagerenginefactory.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactmanagerenginefactory.cpp --> <head> - <title>Qt Mobility Project 1.0: QContactManagerEngineFactory Class Reference</title> + <title>Qt Mobility Project 1.1: QContactManagerEngineFactory Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -53,8 +53,8 @@ <p>This function should return a list of versions of the engine which this factory can instantiate.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactmemoryengine-members.html b/doc/html/qcontactmemoryengine-members.html index f730491047..09878af93a 100644 --- a/doc/html/qcontactmemoryengine-members.html +++ b/doc/html/qcontactmemoryengine-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactmemorybackend.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QContactMemoryEngine</title> + <title>Qt Mobility Project 1.1: List of All Members for QContactMemoryEngine</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -133,8 +133,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactmemoryengine.html b/doc/html/qcontactmemoryengine.html index 5decf3896b..e118156678 100644 --- a/doc/html/qcontactmemoryengine.html +++ b/doc/html/qcontactmemoryengine.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactmemorybackend.cpp --> <head> - <title>Qt Mobility Project 1.0: QContactMemoryEngine Class Reference</title> + <title>Qt Mobility Project 1.1: QContactMemoryEngine Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -161,8 +161,8 @@ <p>Reimplemented from <a href="qcontactmanagerengine.html#waitForRequestFinished">QContactManagerEngine::waitForRequestFinished</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactname-members.html b/doc/html/qcontactname-members.html index b1c449b3d8..04917c4c11 100644 --- a/doc/html/qcontactname-members.html +++ b/doc/html/qcontactname-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactdetails.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QContactName</title> + <title>Qt Mobility Project 1.1: List of All Members for QContactName</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -80,8 +80,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactname.html b/doc/html/qcontactname.html index 25fac82cf6..92934e5240 100644 --- a/doc/html/qcontactname.html +++ b/doc/html/qcontactname.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactdetails.cpp --> <head> - <title>Qt Mobility Project 1.0: QContactName Class Reference</title> + <title>Qt Mobility Project 1.1: QContactName Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -143,8 +143,8 @@ <p>See also <a href="qcontactname.html#suffix">suffix</a>() and <a href="qcontactname.html#setSuffix">setSuffix</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactnickname-members.html b/doc/html/qcontactnickname-members.html index d53d7a1544..5fcabcfc21 100644 --- a/doc/html/qcontactnickname-members.html +++ b/doc/html/qcontactnickname-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactdetails.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QContactNickname</title> + <title>Qt Mobility Project 1.1: List of All Members for QContactNickname</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -63,8 +63,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactnickname.html b/doc/html/qcontactnickname.html index 94e4dc7d60..53bf708a47 100644 --- a/doc/html/qcontactnickname.html +++ b/doc/html/qcontactnickname.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactdetails.cpp --> <head> - <title>Qt Mobility Project 1.0: QContactNickname Class Reference</title> + <title>Qt Mobility Project 1.1: QContactNickname Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -61,8 +61,8 @@ <p>See also <a href="qcontactnickname.html#nickname">nickname</a>() and <a href="qcontactnickname.html#setNickname">setNickname</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactnote-members.html b/doc/html/qcontactnote-members.html index 8def1f3f7a..aac18f6917 100644 --- a/doc/html/qcontactnote-members.html +++ b/doc/html/qcontactnote-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactdetails.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QContactNote</title> + <title>Qt Mobility Project 1.1: List of All Members for QContactNote</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -63,8 +63,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactnote.html b/doc/html/qcontactnote.html index 8953c85812..0f2d9e78dd 100644 --- a/doc/html/qcontactnote.html +++ b/doc/html/qcontactnote.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactdetails.cpp --> <head> - <title>Qt Mobility Project 1.0: QContactNote Class Reference</title> + <title>Qt Mobility Project 1.1: QContactNote Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -61,8 +61,8 @@ <p>See also <a href="qcontactnote.html#note">note</a>() and <a href="qcontactnote.html#setNote">setNote</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactonlineaccount-members.html b/doc/html/qcontactonlineaccount-members.html index 8c1b4e10fe..5971e6fff5 100644 --- a/doc/html/qcontactonlineaccount-members.html +++ b/doc/html/qcontactonlineaccount-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactdetails.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QContactOnlineAccount</title> + <title>Qt Mobility Project 1.1: List of All Members for QContactOnlineAccount</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -77,8 +77,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactonlineaccount.html b/doc/html/qcontactonlineaccount.html index e0406f756f..a119af95f7 100644 --- a/doc/html/qcontactonlineaccount.html +++ b/doc/html/qcontactonlineaccount.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactdetails.cpp --> <head> - <title>Qt Mobility Project 1.0: QContactOnlineAccount Class Reference</title> + <title>Qt Mobility Project 1.1: QContactOnlineAccount Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -132,8 +132,8 @@ <p>See also <a href="qcontactonlineaccount.html#subTypes">subTypes</a>() and <a href="qcontactonlineaccount.html#setSubTypes">setSubTypes</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactorganization-members.html b/doc/html/qcontactorganization-members.html index 496d516756..764179fa53 100644 --- a/doc/html/qcontactorganization-members.html +++ b/doc/html/qcontactorganization-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactdetails.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QContactOrganization</title> + <title>Qt Mobility Project 1.1: List of All Members for QContactOrganization</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -81,8 +81,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactorganization.html b/doc/html/qcontactorganization.html index 541fa956af..fb58fdfd85 100644 --- a/doc/html/qcontactorganization.html +++ b/doc/html/qcontactorganization.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactdetails.cpp --> <head> - <title>Qt Mobility Project 1.0: QContactOrganization Class Reference</title> + <title>Qt Mobility Project 1.1: QContactOrganization Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -151,8 +151,8 @@ <p>See also <a href="qcontactorganization.html#title">title</a>() and <a href="qcontactorganization.html#setTitle">setTitle</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactphonenumber-members.html b/doc/html/qcontactphonenumber-members.html index cef09b3055..b9765ec77f 100644 --- a/doc/html/qcontactphonenumber-members.html +++ b/doc/html/qcontactphonenumber-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactdetails.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QContactPhoneNumber</title> + <title>Qt Mobility Project 1.1: List of All Members for QContactPhoneNumber</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -80,8 +80,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactphonenumber.html b/doc/html/qcontactphonenumber.html index 517ce63afc..62b65dbb0b 100644 --- a/doc/html/qcontactphonenumber.html +++ b/doc/html/qcontactphonenumber.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactdetails.cpp --> <head> - <title>Qt Mobility Project 1.0: QContactPhoneNumber Class Reference</title> + <title>Qt Mobility Project 1.1: QContactPhoneNumber Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -143,8 +143,8 @@ <p>See also <a href="qcontactphonenumber.html#subTypes">subTypes</a>() and <a href="qcontactphonenumber.html#setSubTypes">setSubTypes</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactpresence-members.html b/doc/html/qcontactpresence-members.html index 7e2ac1e3cb..8c0bc1d214 100644 --- a/doc/html/qcontactpresence-members.html +++ b/doc/html/qcontactpresence-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactdetails.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QContactPresence</title> + <title>Qt Mobility Project 1.1: List of All Members for QContactPresence</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -79,8 +79,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactpresence.html b/doc/html/qcontactpresence.html index 65af8a9dab..a8c00defd1 100644 --- a/doc/html/qcontactpresence.html +++ b/doc/html/qcontactpresence.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactdetails.cpp --> <head> - <title>Qt Mobility Project 1.0: QContactPresence Class Reference</title> + <title>Qt Mobility Project 1.1: QContactPresence Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -167,8 +167,8 @@ <p>See also <a href="qcontactpresence.html#setTimestamp">setTimestamp</a>() and <a href="qcontactpresence.html#timestamp">timestamp</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactrelationship-members.html b/doc/html/qcontactrelationship-members.html index 307390c796..d18ca5741c 100644 --- a/doc/html/qcontactrelationship-members.html +++ b/doc/html/qcontactrelationship-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactrelationship.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QContactRelationship</title> + <title>Qt Mobility Project 1.1: List of All Members for QContactRelationship</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -42,8 +42,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactrelationship.html b/doc/html/qcontactrelationship.html index 4cb17a0e6b..119a5d34cd 100644 --- a/doc/html/qcontactrelationship.html +++ b/doc/html/qcontactrelationship.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactrelationship.cpp --> <head> - <title>Qt Mobility Project 1.0: QContactRelationship Class Reference</title> + <title>Qt Mobility Project 1.1: QContactRelationship Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -139,8 +139,8 @@ <p>The relationship type which identifies the first contact as being the same contact as the second contact</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactrelationshipfetchrequest-members.html b/doc/html/qcontactrelationshipfetchrequest-members.html index 05b87b9a6c..b4db374cfe 100644 --- a/doc/html/qcontactrelationshipfetchrequest-members.html +++ b/doc/html/qcontactrelationshipfetchrequest-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactrelationshipfetchrequest.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QContactRelationshipFetchRequest</title> + <title>Qt Mobility Project 1.1: List of All Members for QContactRelationshipFetchRequest</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -91,8 +91,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactrelationshipfetchrequest.html b/doc/html/qcontactrelationshipfetchrequest.html index cc7944b845..6ddc4d6ba1 100644 --- a/doc/html/qcontactrelationshipfetchrequest.html +++ b/doc/html/qcontactrelationshipfetchrequest.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactrelationshipfetchrequest.cpp --> <head> - <title>Qt Mobility Project 1.0: QContactRelationshipFetchRequest Class Reference</title> + <title>Qt Mobility Project 1.1: QContactRelationshipFetchRequest Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -87,8 +87,8 @@ <p>See also <a href="qcontactrelationshipfetchrequest.html#second">second</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactrelationshipfilter-members.html b/doc/html/qcontactrelationshipfilter-members.html index c8ecde6e29..b2a7d43281 100644 --- a/doc/html/qcontactrelationshipfilter-members.html +++ b/doc/html/qcontactrelationshipfilter-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactrelationshipfilter.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QContactRelationshipFilter</title> + <title>Qt Mobility Project 1.1: List of All Members for QContactRelationshipFilter</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -38,8 +38,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactrelationshipfilter.html b/doc/html/qcontactrelationshipfilter.html index e33a0f910b..87f44b43b8 100644 --- a/doc/html/qcontactrelationshipfilter.html +++ b/doc/html/qcontactrelationshipfilter.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactrelationshipfilter.cpp --> <head> - <title>Qt Mobility Project 1.0: QContactRelationshipFilter Class Reference</title> + <title>Qt Mobility Project 1.1: QContactRelationshipFilter Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -83,8 +83,8 @@ <p>See also <a href="qcontactrelationshipfilter.html#relationshipType">relationshipType</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactrelationshipremoverequest-members.html b/doc/html/qcontactrelationshipremoverequest-members.html index 67e8464092..b5a311d7af 100644 --- a/doc/html/qcontactrelationshipremoverequest-members.html +++ b/doc/html/qcontactrelationshipremoverequest-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactrelationshipremoverequest.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QContactRelationshipRemoveRequest</title> + <title>Qt Mobility Project 1.1: List of All Members for QContactRelationshipRemoveRequest</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -88,8 +88,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactrelationshipremoverequest.html b/doc/html/qcontactrelationshipremoverequest.html index f0e36dfe9f..cbda49f545 100644 --- a/doc/html/qcontactrelationshipremoverequest.html +++ b/doc/html/qcontactrelationshipremoverequest.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactrelationshipremoverequest.cpp --> <head> - <title>Qt Mobility Project 1.0: QContactRelationshipRemoveRequest Class Reference</title> + <title>Qt Mobility Project 1.1: QContactRelationshipRemoveRequest Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -72,8 +72,8 @@ <p>See also <a href="qcontactrelationshipremoverequest.html#relationships">relationships</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactrelationshipsaverequest-members.html b/doc/html/qcontactrelationshipsaverequest-members.html index 935ef9c7b1..2ec368e5f4 100644 --- a/doc/html/qcontactrelationshipsaverequest-members.html +++ b/doc/html/qcontactrelationshipsaverequest-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactrelationshipsaverequest.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QContactRelationshipSaveRequest</title> + <title>Qt Mobility Project 1.1: List of All Members for QContactRelationshipSaveRequest</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -88,8 +88,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactrelationshipsaverequest.html b/doc/html/qcontactrelationshipsaverequest.html index 7bda55903d..7186928db9 100644 --- a/doc/html/qcontactrelationshipsaverequest.html +++ b/doc/html/qcontactrelationshipsaverequest.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactrelationshipsaverequest.cpp --> <head> - <title>Qt Mobility Project 1.0: QContactRelationshipSaveRequest Class Reference</title> + <title>Qt Mobility Project 1.1: QContactRelationshipSaveRequest Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -72,8 +72,8 @@ <p>See also <a href="qcontactrelationshipsaverequest.html#relationships">relationships</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactremoverequest-members.html b/doc/html/qcontactremoverequest-members.html index 5990186669..5919e46252 100644 --- a/doc/html/qcontactremoverequest-members.html +++ b/doc/html/qcontactremoverequest-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactremoverequest.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QContactRemoveRequest</title> + <title>Qt Mobility Project 1.1: List of All Members for QContactRemoveRequest</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -88,8 +88,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactremoverequest.html b/doc/html/qcontactremoverequest.html index fae26119a8..d731edd572 100644 --- a/doc/html/qcontactremoverequest.html +++ b/doc/html/qcontactremoverequest.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactremoverequest.cpp --> <head> - <title>Qt Mobility Project 1.0: QContactRemoveRequest Class Reference</title> + <title>Qt Mobility Project 1.1: QContactRemoveRequest Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -72,8 +72,8 @@ <p>See also <a href="qcontactremoverequest.html#contactIds">contactIds</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactringtone-members.html b/doc/html/qcontactringtone-members.html index f939ca4c83..138324023d 100644 --- a/doc/html/qcontactringtone-members.html +++ b/doc/html/qcontactringtone-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactdetails.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QContactRingtone</title> + <title>Qt Mobility Project 1.1: List of All Members for QContactRingtone</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -69,8 +69,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactringtone.html b/doc/html/qcontactringtone.html index b0c79a9619..f481107950 100644 --- a/doc/html/qcontactringtone.html +++ b/doc/html/qcontactringtone.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactdetails.cpp --> <head> - <title>Qt Mobility Project 1.0: QContactRingtone Class Reference</title> + <title>Qt Mobility Project 1.1: QContactRingtone Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -91,8 +91,8 @@ <p>See also <a href="qcontactringtone.html#setVideoRingtoneUrl">setVideoRingtoneUrl</a>() and <a href="qcontactringtone.html#videoRingtoneUrl">videoRingtoneUrl</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactsaverequest-members.html b/doc/html/qcontactsaverequest-members.html index f7c76de1e5..6c92eef47c 100644 --- a/doc/html/qcontactsaverequest-members.html +++ b/doc/html/qcontactsaverequest-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactsaverequest.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QContactSaveRequest</title> + <title>Qt Mobility Project 1.1: List of All Members for QContactSaveRequest</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -88,8 +88,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactsaverequest.html b/doc/html/qcontactsaverequest.html index cafb89d02f..0f579d680d 100644 --- a/doc/html/qcontactsaverequest.html +++ b/doc/html/qcontactsaverequest.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactsaverequest.cpp --> <head> - <title>Qt Mobility Project 1.0: QContactSaveRequest Class Reference</title> + <title>Qt Mobility Project 1.1: QContactSaveRequest Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -72,8 +72,8 @@ <p>See also <a href="qcontactsaverequest.html#contacts">contacts</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactsortorder-members.html b/doc/html/qcontactsortorder-members.html index 6d368b087b..7e09c8530b 100644 --- a/doc/html/qcontactsortorder-members.html +++ b/doc/html/qcontactsortorder-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactsortorder.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QContactSortOrder</title> + <title>Qt Mobility Project 1.1: List of All Members for QContactSortOrder</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -40,8 +40,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactsortorder.html b/doc/html/qcontactsortorder.html index 37319a2d25..437932126a 100644 --- a/doc/html/qcontactsortorder.html +++ b/doc/html/qcontactsortorder.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactsortorder.cpp --> <head> - <title>Qt Mobility Project 1.0: QContactSortOrder Class Reference</title> + <title>Qt Mobility Project 1.1: QContactSortOrder Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -127,8 +127,8 @@ <p>See also <a href="qcontactsortorder.html#operator-not-eq">operator!=</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactsynctarget-members.html b/doc/html/qcontactsynctarget-members.html index 276efd6915..d3bad006f8 100644 --- a/doc/html/qcontactsynctarget-members.html +++ b/doc/html/qcontactsynctarget-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactdetails.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QContactSyncTarget</title> + <title>Qt Mobility Project 1.1: List of All Members for QContactSyncTarget</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -63,8 +63,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactsynctarget.html b/doc/html/qcontactsynctarget.html index 08a06cd24f..c7c9d0b1ab 100644 --- a/doc/html/qcontactsynctarget.html +++ b/doc/html/qcontactsynctarget.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactdetails.cpp --> <head> - <title>Qt Mobility Project 1.0: QContactSyncTarget Class Reference</title> + <title>Qt Mobility Project 1.1: QContactSyncTarget Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -61,8 +61,8 @@ <p>See also <a href="qcontactsynctarget.html#syncTarget">syncTarget</a>() and <a href="qcontactsynctarget.html#setSyncTarget">setSyncTarget</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontacttag-members.html b/doc/html/qcontacttag-members.html index 6f800c1012..14a76144fe 100644 --- a/doc/html/qcontacttag-members.html +++ b/doc/html/qcontacttag-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactdetails.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QContactTag</title> + <title>Qt Mobility Project 1.1: List of All Members for QContactTag</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -63,8 +63,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontacttag.html b/doc/html/qcontacttag.html index 4478eb0c99..5d99ec4431 100644 --- a/doc/html/qcontacttag.html +++ b/doc/html/qcontacttag.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactdetails.cpp --> <head> - <title>Qt Mobility Project 1.0: QContactTag Class Reference</title> + <title>Qt Mobility Project 1.1: QContactTag Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -61,8 +61,8 @@ <p>See also <a href="qcontacttag.html#tag">tag</a>() and <a href="qcontacttag.html#setTag">setTag</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactthumbnail-members.html b/doc/html/qcontactthumbnail-members.html index c17a797393..4a9de738ce 100644 --- a/doc/html/qcontactthumbnail-members.html +++ b/doc/html/qcontactthumbnail-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactdetails.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QContactThumbnail</title> + <title>Qt Mobility Project 1.1: List of All Members for QContactThumbnail</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -63,8 +63,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactthumbnail.html b/doc/html/qcontactthumbnail.html index 98d3861b61..e40d2b45fd 100644 --- a/doc/html/qcontactthumbnail.html +++ b/doc/html/qcontactthumbnail.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactdetails.cpp --> <head> - <title>Qt Mobility Project 1.0: QContactThumbnail Class Reference</title> + <title>Qt Mobility Project 1.1: QContactThumbnail Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -61,8 +61,8 @@ <p>See also <a href="qcontactthumbnail.html#thumbnail">thumbnail</a>() and <a href="qcontactthumbnail.html#setThumbnail">setThumbnail</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontacttimestamp-members.html b/doc/html/qcontacttimestamp-members.html index 47216f5171..a34406b4da 100644 --- a/doc/html/qcontacttimestamp-members.html +++ b/doc/html/qcontacttimestamp-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactdetails.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QContactTimestamp</title> + <title>Qt Mobility Project 1.1: List of All Members for QContactTimestamp</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -66,8 +66,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontacttimestamp.html b/doc/html/qcontacttimestamp.html index 9e6c3676c3..87667fd5d2 100644 --- a/doc/html/qcontacttimestamp.html +++ b/doc/html/qcontacttimestamp.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactdetails.cpp --> <head> - <title>Qt Mobility Project 1.0: QContactTimestamp Class Reference</title> + <title>Qt Mobility Project 1.1: QContactTimestamp Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -76,8 +76,8 @@ <p>See also <a href="qcontacttimestamp.html#lastModified">lastModified</a>() and <a href="qcontacttimestamp.html#setLastModified">setLastModified</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontacttype-members.html b/doc/html/qcontacttype-members.html index afb79916fb..49cef79e73 100644 --- a/doc/html/qcontacttype-members.html +++ b/doc/html/qcontacttype-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactdetails.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QContactType</title> + <title>Qt Mobility Project 1.1: List of All Members for QContactType</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -65,8 +65,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontacttype.html b/doc/html/qcontacttype.html index f9822a6ed5..403c4aed43 100644 --- a/doc/html/qcontacttype.html +++ b/doc/html/qcontacttype.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactdetails.cpp --> <head> - <title>Qt Mobility Project 1.0: QContactType Class Reference</title> + <title>Qt Mobility Project 1.1: QContactType Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -72,8 +72,8 @@ <p>See also <a href="qcontacttype.html#setType">setType</a>() and <a href="qcontacttype.html#type">type</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactunionfilter-members.html b/doc/html/qcontactunionfilter-members.html index 1adea5ffd8..be9c4f3f64 100644 --- a/doc/html/qcontactunionfilter-members.html +++ b/doc/html/qcontactunionfilter-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactunionfilter.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QContactUnionFilter</title> + <title>Qt Mobility Project 1.1: List of All Members for QContactUnionFilter</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -38,8 +38,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontactunionfilter.html b/doc/html/qcontactunionfilter.html index 30a134dc3c..1dc8cda991 100644 --- a/doc/html/qcontactunionfilter.html +++ b/doc/html/qcontactunionfilter.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactunionfilter.cpp --> <head> - <title>Qt Mobility Project 1.0: QContactUnionFilter Class Reference</title> + <title>Qt Mobility Project 1.1: QContactUnionFilter Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -73,8 +73,8 @@ <p>See also <a href="qcontactunionfilter.html#append">append</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontacturl-members.html b/doc/html/qcontacturl-members.html index f42390f2fe..fd489334d1 100644 --- a/doc/html/qcontacturl-members.html +++ b/doc/html/qcontacturl-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactdetails.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QContactUrl</title> + <title>Qt Mobility Project 1.1: List of All Members for QContactUrl</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -69,8 +69,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qcontacturl.html b/doc/html/qcontacturl.html index 2969ddcc1e..dd9e448447 100644 --- a/doc/html/qcontacturl.html +++ b/doc/html/qcontacturl.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactdetails.cpp --> <head> - <title>Qt Mobility Project 1.0: QContactUrl Class Reference</title> + <title>Qt Mobility Project 1.1: QContactUrl Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -86,8 +86,8 @@ <p>See also <a href="qcontacturl.html#subType">subType</a>() and <a href="qcontacturl.html#setSubType">setSubType</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qgeoaddress-members.html b/doc/html/qgeoaddress-members.html index 003df03943..94810a5f24 100644 --- a/doc/html/qgeoaddress-members.html +++ b/doc/html/qgeoaddress-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qgeoaddress.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QGeoAddress</title> + <title>Qt Mobility Project 1.1: List of All Members for QGeoAddress</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -49,8 +49,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qgeoaddress.html b/doc/html/qgeoaddress.html index 9ba953a633..e5d1ee7e1e 100644 --- a/doc/html/qgeoaddress.html +++ b/doc/html/qgeoaddress.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qgeoaddress.cpp --> <head> - <title>Qt Mobility Project 1.0: QGeoAddress Class Reference</title> + <title>Qt Mobility Project 1.1: QGeoAddress Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -160,8 +160,8 @@ <p>Returns true if this address is equal to <i>other</i>, otherwise returns false.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qgeoareamonitor-members.html b/doc/html/qgeoareamonitor-members.html index 30176bc414..bd41a6f6c3 100644 --- a/doc/html/qgeoareamonitor-members.html +++ b/doc/html/qgeoareamonitor-members.html @@ -4,7 +4,7 @@ <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> + <title>Qt Mobility Project 1.1: List of All Members for QGeoAreaMonitor</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -76,8 +76,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qgeoareamonitor.html b/doc/html/qgeoareamonitor.html index 1dc97e83c5..6d6b494421 100644 --- a/doc/html/qgeoareamonitor.html +++ b/doc/html/qgeoareamonitor.html @@ -4,7 +4,7 @@ <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> + <title>Qt Mobility Project 1.1: QGeoAreaMonitor Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -148,8 +148,8 @@ <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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qgeoboundingbox-members.html b/doc/html/qgeoboundingbox-members.html index 406211711d..78601c4869 100644 --- a/doc/html/qgeoboundingbox-members.html +++ b/doc/html/qgeoboundingbox-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qgeoboundingbox.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QGeoBoundingBox</title> + <title>Qt Mobility Project 1.1: List of All Members for QGeoBoundingBox</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -28,8 +28,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qgeoboundingbox.html b/doc/html/qgeoboundingbox.html index 4c7fc5e501..b853ecf3d5 100644 --- a/doc/html/qgeoboundingbox.html +++ b/doc/html/qgeoboundingbox.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qgeoboundingbox.cpp --> <head> - <title>Qt Mobility Project 1.0: QGeoBoundingBox Class Reference</title> + <title>Qt Mobility Project 1.1: QGeoBoundingBox Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -82,8 +82,8 @@ <p>Assigns <i>other</i> to this <a href="qgeoboundingbox.html">QGeoBoundingBox</a> and returns a reference to this <a href="qgeoboundingbox.html">QGeoBoundingBox</a>.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qgeocodereply-members.html b/doc/html/qgeocodereply-members.html index c6b773ffcb..1c7b8c12c8 100644 --- a/doc/html/qgeocodereply-members.html +++ b/doc/html/qgeocodereply-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qgeocodereply.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QGeoCodeReply</title> + <title>Qt Mobility Project 1.1: List of All Members for QGeoCodeReply</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -74,8 +74,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qgeocodereply.html b/doc/html/qgeocodereply.html index 47162e1a79..8ab9685d2f 100644 --- a/doc/html/qgeocodereply.html +++ b/doc/html/qgeocodereply.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qgeocodereply.cpp --> <head> - <title>Qt Mobility Project 1.0: QGeoCodeReply Class Reference</title> + <title>Qt Mobility Project 1.1: QGeoCodeReply Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -117,8 +117,8 @@ <p>See also <a href="qgeolocation.html">QGeoLocation</a> and <a href="qgeocodereply.html#locations">QGeoCodeReply::locations</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qgeocoderequestoptions-members.html b/doc/html/qgeocoderequestoptions-members.html index 5d4d69c3d5..a06fa87195 100644 --- a/doc/html/qgeocoderequestoptions-members.html +++ b/doc/html/qgeocoderequestoptions-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qgeocoderequestoptions.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QGeoCodeRequestOptions</title> + <title>Qt Mobility Project 1.1: List of All Members for QGeoCodeRequestOptions</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -24,8 +24,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qgeocoderequestoptions.html b/doc/html/qgeocoderequestoptions.html index 7047f7ae1d..cdb572b3b4 100644 --- a/doc/html/qgeocoderequestoptions.html +++ b/doc/html/qgeocoderequestoptions.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qgeocoderequestoptions.cpp --> <head> - <title>Qt Mobility Project 1.0: QGeoCodeRequestOptions Class Reference</title> + <title>Qt Mobility Project 1.1: QGeoCodeRequestOptions Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -60,8 +60,8 @@ <p>Assigns the value of <i>other</i> to this QGeoCodingRequestOptions object and returns a reference to this QGeoCodingRequestOptions object.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qgeocodingservice-members.html b/doc/html/qgeocodingservice-members.html index d0f6a5744e..c25c6caa27 100644 --- a/doc/html/qgeocodingservice-members.html +++ b/doc/html/qgeocodingservice-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qgeocodingservice.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QGeoCodingService</title> + <title>Qt Mobility Project 1.1: List of All Members for QGeoCodingService</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -79,8 +79,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qgeocodingservice.html b/doc/html/qgeocodingservice.html index 606f05c7cf..fa6090073b 100644 --- a/doc/html/qgeocodingservice.html +++ b/doc/html/qgeocodingservice.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qgeocodingservice.cpp --> <head> - <title>Qt Mobility Project 1.0: QGeoCodingService Class Reference</title> + <title>Qt Mobility Project 1.1: QGeoCodingService Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -174,8 +174,8 @@ <p>See also <a href="qgeocodingservice.html#setSupportedRequestOption">setSupportedRequestOption</a>(), <a href="qgeocodingservice.html#RequestOption-enum">QGeoCodingService::RequestOption</a>, and <a href="qgeocodingservice.html#SupportLevel-enum">QGeoCodingService::SupportLevel</a>.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qgeocoordinate-members.html b/doc/html/qgeocoordinate-members.html index 3488b090f8..b69f4fca1a 100644 --- a/doc/html/qgeocoordinate-members.html +++ b/doc/html/qgeocoordinate-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qgeocoordinate.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QGeoCoordinate</title> + <title>Qt Mobility Project 1.1: List of All Members for QGeoCoordinate</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -43,8 +43,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qgeocoordinate.html b/doc/html/qgeocoordinate.html index 4ba7414e33..ca46664cf3 100644 --- a/doc/html/qgeocoordinate.html +++ b/doc/html/qgeocoordinate.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qgeocoordinate.cpp --> <head> - <title>Qt Mobility Project 1.0: QGeoCoordinate Class Reference</title> + <title>Qt Mobility Project 1.1: QGeoCoordinate Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -194,8 +194,8 @@ <p>See also <a href="http://qt.nokia.com/doc/4.6/datastreamformat.html">Format of the QDataStream Operators</a>.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qgeodistance-members.html b/doc/html/qgeodistance-members.html index 04d34d1eaa..8593359cb7 100644 --- a/doc/html/qgeodistance-members.html +++ b/doc/html/qgeodistance-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qgeodistance.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QGeoDistance</title> + <title>Qt Mobility Project 1.1: List of All Members for QGeoDistance</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -28,8 +28,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qgeodistance.html b/doc/html/qgeodistance.html index 2fe997c8d1..f3bcc26c6c 100644 --- a/doc/html/qgeodistance.html +++ b/doc/html/qgeodistance.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qgeodistance.cpp --> <head> - <title>Qt Mobility Project 1.0: QGeoDistance Class Reference</title> + <title>Qt Mobility Project 1.1: QGeoDistance Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -94,8 +94,8 @@ <p>Assigns <i>other</i> to the current <a href="qgeodistance.html">QGeoDistance</a> object, then returns a reference to the current <a href="qgeodistance.html">QGeoDistance</a> object.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qgeolocation-members.html b/doc/html/qgeolocation-members.html index 22d6c77f4a..3b287216b4 100644 --- a/doc/html/qgeolocation-members.html +++ b/doc/html/qgeolocation-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qgeolocation.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QGeoLocation</title> + <title>Qt Mobility Project 1.1: List of All Members for QGeoLocation</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -30,8 +30,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qgeolocation.html b/doc/html/qgeolocation.html index ee1ea2593e..ff552dcf42 100644 --- a/doc/html/qgeolocation.html +++ b/doc/html/qgeolocation.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qgeolocation.cpp --> <head> - <title>Qt Mobility Project 1.0: QGeoLocation Class Reference</title> + <title>Qt Mobility Project 1.1: QGeoLocation Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -86,8 +86,8 @@ <p>Returns true if <i>other</i> is equal to this location, otherwise returns false.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qgeomappingservice-members.html b/doc/html/qgeomappingservice-members.html index 524e33fe8e..7b81826c19 100644 --- a/doc/html/qgeomappingservice-members.html +++ b/doc/html/qgeomappingservice-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qgeomappingservice.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QGeoMappingService</title> + <title>Qt Mobility Project 1.1: List of All Members for QGeoMappingService</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -85,8 +85,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qgeomappingservice.html b/doc/html/qgeomappingservice.html index db655783c2..e6e044e5f0 100644 --- a/doc/html/qgeomappingservice.html +++ b/doc/html/qgeomappingservice.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qgeomappingservice.cpp --> <head> - <title>Qt Mobility Project 1.0: QGeoMappingService Class Reference</title> + <title>Qt Mobility Project 1.1: QGeoMappingService Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -185,8 +185,8 @@ <p>See also <a href="qgeomapwidget.html#MapType-enum">QGeoMapWidget::MapType</a> and <a href="qgeomappingservice.html#setSupportedMapTypes">QGeoMappingService::setSupportedMapTypes</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qgeomapreply-members.html b/doc/html/qgeomapreply-members.html index fda1fb1554..bc4676719d 100644 --- a/doc/html/qgeomapreply-members.html +++ b/doc/html/qgeomapreply-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qgeomapreply.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QGeoMapReply</title> + <title>Qt Mobility Project 1.1: List of All Members for QGeoMapReply</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -74,8 +74,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qgeomapreply.html b/doc/html/qgeomapreply.html index de6b719c2d..af114af2e2 100644 --- a/doc/html/qgeomapreply.html +++ b/doc/html/qgeomapreply.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qgeomapreply.cpp --> <head> - <title>Qt Mobility Project 1.0: QGeoMapReply Class Reference</title> + <title>Qt Mobility Project 1.1: QGeoMapReply Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -111,8 +111,8 @@ <p>See also <a href="qgeomapreply.html#mapImage">QGeoMapReply::mapImage</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qgeomaprequestoptions-members.html b/doc/html/qgeomaprequestoptions-members.html index 0d98af0718..845bfae166 100644 --- a/doc/html/qgeomaprequestoptions-members.html +++ b/doc/html/qgeomaprequestoptions-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qgeomaprequestoptions.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QGeoMapRequestOptions</title> + <title>Qt Mobility Project 1.1: List of All Members for QGeoMapRequestOptions</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -26,8 +26,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qgeomaprequestoptions.html b/doc/html/qgeomaprequestoptions.html index c479532087..a985cf9dc7 100644 --- a/doc/html/qgeomaprequestoptions.html +++ b/doc/html/qgeomaprequestoptions.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qgeomaprequestoptions.cpp --> <head> - <title>Qt Mobility Project 1.0: QGeoMapRequestOptions Class Reference</title> + <title>Qt Mobility Project 1.1: QGeoMapRequestOptions Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -71,8 +71,8 @@ <p>Assigns <i>other</i> to this <a href="qgeomaprequestoptions.html">QGeoMapRequestOptions</a> object and returns a reference to this <a href="qgeomaprequestoptions.html">QGeoMapRequestOptions</a> object.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qgeonavigationinstruction-members.html b/doc/html/qgeonavigationinstruction-members.html index 2f1d361a74..a3219c8324 100644 --- a/doc/html/qgeonavigationinstruction-members.html +++ b/doc/html/qgeonavigationinstruction-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qgeonavigationinstruction.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QGeoNavigationInstruction</title> + <title>Qt Mobility Project 1.1: List of All Members for QGeoNavigationInstruction</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -28,8 +28,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qgeonavigationinstruction.html b/doc/html/qgeonavigationinstruction.html index e233cdb0ac..6289bd4822 100644 --- a/doc/html/qgeonavigationinstruction.html +++ b/doc/html/qgeonavigationinstruction.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qgeonavigationinstruction.cpp --> <head> - <title>Qt Mobility Project 1.0: QGeoNavigationInstruction Class Reference</title> + <title>Qt Mobility Project 1.1: QGeoNavigationInstruction Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -99,8 +99,8 @@ <p>See also <a href="qgeonavigationinstruction.html#InstructionType-enum">QGeoNavigationInstruction::InstructionType</a>.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qgeopositioninfo-members.html b/doc/html/qgeopositioninfo-members.html index e4c7c3ea11..d96878cacd 100644 --- a/doc/html/qgeopositioninfo-members.html +++ b/doc/html/qgeopositioninfo-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qgeopositioninfo.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QGeoPositionInfo</title> + <title>Qt Mobility Project 1.1: List of All Members for QGeoPositionInfo</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -39,8 +39,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qgeopositioninfo.html b/doc/html/qgeopositioninfo.html index 3168ab66a8..64cbbc590d 100644 --- a/doc/html/qgeopositioninfo.html +++ b/doc/html/qgeopositioninfo.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qgeopositioninfo.cpp --> <head> - <title>Qt Mobility Project 1.0: QGeoPositionInfo Class Reference</title> + <title>Qt Mobility Project 1.1: QGeoPositionInfo Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -149,8 +149,8 @@ <p>See also <a href="http://qt.nokia.com/doc/4.6/datastreamformat.html">Format of the QDataStream Operators</a>.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qgeopositioninfosource-members.html b/doc/html/qgeopositioninfosource-members.html index 5f163e59fe..79e0040d89 100644 --- a/doc/html/qgeopositioninfosource-members.html +++ b/doc/html/qgeopositioninfosource-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qgeopositioninfosource.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QGeoPositionInfoSource</title> + <title>Qt Mobility Project 1.1: List of All Members for QGeoPositionInfoSource</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -84,8 +84,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qgeopositioninfosource.html b/doc/html/qgeopositioninfosource.html index 7728075712..e593c835ef 100644 --- a/doc/html/qgeopositioninfosource.html +++ b/doc/html/qgeopositioninfosource.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qgeopositioninfosource.cpp --> <head> - <title>Qt Mobility Project 1.0: QGeoPositionInfoSource Class Reference</title> + <title>Qt Mobility Project 1.1: QGeoPositionInfoSource Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -199,8 +199,8 @@ <p>If <a href="qgeopositioninfosource.html#startUpdates">startUpdates</a>() has been called, this signal will be emitted if this <a href="qgeopositioninfosource.html">QGeoPositionInfoSource</a> subclass determines that it will not be able to provide further regular updates. This signal will not be emitted again until after the regular updates resume.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qgeoroute-members.html b/doc/html/qgeoroute-members.html index e4023b0708..26fc40f6a7 100644 --- a/doc/html/qgeoroute-members.html +++ b/doc/html/qgeoroute-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qgeoroute.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QGeoRoute</title> + <title>Qt Mobility Project 1.1: List of All Members for QGeoRoute</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -32,8 +32,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qgeoroute.html b/doc/html/qgeoroute.html index daa3fde502..e4bf638687 100644 --- a/doc/html/qgeoroute.html +++ b/doc/html/qgeoroute.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qgeoroute.cpp --> <head> - <title>Qt Mobility Project 1.0: QGeoRoute Class Reference</title> + <title>Qt Mobility Project 1.1: QGeoRoute Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -99,8 +99,8 @@ <p>The assignment operator.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qgeoroutereply-members.html b/doc/html/qgeoroutereply-members.html index e5404da81b..edcccda2a1 100644 --- a/doc/html/qgeoroutereply-members.html +++ b/doc/html/qgeoroutereply-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qgeoroutereply.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QGeoRouteReply</title> + <title>Qt Mobility Project 1.1: List of All Members for QGeoRouteReply</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -74,8 +74,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qgeoroutereply.html b/doc/html/qgeoroutereply.html index a16f37d149..1b0bc478ba 100644 --- a/doc/html/qgeoroutereply.html +++ b/doc/html/qgeoroutereply.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qgeoroutereply.cpp --> <head> - <title>Qt Mobility Project 1.0: QGeoRouteReply Class Reference</title> + <title>Qt Mobility Project 1.1: QGeoRouteReply Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -104,8 +104,8 @@ <p>See also <a href="qgeoroutereply.html#routes">QGeoRouteReply::routes</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qgeorouterequest-members.html b/doc/html/qgeorouterequest-members.html index a3991579a8..e7e46d377a 100644 --- a/doc/html/qgeorouterequest-members.html +++ b/doc/html/qgeorouterequest-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qgeorouterequest.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QGeoRouteRequest</title> + <title>Qt Mobility Project 1.1: List of All Members for QGeoRouteRequest</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -52,8 +52,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qgeorouterequest.html b/doc/html/qgeorouterequest.html index d42463150b..b0b8c1e07b 100644 --- a/doc/html/qgeorouterequest.html +++ b/doc/html/qgeorouterequest.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qgeorouterequest.cpp --> <head> - <title>Qt Mobility Project 1.0: QGeoRouteRequest Class Reference</title> + <title>Qt Mobility Project 1.1: QGeoRouteRequest Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -217,8 +217,8 @@ <p>Currently the only supported version is 1.0.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qgeorouterequestoptions-members.html b/doc/html/qgeorouterequestoptions-members.html index 8e86a57e3d..3f197912ac 100644 --- a/doc/html/qgeorouterequestoptions-members.html +++ b/doc/html/qgeorouterequestoptions-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qgeorouterequestoptions.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QGeoRouteRequestOptions</title> + <title>Qt Mobility Project 1.1: List of All Members for QGeoRouteRequestOptions</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -30,8 +30,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qgeorouterequestoptions.html b/doc/html/qgeorouterequestoptions.html index bd285efb5b..3e8b8845fb 100644 --- a/doc/html/qgeorouterequestoptions.html +++ b/doc/html/qgeorouterequestoptions.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qgeorouterequestoptions.cpp --> <head> - <title>Qt Mobility Project 1.0: QGeoRouteRequestOptions Class Reference</title> + <title>Qt Mobility Project 1.1: QGeoRouteRequestOptions Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -92,8 +92,8 @@ <p>Assigns <i>other</i> to this <a href="qgeorouterequestoptions.html">QGeoRouteRequestOptions</a> object and returns a reference to this <a href="qgeorouterequestoptions.html">QGeoRouteRequestOptions</a> object.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qgeoroutesegment-members.html b/doc/html/qgeoroutesegment-members.html index f5aaf6e59b..2e80ecf5fd 100644 --- a/doc/html/qgeoroutesegment-members.html +++ b/doc/html/qgeoroutesegment-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qgeoroutesegment.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QGeoRouteSegment</title> + <title>Qt Mobility Project 1.1: List of All Members for QGeoRouteSegment</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -32,8 +32,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qgeoroutesegment.html b/doc/html/qgeoroutesegment.html index e6663619ca..cf4baa44e0 100644 --- a/doc/html/qgeoroutesegment.html +++ b/doc/html/qgeoroutesegment.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qgeoroutesegment.cpp --> <head> - <title>Qt Mobility Project 1.0: QGeoRouteSegment Class Reference</title> + <title>Qt Mobility Project 1.1: QGeoRouteSegment Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -120,8 +120,8 @@ <p>See also <a href="qgeoroutesegment.html#SegmentType-enum">QGeoRouteSegment::SegmentType</a>.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qgeoroutingservice-members.html b/doc/html/qgeoroutingservice-members.html index 4959e91144..67d1a85f48 100644 --- a/doc/html/qgeoroutingservice-members.html +++ b/doc/html/qgeoroutingservice-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qgeoroutingservice.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QGeoRoutingService</title> + <title>Qt Mobility Project 1.1: List of All Members for QGeoRoutingService</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -85,8 +85,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qgeoroutingservice.html b/doc/html/qgeoroutingservice.html index 338eb9f0c3..10709af63f 100644 --- a/doc/html/qgeoroutingservice.html +++ b/doc/html/qgeoroutingservice.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qgeoroutingservice.cpp --> <head> - <title>Qt Mobility Project 1.0: QGeoRoutingService Class Reference</title> + <title>Qt Mobility Project 1.1: QGeoRoutingService Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -185,8 +185,8 @@ <p>If an error occurs then the <a href="qgeoroutereply.html">QGeoRouteReply</a> object will emit <a href="qgeoroutereply.html#error">QGeoRouteReply::error</a>() and this <a href="qgeoroutingservice.html">QGeoRoutingService</a> instance will emit QGeoRoutingService::error().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qgeosatelliteinfo-members.html b/doc/html/qgeosatelliteinfo-members.html index 2a80c888a8..d8c4d9ea97 100644 --- a/doc/html/qgeosatelliteinfo-members.html +++ b/doc/html/qgeosatelliteinfo-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qgeosatelliteinfo.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QGeoSatelliteInfo</title> + <title>Qt Mobility Project 1.1: List of All Members for QGeoSatelliteInfo</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -33,8 +33,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qgeosatelliteinfo.html b/doc/html/qgeosatelliteinfo.html index 07c006a235..d615be3895 100644 --- a/doc/html/qgeosatelliteinfo.html +++ b/doc/html/qgeosatelliteinfo.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qgeosatelliteinfo.cpp --> <head> - <title>Qt Mobility Project 1.0: QGeoSatelliteInfo Class Reference</title> + <title>Qt Mobility Project 1.1: QGeoSatelliteInfo Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -128,8 +128,8 @@ <p>See also <a href="http://qt.nokia.com/doc/4.6/datastreamformat.html">Format of the QDataStream Operators</a>.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qgeosatelliteinfosource-members.html b/doc/html/qgeosatelliteinfosource-members.html index 33694d4bae..b5fccc8dfa 100644 --- a/doc/html/qgeosatelliteinfosource-members.html +++ b/doc/html/qgeosatelliteinfosource-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qgeosatelliteinfosource.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QGeoSatelliteInfoSource</title> + <title>Qt Mobility Project 1.1: List of All Members for QGeoSatelliteInfoSource</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -75,8 +75,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qgeosatelliteinfosource.html b/doc/html/qgeosatelliteinfosource.html index ad007ac165..153003388e 100644 --- a/doc/html/qgeosatelliteinfosource.html +++ b/doc/html/qgeosatelliteinfosource.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qgeosatelliteinfosource.cpp --> <head> - <title>Qt Mobility Project 1.0: QGeoSatelliteInfoSource Class Reference</title> + <title>Qt Mobility Project 1.1: QGeoSatelliteInfoSource Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -108,8 +108,8 @@ <p>Stops emitting updates at regular intervals.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qgraphicsvideoitem-members.html b/doc/html/qgraphicsvideoitem-members.html index 3bf4bc1c95..0c58299035 100644 --- a/doc/html/qgraphicsvideoitem-members.html +++ b/doc/html/qgraphicsvideoitem-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qgraphicsvideoitem.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QGraphicsVideoItem</title> + <title>Qt Mobility Project 1.1: List of All Members for QGraphicsVideoItem</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -284,8 +284,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qgraphicsvideoitem.html b/doc/html/qgraphicsvideoitem.html index 4569d05ffa..b0b5acff7f 100644 --- a/doc/html/qgraphicsvideoitem.html +++ b/doc/html/qgraphicsvideoitem.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qgraphicsvideoitem.cpp --> <head> - <title>Qt Mobility Project 1.0: QGraphicsVideoItem Class Reference</title> + <title>Qt Mobility Project 1.1: QGraphicsVideoItem Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -185,8 +185,8 @@ <h3 class="fn"><a name="timerEvent"></a>void QGraphicsVideoItem::timerEvent ( <a href="http://qt.nokia.com/doc/4.6/qtimerevent.html">QTimerEvent</a> * <i>event</i> ) <tt> [virtual protected]</tt></h3> <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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qimageencodercontrol-members.html b/doc/html/qimageencodercontrol-members.html index 736fb0c6ac..38ce3a10d0 100644 --- a/doc/html/qimageencodercontrol-members.html +++ b/doc/html/qimageencodercontrol-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qimageencodercontrol.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QImageEncoderControl</title> + <title>Qt Mobility Project 1.1: List of All Members for QImageEncoderControl</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -74,8 +74,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qimageencodercontrol.html b/doc/html/qimageencodercontrol.html index 076bb1ed7c..9492813293 100644 --- a/doc/html/qimageencodercontrol.html +++ b/doc/html/qimageencodercontrol.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qimageencodercontrol.cpp --> <head> - <title>Qt Mobility Project 1.0: QImageEncoderControl Class Reference</title> + <title>Qt Mobility Project 1.1: QImageEncoderControl Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -100,8 +100,8 @@ <p>Defines the interface name of the <a href="qimageencodercontrol.html">QImageEncoderControl</a> class.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qimageencodersettings-members.html b/doc/html/qimageencodersettings-members.html index fe8a0bebeb..18edcd133d 100644 --- a/doc/html/qimageencodersettings-members.html +++ b/doc/html/qimageencodersettings-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmediaencodersettings.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QImageEncoderSettings</title> + <title>Qt Mobility Project 1.1: List of All Members for QImageEncoderSettings</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -32,8 +32,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qimageencodersettings.html b/doc/html/qimageencodersettings.html index c782c18870..174409d779 100644 --- a/doc/html/qimageencodersettings.html +++ b/doc/html/qimageencodersettings.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmediaencodersettings.cpp --> <head> - <title>Qt Mobility Project 1.0: QImageEncoderSettings Class Reference</title> + <title>Qt Mobility Project 1.1: QImageEncoderSettings Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -104,8 +104,8 @@ <p>Returns true if the settings objects are of equal value, and true if they are not of equal value.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qlandmark-members.html b/doc/html/qlandmark-members.html index 08bfd53830..028309a828 100644 --- a/doc/html/qlandmark-members.html +++ b/doc/html/qlandmark-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qlandmark.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QLandmark</title> + <title>Qt Mobility Project 1.1: List of All Members for QLandmark</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -53,8 +53,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qlandmark.html b/doc/html/qlandmark.html index 52172aa61f..ddd4327cb7 100644 --- a/doc/html/qlandmark.html +++ b/doc/html/qlandmark.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qlandmark.cpp --> <head> - <title>Qt Mobility Project 1.0: QLandmark Class Reference</title> + <title>Qt Mobility Project 1.1: QLandmark Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -190,8 +190,8 @@ <p>See also <a href="qlandmark.html#operator-not-eq">operator!=</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qlandmarkabstractrequest-members.html b/doc/html/qlandmarkabstractrequest-members.html index 104279040b..9aca1be5b2 100644 --- a/doc/html/qlandmarkabstractrequest-members.html +++ b/doc/html/qlandmarkabstractrequest-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qlandmarkabstractrequest.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QLandmarkAbstractRequest</title> + <title>Qt Mobility Project 1.1: List of All Members for QLandmarkAbstractRequest</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -86,8 +86,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qlandmarkabstractrequest.html b/doc/html/qlandmarkabstractrequest.html index 4de884ffcc..beb779ec55 100644 --- a/doc/html/qlandmarkabstractrequest.html +++ b/doc/html/qlandmarkabstractrequest.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qlandmarkabstractrequest.cpp --> <head> - <title>Qt Mobility Project 1.0: QLandmarkAbstractRequest Class Reference</title> + <title>Qt Mobility Project 1.1: QLandmarkAbstractRequest Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -194,8 +194,8 @@ <p>Returns true if the request was canceled or completed within the given period, otherwise returns false.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qlandmarkattributefilter-members.html b/doc/html/qlandmarkattributefilter-members.html index 0e5c4556e8..ea796d314d 100644 --- a/doc/html/qlandmarkattributefilter-members.html +++ b/doc/html/qlandmarkattributefilter-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qlandmarkattributefilter.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QLandmarkAttributeFilter</title> + <title>Qt Mobility Project 1.1: List of All Members for QLandmarkAttributeFilter</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -38,8 +38,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qlandmarkattributefilter.html b/doc/html/qlandmarkattributefilter.html index 9d5aecf738..b97a91c04c 100644 --- a/doc/html/qlandmarkattributefilter.html +++ b/doc/html/qlandmarkattributefilter.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qlandmarkattributefilter.cpp --> <head> - <title>Qt Mobility Project 1.0: QLandmarkAttributeFilter Class Reference</title> + <title>Qt Mobility Project 1.1: QLandmarkAttributeFilter Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -71,8 +71,8 @@ <p>See also <a href="qlandmarkattributefilter.html#attribute">attribute</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qlandmarkboxfilter-members.html b/doc/html/qlandmarkboxfilter-members.html index cc03a632a0..12475e2708 100644 --- a/doc/html/qlandmarkboxfilter-members.html +++ b/doc/html/qlandmarkboxfilter-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qlandmarkboxfilter.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QLandmarkBoxFilter</title> + <title>Qt Mobility Project 1.1: List of All Members for QLandmarkBoxFilter</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -33,8 +33,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qlandmarkboxfilter.html b/doc/html/qlandmarkboxfilter.html index c211853df4..1ae5e0afdc 100644 --- a/doc/html/qlandmarkboxfilter.html +++ b/doc/html/qlandmarkboxfilter.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qlandmarkboxfilter.cpp --> <head> - <title>Qt Mobility Project 1.0: QLandmarkBoxFilter Class Reference</title> + <title>Qt Mobility Project 1.1: QLandmarkBoxFilter Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -66,8 +66,8 @@ <p>See also <a href="qlandmarkboxfilter.html#setTopLeftCoordinate">setTopLeftCoordinate</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qlandmarkcategory-members.html b/doc/html/qlandmarkcategory-members.html index b39eb07174..a0ed6bfb1d 100644 --- a/doc/html/qlandmarkcategory-members.html +++ b/doc/html/qlandmarkcategory-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qlandmarkcategory.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QLandmarkCategory</title> + <title>Qt Mobility Project 1.1: List of All Members for QLandmarkCategory</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -39,8 +39,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qlandmarkcategory.html b/doc/html/qlandmarkcategory.html index 709d9fcbf0..b546f55aa6 100644 --- a/doc/html/qlandmarkcategory.html +++ b/doc/html/qlandmarkcategory.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qlandmarkcategory.cpp --> <head> - <title>Qt Mobility Project 1.0: QLandmarkCategory Class Reference</title> + <title>Qt Mobility Project 1.1: QLandmarkCategory Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -118,8 +118,8 @@ <p>See also <a href="qlandmarkcategory.html#operator-not-eq">operator!=</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qlandmarkcategoryfetchrequest-members.html b/doc/html/qlandmarkcategoryfetchrequest-members.html index 6faab319ae..f69eea0896 100644 --- a/doc/html/qlandmarkcategoryfetchrequest-members.html +++ b/doc/html/qlandmarkcategoryfetchrequest-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qlandmarkcategoryfetchrequest.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QLandmarkCategoryFetchRequest</title> + <title>Qt Mobility Project 1.1: List of All Members for QLandmarkCategoryFetchRequest</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -89,8 +89,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qlandmarkcategoryfetchrequest.html b/doc/html/qlandmarkcategoryfetchrequest.html index 061213660e..65d5265267 100644 --- a/doc/html/qlandmarkcategoryfetchrequest.html +++ b/doc/html/qlandmarkcategoryfetchrequest.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qlandmarkcategoryfetchrequest.cpp --> <head> - <title>Qt Mobility Project 1.0: QLandmarkCategoryFetchRequest Class Reference</title> + <title>Qt Mobility Project 1.1: QLandmarkCategoryFetchRequest Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -73,8 +73,8 @@ <p>See also <a href="qlandmarkcategoryfetchrequest.html#categoryIds">categoryIds</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qlandmarkcategoryfilter-members.html b/doc/html/qlandmarkcategoryfilter-members.html index 15ee230756..93c993e428 100644 --- a/doc/html/qlandmarkcategoryfilter-members.html +++ b/doc/html/qlandmarkcategoryfilter-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qlandmarkcategoryfilter.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QLandmarkCategoryFilter</title> + <title>Qt Mobility Project 1.1: List of All Members for QLandmarkCategoryFilter</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -31,8 +31,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qlandmarkcategoryfilter.html b/doc/html/qlandmarkcategoryfilter.html index 7dafe7605b..066ff2e77e 100644 --- a/doc/html/qlandmarkcategoryfilter.html +++ b/doc/html/qlandmarkcategoryfilter.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qlandmarkcategoryfilter.cpp --> <head> - <title>Qt Mobility Project 1.0: QLandmarkCategoryFilter Class Reference</title> + <title>Qt Mobility Project 1.1: QLandmarkCategoryFilter Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -56,8 +56,8 @@ <p>See also <a href="qlandmarkcategoryfilter.html#categoryId">categoryId</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qlandmarkcategoryid-members.html b/doc/html/qlandmarkcategoryid-members.html index bbeadc078e..54884496bb 100644 --- a/doc/html/qlandmarkcategoryid-members.html +++ b/doc/html/qlandmarkcategoryid-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qlandmarkcategoryid.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QLandmarkCategoryId</title> + <title>Qt Mobility Project 1.1: List of All Members for QLandmarkCategoryId</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -29,8 +29,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qlandmarkcategoryid.html b/doc/html/qlandmarkcategoryid.html index 784c506dd1..71f9c02879 100644 --- a/doc/html/qlandmarkcategoryid.html +++ b/doc/html/qlandmarkcategoryid.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qlandmarkcategoryid.cpp --> <head> - <title>Qt Mobility Project 1.0: QLandmarkCategoryId Class Reference</title> + <title>Qt Mobility Project 1.1: QLandmarkCategoryId Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -85,8 +85,8 @@ <p>See also <a href="qlandmarkcategoryid.html#operator-not-eq">operator!=</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qlandmarkcategoryidfetchrequest-members.html b/doc/html/qlandmarkcategoryidfetchrequest-members.html index 5177df31bb..2060677e8b 100644 --- a/doc/html/qlandmarkcategoryidfetchrequest-members.html +++ b/doc/html/qlandmarkcategoryidfetchrequest-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qlandmarkcategoryidfetchrequest.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QLandmarkCategoryIdFetchRequest</title> + <title>Qt Mobility Project 1.1: List of All Members for QLandmarkCategoryIdFetchRequest</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -87,8 +87,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qlandmarkcategoryidfetchrequest.html b/doc/html/qlandmarkcategoryidfetchrequest.html index a7e9cd1384..515f7f02d2 100644 --- a/doc/html/qlandmarkcategoryidfetchrequest.html +++ b/doc/html/qlandmarkcategoryidfetchrequest.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qlandmarkcategoryidfetchrequest.cpp --> <head> - <title>Qt Mobility Project 1.0: QLandmarkCategoryIdFetchRequest Class Reference</title> + <title>Qt Mobility Project 1.1: QLandmarkCategoryIdFetchRequest Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -61,8 +61,8 @@ <p>Returns the list of category identifiers that have been found during the request.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qlandmarkcategoryremoverequest-members.html b/doc/html/qlandmarkcategoryremoverequest-members.html index c74dc8ef2a..0294e83107 100644 --- a/doc/html/qlandmarkcategoryremoverequest-members.html +++ b/doc/html/qlandmarkcategoryremoverequest-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qlandmarkcategoryremoverequest.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QLandmarkCategoryRemoveRequest</title> + <title>Qt Mobility Project 1.1: List of All Members for QLandmarkCategoryRemoveRequest</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -90,8 +90,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qlandmarkcategoryremoverequest.html b/doc/html/qlandmarkcategoryremoverequest.html index e3d85786d8..b8413bbb19 100644 --- a/doc/html/qlandmarkcategoryremoverequest.html +++ b/doc/html/qlandmarkcategoryremoverequest.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qlandmarkcategoryremoverequest.cpp --> <head> - <title>Qt Mobility Project 1.0: QLandmarkCategoryRemoveRequest Class Reference</title> + <title>Qt Mobility Project 1.1: QLandmarkCategoryRemoveRequest Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -76,8 +76,8 @@ <p>See also <a href="qlandmarkcategoryremoverequest.html#categoryIds">categoryIds</a>() and <a href="qlandmarkcategoryremoverequest.html#setCategoryId">setCategoryId</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qlandmarkcategorysaverequest-members.html b/doc/html/qlandmarkcategorysaverequest-members.html index ab423ada2c..a1c32dc376 100644 --- a/doc/html/qlandmarkcategorysaverequest-members.html +++ b/doc/html/qlandmarkcategorysaverequest-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qlandmarkcategorysaverequest.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QLandmarkCategorySaveRequest</title> + <title>Qt Mobility Project 1.1: List of All Members for QLandmarkCategorySaveRequest</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -90,8 +90,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qlandmarkcategorysaverequest.html b/doc/html/qlandmarkcategorysaverequest.html index d2f2a77c15..c5f12527fe 100644 --- a/doc/html/qlandmarkcategorysaverequest.html +++ b/doc/html/qlandmarkcategorysaverequest.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qlandmarkcategorysaverequest.cpp --> <head> - <title>Qt Mobility Project 1.0: QLandmarkCategorySaveRequest Class Reference</title> + <title>Qt Mobility Project 1.1: QLandmarkCategorySaveRequest Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -76,8 +76,8 @@ <p>See also <a href="qlandmarkcategorysaverequest.html#setCategories">setCategories</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qlandmarkdistancesort-members.html b/doc/html/qlandmarkdistancesort-members.html index 2e46e8a334..dab80a0cb3 100644 --- a/doc/html/qlandmarkdistancesort-members.html +++ b/doc/html/qlandmarkdistancesort-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qlandmarkdistancesort.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QLandmarkDistanceSort</title> + <title>Qt Mobility Project 1.1: List of All Members for QLandmarkDistanceSort</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -31,8 +31,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qlandmarkdistancesort.html b/doc/html/qlandmarkdistancesort.html index 40bde8e754..a59b233306 100644 --- a/doc/html/qlandmarkdistancesort.html +++ b/doc/html/qlandmarkdistancesort.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qlandmarkdistancesort.cpp --> <head> - <title>Qt Mobility Project 1.0: QLandmarkDistanceSort Class Reference</title> + <title>Qt Mobility Project 1.1: QLandmarkDistanceSort Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -56,8 +56,8 @@ <p>See also <a href="qlandmarkdistancesort.html#coordinate">coordinate</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qlandmarkexportrequest-members.html b/doc/html/qlandmarkexportrequest-members.html index 5fb237df07..3fa864d9b8 100644 --- a/doc/html/qlandmarkexportrequest-members.html +++ b/doc/html/qlandmarkexportrequest-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qlandmarkexportrequest.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QLandmarkExportRequest</title> + <title>Qt Mobility Project 1.1: List of All Members for QLandmarkExportRequest</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -94,8 +94,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qlandmarkexportrequest.html b/doc/html/qlandmarkexportrequest.html index 1bd7ec3a73..39020b75b4 100644 --- a/doc/html/qlandmarkexportrequest.html +++ b/doc/html/qlandmarkexportrequest.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qlandmarkexportrequest.cpp --> <head> - <title>Qt Mobility Project 1.0: QLandmarkExportRequest Class Reference</title> + <title>Qt Mobility Project 1.1: QLandmarkExportRequest Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -98,8 +98,8 @@ <p>See also <a href="qlandmarkexportrequest.html#landmarkIds">landmarkIds</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qlandmarkfetchrequest-members.html b/doc/html/qlandmarkfetchrequest-members.html index d397fd8c33..e91a98e662 100644 --- a/doc/html/qlandmarkfetchrequest-members.html +++ b/doc/html/qlandmarkfetchrequest-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qlandmarkfetchrequest.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QLandmarkFetchRequest</title> + <title>Qt Mobility Project 1.1: List of All Members for QLandmarkFetchRequest</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -93,8 +93,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qlandmarkfetchrequest.html b/doc/html/qlandmarkfetchrequest.html index 9313aed816..aa9aef33a5 100644 --- a/doc/html/qlandmarkfetchrequest.html +++ b/doc/html/qlandmarkfetchrequest.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qlandmarkfetchrequest.cpp --> <head> - <title>Qt Mobility Project 1.0: QLandmarkFetchRequest Class Reference</title> + <title>Qt Mobility Project 1.1: QLandmarkFetchRequest Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -90,8 +90,8 @@ <p>See also <a href="qlandmarkfetchrequest.html#setSorting">setSorting</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qlandmarkfilter-members.html b/doc/html/qlandmarkfilter-members.html index d1839cd01e..99607b268e 100644 --- a/doc/html/qlandmarkfilter-members.html +++ b/doc/html/qlandmarkfilter-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qlandmarkfilter.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QLandmarkFilter</title> + <title>Qt Mobility Project 1.1: List of All Members for QLandmarkFilter</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -29,8 +29,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qlandmarkfilter.html b/doc/html/qlandmarkfilter.html index 657e8f3e2a..ed14a624b0 100644 --- a/doc/html/qlandmarkfilter.html +++ b/doc/html/qlandmarkfilter.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qlandmarkfilter.cpp --> <head> - <title>Qt Mobility Project 1.0: QLandmarkFilter Class Reference</title> + <title>Qt Mobility Project 1.1: QLandmarkFilter Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -124,8 +124,8 @@ <p>See also <a href="qlandmarkunionfilter.html">QLandmarkUnionFilter</a>.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qlandmarkid-members.html b/doc/html/qlandmarkid-members.html index 207fcb558f..35d14264a6 100644 --- a/doc/html/qlandmarkid-members.html +++ b/doc/html/qlandmarkid-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qlandmarkid.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QLandmarkId</title> + <title>Qt Mobility Project 1.1: List of All Members for QLandmarkId</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -29,8 +29,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qlandmarkid.html b/doc/html/qlandmarkid.html index 81cc687cfa..db5f256bd5 100644 --- a/doc/html/qlandmarkid.html +++ b/doc/html/qlandmarkid.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qlandmarkid.cpp --> <head> - <title>Qt Mobility Project 1.0: QLandmarkId Class Reference</title> + <title>Qt Mobility Project 1.1: QLandmarkId Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -85,8 +85,8 @@ <p>See also <a href="qlandmarkid.html#operator-not-eq">operator!=</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qlandmarkidfetchrequest-members.html b/doc/html/qlandmarkidfetchrequest-members.html index d5677758f9..d9b7215576 100644 --- a/doc/html/qlandmarkidfetchrequest-members.html +++ b/doc/html/qlandmarkidfetchrequest-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qlandmarkidfetchrequest.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QLandmarkIdFetchRequest</title> + <title>Qt Mobility Project 1.1: List of All Members for QLandmarkIdFetchRequest</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -92,8 +92,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qlandmarkidfetchrequest.html b/doc/html/qlandmarkidfetchrequest.html index 394ffe79f8..f7b3323100 100644 --- a/doc/html/qlandmarkidfetchrequest.html +++ b/doc/html/qlandmarkidfetchrequest.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qlandmarkidfetchrequest.cpp --> <head> - <title>Qt Mobility Project 1.0: QLandmarkIdFetchRequest Class Reference</title> + <title>Qt Mobility Project 1.1: QLandmarkIdFetchRequest Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -85,8 +85,8 @@ <p>See also <a href="qlandmarkidfetchrequest.html#setSorting">setSorting</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qlandmarkidfilter-members.html b/doc/html/qlandmarkidfilter-members.html index c3d4c30c2e..eb9be36576 100644 --- a/doc/html/qlandmarkidfilter-members.html +++ b/doc/html/qlandmarkidfilter-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qlandmarkidfilter.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QLandmarkIdFilter</title> + <title>Qt Mobility Project 1.1: List of All Members for QLandmarkIdFilter</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -40,8 +40,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qlandmarkidfilter.html b/doc/html/qlandmarkidfilter.html index c9404b5830..be003a431b 100644 --- a/doc/html/qlandmarkidfilter.html +++ b/doc/html/qlandmarkidfilter.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qlandmarkidfilter.cpp --> <head> - <title>Qt Mobility Project 1.0: QLandmarkIdFilter Class Reference</title> + <title>Qt Mobility Project 1.1: QLandmarkIdFilter Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -76,8 +76,8 @@ <p>Appends the given <i>id</i> to the list of landmark identifiers this filter searches for.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qlandmarkimportrequest-members.html b/doc/html/qlandmarkimportrequest-members.html index 7fb21fae24..e964df58fd 100644 --- a/doc/html/qlandmarkimportrequest-members.html +++ b/doc/html/qlandmarkimportrequest-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qlandmarkimportrequest.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QLandmarkImportRequest</title> + <title>Qt Mobility Project 1.1: List of All Members for QLandmarkImportRequest</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -93,8 +93,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qlandmarkimportrequest.html b/doc/html/qlandmarkimportrequest.html index d233ff91ee..c66892e27f 100644 --- a/doc/html/qlandmarkimportrequest.html +++ b/doc/html/qlandmarkimportrequest.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qlandmarkimportrequest.cpp --> <head> - <title>Qt Mobility Project 1.0: QLandmarkImportRequest Class Reference</title> + <title>Qt Mobility Project 1.1: QLandmarkImportRequest Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -92,8 +92,8 @@ <p>See also <a href="qlandmarkimportrequest.html#format">format</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qlandmarkintersectionfilter-members.html b/doc/html/qlandmarkintersectionfilter-members.html index bc131905e5..bb9dd3f7be 100644 --- a/doc/html/qlandmarkintersectionfilter-members.html +++ b/doc/html/qlandmarkintersectionfilter-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qlandmarkintersectionfilter.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QLandmarkIntersectionFilter</title> + <title>Qt Mobility Project 1.1: List of All Members for QLandmarkIntersectionFilter</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -40,8 +40,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qlandmarkintersectionfilter.html b/doc/html/qlandmarkintersectionfilter.html index e4263b727c..d9f928f01b 100644 --- a/doc/html/qlandmarkintersectionfilter.html +++ b/doc/html/qlandmarkintersectionfilter.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qlandmarkintersectionfilter.cpp --> <head> - <title>Qt Mobility Project 1.0: QLandmarkIntersectionFilter Class Reference</title> + <title>Qt Mobility Project 1.1: QLandmarkIntersectionFilter Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -81,8 +81,8 @@ <p>See also <a href="qlandmarkintersectionfilter.html#append">append</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qlandmarkmanager-members.html b/doc/html/qlandmarkmanager-members.html index cd07770f66..09526451f8 100644 --- a/doc/html/qlandmarkmanager-members.html +++ b/doc/html/qlandmarkmanager-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qlandmarkmanager.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QLandmarkManager</title> + <title>Qt Mobility Project 1.1: List of All Members for QLandmarkManager</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -112,8 +112,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qlandmarkmanager.html b/doc/html/qlandmarkmanager.html index ad66d7a1c7..3d2125963d 100644 --- a/doc/html/qlandmarkmanager.html +++ b/doc/html/qlandmarkmanager.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qlandmarkmanager.cpp --> <head> - <title>Qt Mobility Project 1.0: QLandmarkManager Class Reference</title> + <title>Qt Mobility Project 1.1: QLandmarkManager Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -296,8 +296,8 @@ <p>For each newly saved landmark that was successful, the identifier of the landmark will be updated with a new value. If a failure occurs when saving a new landmark, the identifier will be cleared (and become an invalid identifier).</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qlandmarkmanagerengine-members.html b/doc/html/qlandmarkmanagerengine-members.html index a13f89093d..83d33f5d17 100644 --- a/doc/html/qlandmarkmanagerengine-members.html +++ b/doc/html/qlandmarkmanagerengine-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qlandmarkmanagerengine.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QLandmarkManagerEngine</title> + <title>Qt Mobility Project 1.1: List of All Members for QLandmarkManagerEngine</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -120,8 +120,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qlandmarkmanagerengine.html b/doc/html/qlandmarkmanagerengine.html index d7593ac8e9..74172ffa60 100644 --- a/doc/html/qlandmarkmanagerengine.html +++ b/doc/html/qlandmarkmanagerengine.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qlandmarkmanagerengine.cpp --> <head> - <title>Qt Mobility Project 1.0: QLandmarkManagerEngine Class Reference</title> + <title>Qt Mobility Project 1.1: QLandmarkManagerEngine Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -350,8 +350,8 @@ <p>See also <a href="qlandmarkmanagerengine.html#startRequest">startRequest</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qlandmarkmanagerenginefactory-members.html b/doc/html/qlandmarkmanagerenginefactory-members.html index 18f5800f31..b28144c51f 100644 --- a/doc/html/qlandmarkmanagerenginefactory-members.html +++ b/doc/html/qlandmarkmanagerenginefactory-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qlandmarkmanagerenginefactory.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QLandmarkManagerEngineFactory</title> + <title>Qt Mobility Project 1.1: List of All Members for QLandmarkManagerEngineFactory</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -22,8 +22,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qlandmarkmanagerenginefactory.html b/doc/html/qlandmarkmanagerenginefactory.html index 707a7c7b19..c8592b3cf0 100644 --- a/doc/html/qlandmarkmanagerenginefactory.html +++ b/doc/html/qlandmarkmanagerenginefactory.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qlandmarkmanagerenginefactory.cpp --> <head> - <title>Qt Mobility Project 1.0: QLandmarkManagerEngineFactory Class Reference</title> + <title>Qt Mobility Project 1.1: QLandmarkManagerEngineFactory Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -52,8 +52,8 @@ <p>This function returns a list of versions of the engine which this factory can instantiate.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qlandmarknamefilter-members.html b/doc/html/qlandmarknamefilter-members.html index c32273e3a2..03b8c970d2 100644 --- a/doc/html/qlandmarknamefilter-members.html +++ b/doc/html/qlandmarknamefilter-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qlandmarknamefilter.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QLandmarkNameFilter</title> + <title>Qt Mobility Project 1.1: List of All Members for QLandmarkNameFilter</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -33,8 +33,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qlandmarknamefilter.html b/doc/html/qlandmarknamefilter.html index 67f60c05da..36744f2730 100644 --- a/doc/html/qlandmarknamefilter.html +++ b/doc/html/qlandmarknamefilter.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qlandmarknamefilter.cpp --> <head> - <title>Qt Mobility Project 1.0: QLandmarkNameFilter Class Reference</title> + <title>Qt Mobility Project 1.1: QLandmarkNameFilter Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -66,8 +66,8 @@ <p>See also <a href="qlandmarknamefilter.html#name">name</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qlandmarknamesort-members.html b/doc/html/qlandmarknamesort-members.html index 47af00ff6f..692713898c 100644 --- a/doc/html/qlandmarknamesort-members.html +++ b/doc/html/qlandmarknamesort-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qlandmarknamesort.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QLandmarkNameSort</title> + <title>Qt Mobility Project 1.1: List of All Members for QLandmarkNameSort</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -31,8 +31,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qlandmarknamesort.html b/doc/html/qlandmarknamesort.html index 9790d32fa4..f5027bb1cc 100644 --- a/doc/html/qlandmarknamesort.html +++ b/doc/html/qlandmarknamesort.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qlandmarknamesort.cpp --> <head> - <title>Qt Mobility Project 1.0: QLandmarkNameSort Class Reference</title> + <title>Qt Mobility Project 1.1: QLandmarkNameSort Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -56,8 +56,8 @@ <p>See also <a href="qlandmarknamesort.html#caseSensitivity">caseSensitivity</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qlandmarknearestfilter-members.html b/doc/html/qlandmarknearestfilter-members.html index 272e6981d5..8969e45df7 100644 --- a/doc/html/qlandmarknearestfilter-members.html +++ b/doc/html/qlandmarknearestfilter-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qlandmarknearestfilter.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QLandmarkNearestFilter</title> + <title>Qt Mobility Project 1.1: List of All Members for QLandmarkNearestFilter</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -33,8 +33,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qlandmarknearestfilter.html b/doc/html/qlandmarknearestfilter.html index b65188dfe7..7c6c34bf6b 100644 --- a/doc/html/qlandmarknearestfilter.html +++ b/doc/html/qlandmarknearestfilter.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qlandmarknearestfilter.cpp --> <head> - <title>Qt Mobility Project 1.0: QLandmarkNearestFilter Class Reference</title> + <title>Qt Mobility Project 1.1: QLandmarkNearestFilter Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -68,8 +68,8 @@ <p>See also <a href="qlandmarknearestfilter.html#radius">radius</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qlandmarkproximityfilter-members.html b/doc/html/qlandmarkproximityfilter-members.html index 82e82387aa..8f2536f13a 100644 --- a/doc/html/qlandmarkproximityfilter-members.html +++ b/doc/html/qlandmarkproximityfilter-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qlandmarkproximityfilter.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QLandmarkProximityFilter</title> + <title>Qt Mobility Project 1.1: List of All Members for QLandmarkProximityFilter</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -33,8 +33,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qlandmarkproximityfilter.html b/doc/html/qlandmarkproximityfilter.html index c2aa73b3e3..1f1edcb3c5 100644 --- a/doc/html/qlandmarkproximityfilter.html +++ b/doc/html/qlandmarkproximityfilter.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qlandmarkproximityfilter.cpp --> <head> - <title>Qt Mobility Project 1.0: QLandmarkProximityFilter Class Reference</title> + <title>Qt Mobility Project 1.1: QLandmarkProximityFilter Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -66,8 +66,8 @@ <p>See also <a href="qlandmarkproximityfilter.html#radius">radius</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qlandmarkremoverequest-members.html b/doc/html/qlandmarkremoverequest-members.html index 6ec85fa32a..841b311b62 100644 --- a/doc/html/qlandmarkremoverequest-members.html +++ b/doc/html/qlandmarkremoverequest-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qlandmarkremoverequest.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QLandmarkRemoveRequest</title> + <title>Qt Mobility Project 1.1: List of All Members for QLandmarkRemoveRequest</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -90,8 +90,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qlandmarkremoverequest.html b/doc/html/qlandmarkremoverequest.html index 5c0de87086..96e11f4e94 100644 --- a/doc/html/qlandmarkremoverequest.html +++ b/doc/html/qlandmarkremoverequest.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qlandmarkremoverequest.cpp --> <head> - <title>Qt Mobility Project 1.0: QLandmarkRemoveRequest Class Reference</title> + <title>Qt Mobility Project 1.1: QLandmarkRemoveRequest Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -76,8 +76,8 @@ <p>See also <a href="qlandmarkremoverequest.html#landmarkIds">landmarkIds</a>() and <a href="qlandmarkremoverequest.html#setLandmarkId">setLandmarkId</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qlandmarksaverequest-members.html b/doc/html/qlandmarksaverequest-members.html index bebb0db1aa..1e31ff947e 100644 --- a/doc/html/qlandmarksaverequest-members.html +++ b/doc/html/qlandmarksaverequest-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qlandmarksaverequest.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QLandmarkSaveRequest</title> + <title>Qt Mobility Project 1.1: List of All Members for QLandmarkSaveRequest</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -90,8 +90,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qlandmarksaverequest.html b/doc/html/qlandmarksaverequest.html index 31aeba937c..b521bdc004 100644 --- a/doc/html/qlandmarksaverequest.html +++ b/doc/html/qlandmarksaverequest.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qlandmarksaverequest.cpp --> <head> - <title>Qt Mobility Project 1.0: QLandmarkSaveRequest Class Reference</title> + <title>Qt Mobility Project 1.1: QLandmarkSaveRequest Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -76,8 +76,8 @@ <p>See also <a href="qlandmarksaverequest.html#landmarks">landmarks</a>() and <a href="qlandmarksaverequest.html#setLandmark">setLandmark</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qlandmarksortorder-members.html b/doc/html/qlandmarksortorder-members.html index 36aa40dbf9..eaad80a9dc 100644 --- a/doc/html/qlandmarksortorder-members.html +++ b/doc/html/qlandmarksortorder-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qlandmarksortorder.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QLandmarkSortOrder</title> + <title>Qt Mobility Project 1.1: List of All Members for QLandmarkSortOrder</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -29,8 +29,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qlandmarksortorder.html b/doc/html/qlandmarksortorder.html index c6cd0c1e71..d68225e0f8 100644 --- a/doc/html/qlandmarksortorder.html +++ b/doc/html/qlandmarksortorder.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qlandmarksortorder.cpp --> <head> - <title>Qt Mobility Project 1.0: QLandmarkSortOrder Class Reference</title> + <title>Qt Mobility Project 1.1: QLandmarkSortOrder Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -93,8 +93,8 @@ <p>See also <a href="qlandmarksortorder.html#operator-not-eq">operator!=</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qlandmarkunionfilter-members.html b/doc/html/qlandmarkunionfilter-members.html index 5b3519bb96..26f7eef5ca 100644 --- a/doc/html/qlandmarkunionfilter-members.html +++ b/doc/html/qlandmarkunionfilter-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qlandmarkunionfilter.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QLandmarkUnionFilter</title> + <title>Qt Mobility Project 1.1: List of All Members for QLandmarkUnionFilter</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -40,8 +40,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qlandmarkunionfilter.html b/doc/html/qlandmarkunionfilter.html index 8669766e98..4c58e1df3f 100644 --- a/doc/html/qlandmarkunionfilter.html +++ b/doc/html/qlandmarkunionfilter.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qlandmarkunionfilter.cpp --> <head> - <title>Qt Mobility Project 1.0: QLandmarkUnionFilter Class Reference</title> + <title>Qt Mobility Project 1.1: QLandmarkUnionFilter Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -82,8 +82,8 @@ <p>See also <a href="qlandmarkunionfilter.html#append">append</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qlatin1constant-members.html b/doc/html/qlatin1constant-members.html index 2a1dd851cd..c1655f4bf7 100644 --- a/doc/html/qlatin1constant-members.html +++ b/doc/html/qlatin1constant-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactdetail.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QLatin1Constant</title> + <title>Qt Mobility Project 1.1: List of All Members for QLatin1Constant</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -22,8 +22,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qlatin1constant.html b/doc/html/qlatin1constant.html index 9a659b567d..f924153da1 100644 --- a/doc/html/qlatin1constant.html +++ b/doc/html/qlatin1constant.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qcontactdetail.cpp --> <head> - <title>Qt Mobility Project 1.0: QLatin1Constant Class Reference</title> + <title>Qt Mobility Project 1.1: QLatin1Constant Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -75,8 +75,8 @@ <p>See also <a href="qlatin1constant.html#Q_DECLARE_LATIN1_CONSTANT">Q_DECLARE_LATIN1_CONSTANT</a>.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmagnetometer-members.html b/doc/html/qmagnetometer-members.html index 1361ace8cb..7e8c6fdd1a 100644 --- a/doc/html/qmagnetometer-members.html +++ b/doc/html/qmagnetometer-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmagnetometer.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QMagnetometer</title> + <title>Qt Mobility Project 1.1: List of All Members for QMagnetometer</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -96,8 +96,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmagnetometer.html b/doc/html/qmagnetometer.html index c7f57ca6f6..391e9f0b77 100644 --- a/doc/html/qmagnetometer.html +++ b/doc/html/qmagnetometer.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmagnetometer.cpp --> <head> - <title>Qt Mobility Project 1.0: QMagnetometer Class Reference</title> + <title>Qt Mobility Project 1.1: QMagnetometer Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -81,8 +81,8 @@ <p>See also <a href="qsensor.html#reading-prop">QSensor::reading</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmagnetometerfilter-members.html b/doc/html/qmagnetometerfilter-members.html index 545779c9e4..1c83bb49bc 100644 --- a/doc/html/qmagnetometerfilter-members.html +++ b/doc/html/qmagnetometerfilter-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmagnetometer.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QMagnetometerFilter</title> + <title>Qt Mobility Project 1.1: List of All Members for QMagnetometerFilter</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -20,8 +20,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmagnetometerfilter.html b/doc/html/qmagnetometerfilter.html index 571fc7ee55..b2ffbe20e6 100644 --- a/doc/html/qmagnetometerfilter.html +++ b/doc/html/qmagnetometerfilter.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmagnetometer.cpp --> <head> - <title>Qt Mobility Project 1.0: QMagnetometerFilter Class Reference</title> + <title>Qt Mobility Project 1.1: QMagnetometerFilter Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -41,8 +41,8 @@ <p>See also <a href="qsensorfilter.html#filter">QSensorFilter::filter</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmagnetometerreading-members.html b/doc/html/qmagnetometerreading-members.html index 52695ea5fb..a79b5e4526 100644 --- a/doc/html/qmagnetometerreading-members.html +++ b/doc/html/qmagnetometerreading-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmagnetometer.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QMagnetometerReading</title> + <title>Qt Mobility Project 1.1: List of All Members for QMagnetometerReading</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -79,8 +79,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmagnetometerreading.html b/doc/html/qmagnetometerreading.html index 12485e3e29..468cdb5cd9 100644 --- a/doc/html/qmagnetometerreading.html +++ b/doc/html/qmagnetometerreading.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmagnetometer.cpp --> <head> - <title>Qt Mobility Project 1.0: QMagnetometerReading Class Reference</title> + <title>Qt Mobility Project 1.1: QMagnetometerReading Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -128,8 +128,8 @@ <p>See also <a href="qmagnetometerreading.html#z-prop">z</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmaneuver-members.html b/doc/html/qmaneuver-members.html index c155f76211..3bb73218dc 100644 --- a/doc/html/qmaneuver-members.html +++ b/doc/html/qmaneuver-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmaneuver.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QManeuver</title> + <title>Qt Mobility Project 1.1: List of All Members for QManeuver</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -52,8 +52,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmaneuver.html b/doc/html/qmaneuver.html index eeb8a3adb5..ea9f06e9a3 100644 --- a/doc/html/qmaneuver.html +++ b/doc/html/qmaneuver.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmaneuver.cpp --> <head> - <title>Qt Mobility Project 1.0: QManeuver Class Reference</title> + <title>Qt Mobility Project 1.1: QManeuver Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -180,8 +180,8 @@ <p>Assignment operator.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmapellipse-members.html b/doc/html/qmapellipse-members.html index 17e0955039..872864395f 100644 --- a/doc/html/qmapellipse-members.html +++ b/doc/html/qmapellipse-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmapellipse.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QMapEllipse</title> + <title>Qt Mobility Project 1.1: List of All Members for QMapEllipse</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -38,8 +38,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmapellipse.html b/doc/html/qmapellipse.html index 19147d6e1f..7628c02a6b 100644 --- a/doc/html/qmapellipse.html +++ b/doc/html/qmapellipse.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmapellipse.cpp --> <head> - <title>Qt Mobility Project 1.0: QMapEllipse Class Reference</title> + <title>Qt Mobility Project 1.1: QMapEllipse Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -78,8 +78,8 @@ <p>Returns the top left geo coordinate of the bounding box of the ellipse.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmapline-members.html b/doc/html/qmapline-members.html index 6308acbb4d..45ee8c9321 100644 --- a/doc/html/qmapline-members.html +++ b/doc/html/qmapline-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmapline.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QMapLine</title> + <title>Qt Mobility Project 1.1: List of All Members for QMapLine</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -33,8 +33,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmapline.html b/doc/html/qmapline.html index 090ffc72f5..3b9c8b1d59 100644 --- a/doc/html/qmapline.html +++ b/doc/html/qmapline.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmapline.cpp --> <head> - <title>Qt Mobility Project 1.0: QMapLine Class Reference</title> + <title>Qt Mobility Project 1.1: QMapLine Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -72,8 +72,8 @@ <p>Returns the second end point (as a geo coordinate) of the line.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmapmarker-members.html b/doc/html/qmapmarker-members.html index 023894f941..2a3a796cbd 100644 --- a/doc/html/qmapmarker-members.html +++ b/doc/html/qmapmarker-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmapmarker.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QMapMarker</title> + <title>Qt Mobility Project 1.1: List of All Members for QMapMarker</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -42,8 +42,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmapmarker.html b/doc/html/qmapmarker.html index 63622ac6e5..fc04ba6fa1 100644 --- a/doc/html/qmapmarker.html +++ b/doc/html/qmapmarker.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmapmarker.cpp --> <head> - <title>Qt Mobility Project 1.0: QMapMarker Class Reference</title> + <title>Qt Mobility Project 1.1: QMapMarker Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -91,8 +91,8 @@ <h3 class="fn"><a name="textRect"></a><a href="http://qt.nokia.com/doc/4.6/qrectf.html">QRectF</a> QMapMarker::textRect () const</h3> <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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmapobject-members.html b/doc/html/qmapobject-members.html index ea8142ff08..9dfae36928 100644 --- a/doc/html/qmapobject-members.html +++ b/doc/html/qmapobject-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmapobject.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QMapObject</title> + <title>Qt Mobility Project 1.1: List of All Members for QMapObject</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -31,8 +31,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmapobject.html b/doc/html/qmapobject.html index 90f2ee8822..3d31df923b 100644 --- a/doc/html/qmapobject.html +++ b/doc/html/qmapobject.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmapobject.cpp --> <head> - <title>Qt Mobility Project 1.0: QMapObject Class Reference</title> + <title>Qt Mobility Project 1.1: QMapObject Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -98,8 +98,8 @@ <p>Returns the z index of this map object, as used for layering. Objects with higher z indices are stacked on top of objects with lower z indices.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmappixmap-members.html b/doc/html/qmappixmap-members.html index 53b2658218..e46dcce246 100644 --- a/doc/html/qmappixmap-members.html +++ b/doc/html/qmappixmap-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmappixmap.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QMapPixmap</title> + <title>Qt Mobility Project 1.1: List of All Members for QMapPixmap</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -33,8 +33,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmappixmap.html b/doc/html/qmappixmap.html index 2b42aec62b..9a2dd8b665 100644 --- a/doc/html/qmappixmap.html +++ b/doc/html/qmappixmap.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmappixmap.cpp --> <head> - <title>Qt Mobility Project 1.0: QMapPixmap Class Reference</title> + <title>Qt Mobility Project 1.1: QMapPixmap Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -75,8 +75,8 @@ <p>Returns the top left corner (as a geo coordinate) of this pixmap.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmappolygon-members.html b/doc/html/qmappolygon-members.html index cce4652c07..f56e3f16ba 100644 --- a/doc/html/qmappolygon-members.html +++ b/doc/html/qmappolygon-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmappolygon.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QMapPolygon</title> + <title>Qt Mobility Project 1.1: List of All Members for QMapPolygon</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -33,8 +33,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmappolygon.html b/doc/html/qmappolygon.html index adab5d61a5..486dd4aed2 100644 --- a/doc/html/qmappolygon.html +++ b/doc/html/qmappolygon.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmappolygon.cpp --> <head> - <title>Qt Mobility Project 1.0: QMapPolygon Class Reference</title> + <title>Qt Mobility Project 1.1: QMapPolygon Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -74,8 +74,8 @@ <p>Returns the polygon as a list of geo coordinates.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmaprect-members.html b/doc/html/qmaprect-members.html index 1797b75964..370c140914 100644 --- a/doc/html/qmaprect-members.html +++ b/doc/html/qmaprect-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmaprect.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QMapRect</title> + <title>Qt Mobility Project 1.1: List of All Members for QMapRect</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -38,8 +38,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmaprect.html b/doc/html/qmaprect.html index ef41d1026c..0d85b9ec70 100644 --- a/doc/html/qmaprect.html +++ b/doc/html/qmaprect.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmaprect.cpp --> <head> - <title>Qt Mobility Project 1.0: QMapRect Class Reference</title> + <title>Qt Mobility Project 1.1: QMapRect Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -77,8 +77,8 @@ <p>Returns the top left geo coordinate of the rectangle.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmaproute-members.html b/doc/html/qmaproute-members.html index 0dcec6d568..9cc049a17f 100644 --- a/doc/html/qmaproute-members.html +++ b/doc/html/qmaproute-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmaproute.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QMapRoute</title> + <title>Qt Mobility Project 1.1: List of All Members for QMapRoute</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -32,8 +32,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmaproute.html b/doc/html/qmaproute.html index 8d9ab4b6ee..9d44070056 100644 --- a/doc/html/qmaproute.html +++ b/doc/html/qmaproute.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmaproute.cpp --> <head> - <title>Qt Mobility Project 1.0: QMapRoute Class Reference</title> + <title>Qt Mobility Project 1.1: QMapRoute Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -75,8 +75,8 @@ <p>Retunrs the pen used for drawing this route.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmaptilereply-members.html b/doc/html/qmaptilereply-members.html index 3218f41a30..9347dc2c6f 100644 --- a/doc/html/qmaptilereply-members.html +++ b/doc/html/qmaptilereply-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmaptilereply.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QMapTileReply</title> + <title>Qt Mobility Project 1.1: List of All Members for QMapTileReply</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -82,8 +82,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmaptilereply.html b/doc/html/qmaptilereply.html index 103c6977d8..8ffd9b230a 100644 --- a/doc/html/qmaptilereply.html +++ b/doc/html/qmaptilereply.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmaptilereply.cpp --> <head> - <title>Qt Mobility Project 1.0: QMapTileReply Class Reference</title> + <title>Qt Mobility Project 1.1: QMapTileReply Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -128,8 +128,8 @@ <p>See also <a href="qmaptilereply.html#row">row</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmaptileservice-members.html b/doc/html/qmaptileservice-members.html index 476aec4aeb..f7554033d9 100644 --- a/doc/html/qmaptileservice-members.html +++ b/doc/html/qmaptileservice-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmaptileservice.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QMapTileService</title> + <title>Qt Mobility Project 1.1: List of All Members for QMapTileService</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -74,8 +74,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmaptileservice.html b/doc/html/qmaptileservice.html index d2af879ed4..a4f9a30b28 100644 --- a/doc/html/qmaptileservice.html +++ b/doc/html/qmaptileservice.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmaptileservice.cpp --> <head> - <title>Qt Mobility Project 1.0: QMapTileService Class Reference</title> + <title>Qt Mobility Project 1.1: QMapTileService Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -78,8 +78,8 @@ <h3 class="fn"><a name="request"></a><a href="qmaptilereply.html">QMapTileReply</a> * QMapTileService::request ( <a href="http://qt.nokia.com/doc/4.6/qtglobal.html#quint32-typedef">quint32</a> <i>level</i>, <a href="http://qt.nokia.com/doc/4.6/qtglobal.html#quint32-typedef">quint32</a> <i>row</i>, <a href="http://qt.nokia.com/doc/4.6/qtglobal.html#quint32-typedef">quint32</a> <i>col</i> ) <tt> [pure virtual]</tt></h3> <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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmapview-members.html b/doc/html/qmapview-members.html index 42f41e3987..02b84b98fe 100644 --- a/doc/html/qmapview-members.html +++ b/doc/html/qmapview-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmapview.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QMapView</title> + <title>Qt Mobility Project 1.1: List of All Members for QMapView</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -410,8 +410,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmapview-tileiterator-members.html b/doc/html/qmapview-tileiterator-members.html index b6c4e3df4d..05e809c34d 100644 --- a/doc/html/qmapview-tileiterator-members.html +++ b/doc/html/qmapview-tileiterator-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmapview.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for TileIterator</title> + <title>Qt Mobility Project 1.1: List of All Members for TileIterator</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -27,8 +27,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmapview-tileiterator.html b/doc/html/qmapview-tileiterator.html index db160e3f8d..e63d4f7b0d 100644 --- a/doc/html/qmapview-tileiterator.html +++ b/doc/html/qmapview-tileiterator.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmapview.cpp --> <head> - <title>Qt Mobility Project 1.0: TileIterator Class Reference</title> + <title>Qt Mobility Project 1.1: TileIterator Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -68,8 +68,8 @@ <p>Returns the bounding box of the map tile (in map pixel coordinates).</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmapview.html b/doc/html/qmapview.html index f17196bbce..82c0495ed7 100644 --- a/doc/html/qmapview.html +++ b/doc/html/qmapview.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmapview.cpp --> <head> - <title>Qt Mobility Project 1.0: QMapView Class Reference</title> + <title>Qt Mobility Project 1.1: QMapView Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -263,8 +263,8 @@ <p>This signal is emitted after the map has changed its zoom level.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediacontainercontrol-members.html b/doc/html/qmediacontainercontrol-members.html index c6b82cd5b0..9ef595f3ae 100644 --- a/doc/html/qmediacontainercontrol-members.html +++ b/doc/html/qmediacontainercontrol-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmediacontainercontrol.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QMediaContainerControl</title> + <title>Qt Mobility Project 1.1: List of All Members for QMediaContainerControl</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -73,8 +73,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediacontainercontrol.html b/doc/html/qmediacontainercontrol.html index 52a46b536a..0f76122271 100644 --- a/doc/html/qmediacontainercontrol.html +++ b/doc/html/qmediacontainercontrol.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmediacontainercontrol.cpp --> <head> - <title>Qt Mobility Project 1.0: QMediaContainerControl Class Reference</title> + <title>Qt Mobility Project 1.1: QMediaContainerControl Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -95,8 +95,8 @@ <p>Defines the interface name of the <a href="qmediacontainercontrol.html">QMediaContainerControl</a> class.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediacontent-members.html b/doc/html/qmediacontent-members.html index 23b07c0b9d..e5fea69197 100644 --- a/doc/html/qmediacontent-members.html +++ b/doc/html/qmediacontent-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmediacontent.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QMediaContent</title> + <title>Qt Mobility Project 1.1: List of All Members for QMediaContent</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -33,8 +33,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediacontent.html b/doc/html/qmediacontent.html index 9e1271fd05..c71490ff7c 100644 --- a/doc/html/qmediacontent.html +++ b/doc/html/qmediacontent.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmediacontent.cpp --> <head> - <title>Qt Mobility Project 1.0: QMediaContent Class Reference</title> + <title>Qt Mobility Project 1.1: QMediaContent Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -90,8 +90,8 @@ <p>Returns true if <i>other</i> is equivalent to this media content; false otherwise.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediacontrol-members.html b/doc/html/qmediacontrol-members.html index dc61681df8..0f427a89bc 100644 --- a/doc/html/qmediacontrol-members.html +++ b/doc/html/qmediacontrol-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmediacontrol.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QMediaControl</title> + <title>Qt Mobility Project 1.1: List of All Members for QMediaControl</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -69,8 +69,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediacontrol.html b/doc/html/qmediacontrol.html index d7ceb2cfe5..2986892b8f 100644 --- a/doc/html/qmediacontrol.html +++ b/doc/html/qmediacontrol.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmediacontrol.cpp --> <head> - <title>Qt Mobility Project 1.0: QMediaControl Class Reference</title> + <title>Qt Mobility Project 1.1: QMediaControl Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -84,8 +84,8 @@ <p>See also <a href="qmediaservice.html#control">QMediaService::control</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediaimageviewer-members.html b/doc/html/qmediaimageviewer-members.html index b358b3436e..e82b449034 100644 --- a/doc/html/qmediaimageviewer-members.html +++ b/doc/html/qmediaimageviewer-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmediaimageviewer.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QMediaImageViewer</title> + <title>Qt Mobility Project 1.1: List of All Members for QMediaImageViewer</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -105,8 +105,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediaimageviewer.html b/doc/html/qmediaimageviewer.html index 41a8a253f0..ddb6958d00 100644 --- a/doc/html/qmediaimageviewer.html +++ b/doc/html/qmediaimageviewer.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmediaimageviewer.cpp --> <head> - <title>Qt Mobility Project 1.0: QMediaImageViewer Class Reference</title> + <title>Qt Mobility Project 1.1: QMediaImageViewer Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -243,8 +243,8 @@ <p>The current media is retained, but the elapsed time is discarded. If resumed, the current image will be displayed for the full time out period before the next image is loaded.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediaobject-members.html b/doc/html/qmediaobject-members.html index be572fd11d..fb16770410 100644 --- a/doc/html/qmediaobject-members.html +++ b/doc/html/qmediaobject-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmediaobject.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QMediaObject</title> + <title>Qt Mobility Project 1.1: List of All Members for QMediaObject</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -89,8 +89,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediaobject.html b/doc/html/qmediaobject.html index 7be7d88fb9..416daae51e 100644 --- a/doc/html/qmediaobject.html +++ b/doc/html/qmediaobject.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmediaobject.cpp --> <head> - <title>Qt Mobility Project 1.0: QMediaObject Class Reference</title> + <title>Qt Mobility Project 1.1: QMediaObject Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -204,8 +204,8 @@ <p>See also <a href="qmediaobject.html#metaData">metaData</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediaplayer-members.html b/doc/html/qmediaplayer-members.html index 4a44d16366..1f1935efda 100644 --- a/doc/html/qmediaplayer-members.html +++ b/doc/html/qmediaplayer-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmediaplayer.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QMediaPlayer</title> + <title>Qt Mobility Project 1.1: List of All Members for QMediaPlayer</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -132,8 +132,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediaplayer.html b/doc/html/qmediaplayer.html index aad38a3ded..815dc03676 100644 --- a/doc/html/qmediaplayer.html +++ b/doc/html/qmediaplayer.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmediaplayer.cpp --> <head> - <title>Qt Mobility Project 1.0: QMediaPlayer Class Reference</title> + <title>Qt Mobility Project 1.1: QMediaPlayer Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -490,8 +490,8 @@ <p>Signal the playback volume has changed to <i>volume</i>.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediaplayercontrol-members.html b/doc/html/qmediaplayercontrol-members.html index edcd3a0cbd..59d0f665a8 100644 --- a/doc/html/qmediaplayercontrol-members.html +++ b/doc/html/qmediaplayercontrol-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmediaplayercontrol.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QMediaPlayerControl</title> + <title>Qt Mobility Project 1.1: List of All Members for QMediaPlayerControl</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -105,8 +105,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediaplayercontrol.html b/doc/html/qmediaplayercontrol.html index 4d3339ca91..b38671657a 100644 --- a/doc/html/qmediaplayercontrol.html +++ b/doc/html/qmediaplayercontrol.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmediaplayercontrol.cpp --> <head> - <title>Qt Mobility Project 1.0: QMediaPlayerControl Class Reference</title> + <title>Qt Mobility Project 1.1: QMediaPlayerControl Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -260,8 +260,8 @@ <p>Defines the interface name of the <a href="qmediaplayercontrol.html">QMediaPlayerControl</a> class.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediaplaylist-members.html b/doc/html/qmediaplaylist-members.html index a46362d070..7c1a84624d 100644 --- a/doc/html/qmediaplaylist-members.html +++ b/doc/html/qmediaplaylist-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmediaplaylist.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QMediaPlaylist</title> + <title>Qt Mobility Project 1.1: List of All Members for QMediaPlaylist</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -110,8 +110,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediaplaylist.html b/doc/html/qmediaplaylist.html index 4f6775a251..637777675d 100644 --- a/doc/html/qmediaplaylist.html +++ b/doc/html/qmediaplaylist.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmediaplaylist.cpp --> <head> - <title>Qt Mobility Project 1.0: QMediaPlaylist Class Reference</title> + <title>Qt Mobility Project 1.1: QMediaPlaylist Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -332,8 +332,8 @@ <p>Shuffle items in the playlist.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediaplaylistcontrol-members.html b/doc/html/qmediaplaylistcontrol-members.html index 97704be905..84ec423c3d 100644 --- a/doc/html/qmediaplaylistcontrol-members.html +++ b/doc/html/qmediaplaylistcontrol-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmediaplaylistcontrol.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QMediaPlaylistControl</title> + <title>Qt Mobility Project 1.1: List of All Members for QMediaPlaylistControl</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -83,8 +83,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediaplaylistcontrol.html b/doc/html/qmediaplaylistcontrol.html index 5fa4831b62..1012d06b58 100644 --- a/doc/html/qmediaplaylistcontrol.html +++ b/doc/html/qmediaplaylistcontrol.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmediaplaylistcontrol.cpp --> <head> - <title>Qt Mobility Project 1.0: QMediaPlaylistControl Class Reference</title> + <title>Qt Mobility Project 1.1: QMediaPlaylistControl Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -151,8 +151,8 @@ <p>Defines the interface name of the <a href="qmediaplaylistcontrol.html">QMediaPlaylistControl</a> class.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediaplaylistioplugin-members.html b/doc/html/qmediaplaylistioplugin-members.html index 58f3e15d1e..0ce5f90541 100644 --- a/doc/html/qmediaplaylistioplugin-members.html +++ b/doc/html/qmediaplaylistioplugin-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmediaplaylistioplugin.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QMediaPlaylistIOPlugin</title> + <title>Qt Mobility Project 1.1: List of All Members for QMediaPlaylistIOPlugin</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -76,8 +76,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediaplaylistioplugin.html b/doc/html/qmediaplaylistioplugin.html index 012d0b9f8d..e6aa0308ad 100644 --- a/doc/html/qmediaplaylistioplugin.html +++ b/doc/html/qmediaplaylistioplugin.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmediaplaylistioplugin.cpp --> <head> - <title>Qt Mobility Project 1.0: QMediaPlaylistIOPlugin Class Reference</title> + <title>Qt Mobility Project 1.1: QMediaPlaylistIOPlugin Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -90,8 +90,8 @@ <p>Returns a list of format keys supported by a plug-in.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediaplaylistnavigator-members.html b/doc/html/qmediaplaylistnavigator-members.html index 6c8f57db02..56465ae3a7 100644 --- a/doc/html/qmediaplaylistnavigator-members.html +++ b/doc/html/qmediaplaylistnavigator-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmediaplaylistnavigator.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QMediaPlaylistNavigator</title> + <title>Qt Mobility Project 1.1: List of All Members for QMediaPlaylistNavigator</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -87,8 +87,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediaplaylistnavigator.html b/doc/html/qmediaplaylistnavigator.html index 88c08d2964..ad086f7969 100644 --- a/doc/html/qmediaplaylistnavigator.html +++ b/doc/html/qmediaplaylistnavigator.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmediaplaylistnavigator.cpp --> <head> - <title>Qt Mobility Project 1.0: QMediaPlaylistNavigator Class Reference</title> + <title>Qt Mobility Project 1.1: QMediaPlaylistNavigator Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -187,8 +187,8 @@ <p>Signals that media immediately surrounding the current position has changed.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediaplaylistprovider-members.html b/doc/html/qmediaplaylistprovider-members.html index d980f35427..193223f955 100644 --- a/doc/html/qmediaplaylistprovider-members.html +++ b/doc/html/qmediaplaylistprovider-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmediaplaylistprovider.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QMediaPlaylistProvider</title> + <title>Qt Mobility Project 1.1: List of All Members for QMediaPlaylistProvider</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -91,8 +91,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediaplaylistprovider.html b/doc/html/qmediaplaylistprovider.html index dc9cdfd2b8..39d85c2ed5 100644 --- a/doc/html/qmediaplaylistprovider.html +++ b/doc/html/qmediaplaylistprovider.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmediaplaylistprovider.cpp --> <head> - <title>Qt Mobility Project 1.0: QMediaPlaylistProvider Class Reference</title> + <title>Qt Mobility Project 1.1: QMediaPlaylistProvider Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -166,8 +166,8 @@ <p>Shuffles the contents of a playlist.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediaplaylistreader-members.html b/doc/html/qmediaplaylistreader-members.html index 2b407dc9a4..3dd6e69d9b 100644 --- a/doc/html/qmediaplaylistreader-members.html +++ b/doc/html/qmediaplaylistreader-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmediaplaylistioplugin.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QMediaPlaylistReader</title> + <title>Qt Mobility Project 1.1: List of All Members for QMediaPlaylistReader</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -22,8 +22,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediaplaylistreader.html b/doc/html/qmediaplaylistreader.html index bd03f2c7be..12aa8b3ec2 100644 --- a/doc/html/qmediaplaylistreader.html +++ b/doc/html/qmediaplaylistreader.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmediaplaylistioplugin.cpp --> <head> - <title>Qt Mobility Project 1.0: QMediaPlaylistReader Class Reference</title> + <title>Qt Mobility Project 1.1: QMediaPlaylistReader Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -51,8 +51,8 @@ <p>Returns the read media, or a null <a href="qmediacontent.html">QMediaContent</a> if no more media is available.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediaplaylistwriter-members.html b/doc/html/qmediaplaylistwriter-members.html index 56a28860bc..f784e5a280 100644 --- a/doc/html/qmediaplaylistwriter-members.html +++ b/doc/html/qmediaplaylistwriter-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmediaplaylistioplugin.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QMediaPlaylistWriter</title> + <title>Qt Mobility Project 1.1: List of All Members for QMediaPlaylistWriter</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -21,8 +21,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediaplaylistwriter.html b/doc/html/qmediaplaylistwriter.html index 3d2efc433e..a2502b6264 100644 --- a/doc/html/qmediaplaylistwriter.html +++ b/doc/html/qmediaplaylistwriter.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmediaplaylistioplugin.cpp --> <head> - <title>Qt Mobility Project 1.0: QMediaPlaylistWriter Class Reference</title> + <title>Qt Mobility Project 1.1: QMediaPlaylistWriter Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -46,8 +46,8 @@ <p>Returns true if the media was written succesfully; and false otherwise.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediarecorder-members.html b/doc/html/qmediarecorder-members.html index c39a1f5ed2..6e88150b94 100644 --- a/doc/html/qmediarecorder-members.html +++ b/doc/html/qmediarecorder-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmediarecorder.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QMediaRecorder</title> + <title>Qt Mobility Project 1.1: List of All Members for QMediaRecorder</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -116,8 +116,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediarecorder.html b/doc/html/qmediarecorder.html index a842e39c57..0bafbb28b9 100644 --- a/doc/html/qmediarecorder.html +++ b/doc/html/qmediarecorder.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmediarecorder.cpp --> <head> - <title>Qt Mobility Project 1.0: QMediaRecorder Class Reference</title> + <title>Qt Mobility Project 1.1: QMediaRecorder Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -275,8 +275,8 @@ <p>See also <a href="qmediarecorder.html#setEncodingSettings">setEncodingSettings</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediarecordercontrol-members.html b/doc/html/qmediarecordercontrol-members.html index af987370cc..139a506b46 100644 --- a/doc/html/qmediarecordercontrol-members.html +++ b/doc/html/qmediarecordercontrol-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmediarecordercontrol.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QMediaRecorderControl</title> + <title>Qt Mobility Project 1.1: List of All Members for QMediaRecorderControl</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -80,8 +80,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediarecordercontrol.html b/doc/html/qmediarecordercontrol.html index cda85bca52..22a91402b3 100644 --- a/doc/html/qmediarecordercontrol.html +++ b/doc/html/qmediarecordercontrol.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmediarecordercontrol.cpp --> <head> - <title>Qt Mobility Project 1.0: QMediaRecorderControl Class Reference</title> + <title>Qt Mobility Project 1.1: QMediaRecorderControl Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -138,8 +138,8 @@ <p>Defines the interface name of the <a href="qmediarecordercontrol.html">QMediaRecorderControl</a> class.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediaresource-members.html b/doc/html/qmediaresource-members.html index 0d105204d6..e0e47febca 100644 --- a/doc/html/qmediaresource-members.html +++ b/doc/html/qmediaresource-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmediaresource.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QMediaResource</title> + <title>Qt Mobility Project 1.1: List of All Members for QMediaResource</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -53,8 +53,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediaresource.html b/doc/html/qmediaresource.html index 896df67055..af4f8990c3 100644 --- a/doc/html/qmediaresource.html +++ b/doc/html/qmediaresource.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmediaresource.cpp --> <head> - <title>Qt Mobility Project 1.0: QMediaResource Class Reference</title> + <title>Qt Mobility Project 1.1: QMediaResource Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -187,8 +187,8 @@ <p>Returns true if the resources are identical, and false otherwise.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediaservice-members.html b/doc/html/qmediaservice-members.html index 2bb060737d..fa96f875eb 100644 --- a/doc/html/qmediaservice-members.html +++ b/doc/html/qmediaservice-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmediaservice.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QMediaService</title> + <title>Qt Mobility Project 1.1: List of All Members for QMediaService</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -71,8 +71,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediaservice.html b/doc/html/qmediaservice.html index 5f860c7b0a..34a9e081ca 100644 --- a/doc/html/qmediaservice.html +++ b/doc/html/qmediaservice.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmediaservice.cpp --> <head> - <title>Qt Mobility Project 1.0: QMediaService Class Reference</title> + <title>Qt Mobility Project 1.1: QMediaService Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -77,8 +77,8 @@ <p>If the service does not implment the control a null pointer is returned instead.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediaservicefeaturesinterface-members.html b/doc/html/qmediaservicefeaturesinterface-members.html index 9244316265..eccfe69343 100644 --- a/doc/html/qmediaservicefeaturesinterface-members.html +++ b/doc/html/qmediaservicefeaturesinterface-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmediaserviceprovider.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QMediaServiceFeaturesInterface</title> + <title>Qt Mobility Project 1.1: List of All Members for QMediaServiceFeaturesInterface</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -20,8 +20,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediaservicefeaturesinterface.html b/doc/html/qmediaservicefeaturesinterface.html index 2664d09851..ea020a7838 100644 --- a/doc/html/qmediaservicefeaturesinterface.html +++ b/doc/html/qmediaservicefeaturesinterface.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmediaserviceprovider.cpp --> <head> - <title>Qt Mobility Project 1.0: QMediaServiceFeaturesInterface Class Reference</title> + <title>Qt Mobility Project 1.1: QMediaServiceFeaturesInterface Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -40,8 +40,8 @@ <p>Returns a set of features supported by a plug-in <i>service</i>.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediaserviceprovider-members.html b/doc/html/qmediaserviceprovider-members.html index 230d1ff3f4..a7afb0636f 100644 --- a/doc/html/qmediaserviceprovider-members.html +++ b/doc/html/qmediaserviceprovider-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmediaserviceprovider.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QMediaServiceProvider</title> + <title>Qt Mobility Project 1.1: List of All Members for QMediaServiceProvider</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -74,8 +74,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediaserviceprovider.html b/doc/html/qmediaserviceprovider.html index eec18ac4ac..cbd0626145 100644 --- a/doc/html/qmediaserviceprovider.html +++ b/doc/html/qmediaserviceprovider.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmediaserviceprovider.cpp --> <head> - <title>Qt Mobility Project 1.0: QMediaServiceProvider Class Reference</title> + <title>Qt Mobility Project 1.1: QMediaServiceProvider Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -84,8 +84,8 @@ <p>The resultant list is restricted to MIME types which can be supported given the constraints in <i>flags</i>.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediaserviceproviderhint-members.html b/doc/html/qmediaserviceproviderhint-members.html index a8f4345060..033266ce9b 100644 --- a/doc/html/qmediaserviceproviderhint-members.html +++ b/doc/html/qmediaserviceproviderhint-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmediaserviceprovider.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QMediaServiceProviderHint</title> + <title>Qt Mobility Project 1.1: List of All Members for QMediaServiceProviderHint</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -40,8 +40,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediaserviceproviderhint.html b/doc/html/qmediaserviceproviderhint.html index 1906234871..3e7ed5fbac 100644 --- a/doc/html/qmediaserviceproviderhint.html +++ b/doc/html/qmediaserviceproviderhint.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmediaserviceprovider.cpp --> <head> - <title>Qt Mobility Project 1.0: QMediaServiceProviderHint Class Reference</title> + <title>Qt Mobility Project 1.1: QMediaServiceProviderHint Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -132,8 +132,8 @@ <p>Returns true if the hints are equal, and false if they are not.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediaserviceproviderplugin-members.html b/doc/html/qmediaserviceproviderplugin-members.html index 73d15e95d6..e1bc89de74 100644 --- a/doc/html/qmediaserviceproviderplugin-members.html +++ b/doc/html/qmediaserviceproviderplugin-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmediaserviceprovider.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QMediaServiceProviderPlugin</title> + <title>Qt Mobility Project 1.1: List of All Members for QMediaServiceProviderPlugin</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -70,8 +70,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediaserviceproviderplugin.html b/doc/html/qmediaserviceproviderplugin.html index 647c095bd0..30fb1793ba 100644 --- a/doc/html/qmediaserviceproviderplugin.html +++ b/doc/html/qmediaserviceproviderplugin.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmediaserviceprovider.cpp --> <head> - <title>Qt Mobility Project 1.0: QMediaServiceProviderPlugin Class Reference</title> + <title>Qt Mobility Project 1.1: QMediaServiceProviderPlugin Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -65,8 +65,8 @@ <p>Destroys a media <i>service</i> constructed with <a href="qmediaserviceproviderplugin.html#create">create</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediaservicesupporteddevicesinterface-members.html b/doc/html/qmediaservicesupporteddevicesinterface-members.html index 7ecdc1e7e2..1ddbd79684 100644 --- a/doc/html/qmediaservicesupporteddevicesinterface-members.html +++ b/doc/html/qmediaservicesupporteddevicesinterface-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmediaserviceprovider.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QMediaServiceSupportedDevicesInterface</title> + <title>Qt Mobility Project 1.1: List of All Members for QMediaServiceSupportedDevicesInterface</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -21,8 +21,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediaservicesupporteddevicesinterface.html b/doc/html/qmediaservicesupporteddevicesinterface.html index 42e2f3a9c9..c2157611db 100644 --- a/doc/html/qmediaservicesupporteddevicesinterface.html +++ b/doc/html/qmediaservicesupporteddevicesinterface.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmediaserviceprovider.cpp --> <head> - <title>Qt Mobility Project 1.0: QMediaServiceSupportedDevicesInterface Class Reference</title> + <title>Qt Mobility Project 1.1: QMediaServiceSupportedDevicesInterface Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -44,8 +44,8 @@ <p>Returns a list of devices supported by a plug-in <i>service</i>.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediaservicesupportedformatsinterface-members.html b/doc/html/qmediaservicesupportedformatsinterface-members.html index ecdae1f44d..b1d69a6a32 100644 --- a/doc/html/qmediaservicesupportedformatsinterface-members.html +++ b/doc/html/qmediaservicesupportedformatsinterface-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmediaserviceprovider.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QMediaServiceSupportedFormatsInterface</title> + <title>Qt Mobility Project 1.1: List of All Members for QMediaServiceSupportedFormatsInterface</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -21,8 +21,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediaservicesupportedformatsinterface.html b/doc/html/qmediaservicesupportedformatsinterface.html index e82057f98d..40bdc84721 100644 --- a/doc/html/qmediaservicesupportedformatsinterface.html +++ b/doc/html/qmediaservicesupportedformatsinterface.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmediaserviceprovider.cpp --> <head> - <title>Qt Mobility Project 1.0: QMediaServiceSupportedFormatsInterface Class Reference</title> + <title>Qt Mobility Project 1.1: QMediaServiceSupportedFormatsInterface Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -44,8 +44,8 @@ <p>Returns a list of MIME types supported by the media service plug-in.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediastreamscontrol-members.html b/doc/html/qmediastreamscontrol-members.html index a44b2fa485..767bf104cf 100644 --- a/doc/html/qmediastreamscontrol-members.html +++ b/doc/html/qmediastreamscontrol-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmediastreamscontrol.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QMediaStreamsControl</title> + <title>Qt Mobility Project 1.1: List of All Members for QMediaStreamsControl</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -77,8 +77,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediastreamscontrol.html b/doc/html/qmediastreamscontrol.html index fba559839d..503376410f 100644 --- a/doc/html/qmediastreamscontrol.html +++ b/doc/html/qmediastreamscontrol.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmediastreamscontrol.cpp --> <head> - <title>Qt Mobility Project 1.0: QMediaStreamsControl Class Reference</title> + <title>Qt Mobility Project 1.1: QMediaStreamsControl Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -138,8 +138,8 @@ <p>Defines the interface name of the <a href="qmediastreamscontrol.html">QMediaStreamsControl</a> class.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediatimeinterval-members.html b/doc/html/qmediatimeinterval-members.html index bfc66319df..287581fde1 100644 --- a/doc/html/qmediatimeinterval-members.html +++ b/doc/html/qmediatimeinterval-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmediatimerange.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QMediaTimeInterval</title> + <title>Qt Mobility Project 1.1: List of All Members for QMediaTimeInterval</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -27,8 +27,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediatimeinterval.html b/doc/html/qmediatimeinterval.html index 065f63c9c1..e0a73f1dca 100644 --- a/doc/html/qmediatimeinterval.html +++ b/doc/html/qmediatimeinterval.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmediatimerange.cpp --> <head> - <title>Qt Mobility Project 1.0: QMediaTimeInterval Class Reference</title> + <title>Qt Mobility Project 1.1: QMediaTimeInterval Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -74,8 +74,8 @@ <p>Returns a copy of this time interval, translated by a value of <i>offset</i>. An interval can be moved forward through time with a positive offset, or backward through time with a negative offset.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediatimerange-members.html b/doc/html/qmediatimerange-members.html index 4482f61fa7..020e6b391f 100644 --- a/doc/html/qmediatimerange-members.html +++ b/doc/html/qmediatimerange-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmediatimerange.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QMediaTimeRange</title> + <title>Qt Mobility Project 1.1: List of All Members for QMediaTimeRange</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -46,8 +46,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmediatimerange.html b/doc/html/qmediatimerange.html index d65eafe96e..2656f136cb 100644 --- a/doc/html/qmediatimerange.html +++ b/doc/html/qmediatimerange.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmediatimerange.cpp --> <head> - <title>Qt Mobility Project 1.0: QMediaTimeRange Class Reference</title> + <title>Qt Mobility Project 1.1: QMediaTimeRange Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -167,8 +167,8 @@ <p>Returns true if all intervals in <i>a</i> are present in <i>b</i>.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmessage-members.html b/doc/html/qmessage-members.html index c83b3b9bff..42f361dc48 100644 --- a/doc/html/qmessage-members.html +++ b/doc/html/qmessage-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmessage.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QMessage</title> + <title>Qt Mobility Project 1.1: List of All Members for QMessage</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -87,8 +87,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmessage.html b/doc/html/qmessage.html index 31e4c7ed62..5b33e0e79f 100644 --- a/doc/html/qmessage.html +++ b/doc/html/qmessage.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmessage.cpp --> <head> - <title>Qt Mobility Project 1.0: QMessage Class Reference</title> + <title>Qt Mobility Project 1.1: QMessage Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -352,8 +352,8 @@ <p>See also <a href="qmessage.html#setType">setType</a>() and <a href="qmessagefilter.html#byType">QMessageFilter::byType</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmessageaccount-members.html b/doc/html/qmessageaccount-members.html index c91a86f456..13abf020d4 100644 --- a/doc/html/qmessageaccount-members.html +++ b/doc/html/qmessageaccount-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmessageaccount.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QMessageAccount</title> + <title>Qt Mobility Project 1.1: List of All Members for QMessageAccount</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -26,8 +26,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmessageaccount.html b/doc/html/qmessageaccount.html index eeb1e67c37..c9e0f5cad9 100644 --- a/doc/html/qmessageaccount.html +++ b/doc/html/qmessageaccount.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmessageaccount.cpp --> <head> - <title>Qt Mobility Project 1.0: QMessageAccount Class Reference</title> + <title>Qt Mobility Project 1.1: QMessageAccount Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -70,8 +70,8 @@ <p>Returns the name of the account for display purposes.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmessageaccountfilter-members.html b/doc/html/qmessageaccountfilter-members.html index f2467abf05..65b2007b5d 100644 --- a/doc/html/qmessageaccountfilter-members.html +++ b/doc/html/qmessageaccountfilter-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmessageaccountfilter.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QMessageAccountFilter</title> + <title>Qt Mobility Project 1.1: List of All Members for QMessageAccountFilter</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -39,8 +39,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmessageaccountfilter.html b/doc/html/qmessageaccountfilter.html index 6131b672b1..fe3bc8ce0b 100644 --- a/doc/html/qmessageaccountfilter.html +++ b/doc/html/qmessageaccountfilter.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmessageaccountfilter.cpp --> <head> - <title>Qt Mobility Project 1.0: QMessageAccountFilter Class Reference</title> + <title>Qt Mobility Project 1.1: QMessageAccountFilter Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -118,8 +118,8 @@ <p>See also <a href="qmessageaccountfilter.html#isEmpty">isEmpty</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmessageaccountid-members.html b/doc/html/qmessageaccountid-members.html index bc8e06798b..74af0fe911 100644 --- a/doc/html/qmessageaccountid-members.html +++ b/doc/html/qmessageaccountid-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmessageaccountid.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QMessageAccountId</title> + <title>Qt Mobility Project 1.1: List of All Members for QMessageAccountId</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -25,8 +25,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmessageaccountid.html b/doc/html/qmessageaccountid.html index 45229d8c00..ca8d7c2d44 100644 --- a/doc/html/qmessageaccountid.html +++ b/doc/html/qmessageaccountid.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmessageaccountid.cpp --> <head> - <title>Qt Mobility Project 1.0: QMessageAccountId Class Reference</title> + <title>Qt Mobility Project 1.1: QMessageAccountId Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -64,8 +64,8 @@ <p>Returns true if this identifier is ordered before <i>other</i> using an implementation-defined ordering.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmessageaccountsortorder-members.html b/doc/html/qmessageaccountsortorder-members.html index e9aabe09aa..c97fb323f3 100644 --- a/doc/html/qmessageaccountsortorder-members.html +++ b/doc/html/qmessageaccountsortorder-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmessageaccountsortorder.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QMessageAccountSortOrder</title> + <title>Qt Mobility Project 1.1: List of All Members for QMessageAccountSortOrder</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -24,8 +24,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmessageaccountsortorder.html b/doc/html/qmessageaccountsortorder.html index 65e6829afd..4dfa160b67 100644 --- a/doc/html/qmessageaccountsortorder.html +++ b/doc/html/qmessageaccountsortorder.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmessageaccountsortorder.cpp --> <head> - <title>Qt Mobility Project 1.0: QMessageAccountSortOrder Class Reference</title> + <title>Qt Mobility Project 1.1: QMessageAccountSortOrder Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -65,8 +65,8 @@ <p>Returns true if the sort order is supported on the current platform; otherwise returns false.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmessageaddress-members.html b/doc/html/qmessageaddress-members.html index 81498ffc78..5b584e7913 100644 --- a/doc/html/qmessageaddress-members.html +++ b/doc/html/qmessageaddress-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmessageaddress.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QMessageAddress</title> + <title>Qt Mobility Project 1.1: List of All Members for QMessageAddress</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -28,8 +28,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmessageaddress.html b/doc/html/qmessageaddress.html index 2fb3e1b927..112dfba089 100644 --- a/doc/html/qmessageaddress.html +++ b/doc/html/qmessageaddress.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmessageaddress.cpp --> <head> - <title>Qt Mobility Project 1.0: QMessageAddress Class Reference</title> + <title>Qt Mobility Project 1.1: QMessageAddress Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -102,8 +102,8 @@ <p>See also <a href="qmessageaddress.html#setType">setType</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmessagecontentcontainer-members.html b/doc/html/qmessagecontentcontainer-members.html index fca7a45731..71d41a7e90 100644 --- a/doc/html/qmessagecontentcontainer-members.html +++ b/doc/html/qmessagecontentcontainer-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmessagecontentcontainer.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QMessageContentContainer</title> + <title>Qt Mobility Project 1.1: List of All Members for QMessageContentContainer</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -41,8 +41,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmessagecontentcontainer.html b/doc/html/qmessagecontentcontainer.html index 30e73b58e7..e1a07dc94f 100644 --- a/doc/html/qmessagecontentcontainer.html +++ b/doc/html/qmessagecontentcontainer.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmessagecontentcontainer.cpp --> <head> - <title>Qt Mobility Project 1.0: QMessageContentContainer Class Reference</title> + <title>Qt Mobility Project 1.1: QMessageContentContainer Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -130,8 +130,8 @@ <p>For a non-multipart container, writes the content as returned by <a href="qmessagecontentcontainer.html#textContent">textContent</a>() to the stream <i>out</i>; otherwise does nothing.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmessagecontentcontainerid-members.html b/doc/html/qmessagecontentcontainerid-members.html index 3dba263a6a..e85d3cf317 100644 --- a/doc/html/qmessagecontentcontainerid-members.html +++ b/doc/html/qmessagecontentcontainerid-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmessagecontentcontainerid.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QMessageContentContainerId</title> + <title>Qt Mobility Project 1.1: List of All Members for QMessageContentContainerId</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -24,8 +24,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmessagecontentcontainerid.html b/doc/html/qmessagecontentcontainerid.html index 7f621e755f..fe9eccce42 100644 --- a/doc/html/qmessagecontentcontainerid.html +++ b/doc/html/qmessagecontentcontainerid.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmessagecontentcontainerid.cpp --> <head> - <title>Qt Mobility Project 1.0: QMessageContentContainerId Class Reference</title> + <title>Qt Mobility Project 1.1: QMessageContentContainerId Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -62,8 +62,8 @@ <p>String representations of identifiers should not be used to test for equality, instead the equality operator should be used.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmessagedatacomparator.html b/doc/html/qmessagedatacomparator.html index e38627c340..1afbeb08ed 100644 --- a/doc/html/qmessagedatacomparator.html +++ b/doc/html/qmessagedatacomparator.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmessagedatacomparator.cpp --> <head> - <title>Qt Mobility Project 1.0: QMessageDataComparator Namespace Reference</title> + <title>Qt Mobility Project 1.1: QMessageDataComparator Namespace Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -80,8 +80,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmessagefilter-members.html b/doc/html/qmessagefilter-members.html index d159963720..b5984ebba7 100644 --- a/doc/html/qmessagefilter-members.html +++ b/doc/html/qmessagefilter-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmessagefilter.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QMessageFilter</title> + <title>Qt Mobility Project 1.1: List of All Members for QMessageFilter</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -60,8 +60,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmessagefilter.html b/doc/html/qmessagefilter.html index 89dc4ae287..d0df2870fa 100644 --- a/doc/html/qmessagefilter.html +++ b/doc/html/qmessagefilter.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmessagefilter.cpp --> <head> - <title>Qt Mobility Project 1.0: QMessageFilter Class Reference</title> + <title>Qt Mobility Project 1.1: QMessageFilter Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -219,8 +219,8 @@ <p>See also <a href="qmessagefilter.html#isEmpty">isEmpty</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmessagefolder-members.html b/doc/html/qmessagefolder-members.html index bedee2de2c..aa5db90d51 100644 --- a/doc/html/qmessagefolder-members.html +++ b/doc/html/qmessagefolder-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmessagefolder.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QMessageFolder</title> + <title>Qt Mobility Project 1.1: List of All Members for QMessageFolder</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -27,8 +27,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmessagefolder.html b/doc/html/qmessagefolder.html index 185c001b0b..6ab1a45f90 100644 --- a/doc/html/qmessagefolder.html +++ b/doc/html/qmessagefolder.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmessagefolder.cpp --> <head> - <title>Qt Mobility Project 1.0: QMessageFolder Class Reference</title> + <title>Qt Mobility Project 1.1: QMessageFolder Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -67,8 +67,8 @@ <p>Returns the path of the folder.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmessagefolderfilter-members.html b/doc/html/qmessagefolderfilter-members.html index 23426ba9be..84e92ec580 100644 --- a/doc/html/qmessagefolderfilter-members.html +++ b/doc/html/qmessagefolderfilter-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmessagefolderfilter.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QMessageFolderFilter</title> + <title>Qt Mobility Project 1.1: List of All Members for QMessageFolderFilter</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -47,8 +47,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmessagefolderfilter.html b/doc/html/qmessagefolderfilter.html index 92f9a291f0..f75cf50e42 100644 --- a/doc/html/qmessagefolderfilter.html +++ b/doc/html/qmessagefolderfilter.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmessagefolderfilter.cpp --> <head> - <title>Qt Mobility Project 1.0: QMessageFolderFilter Class Reference</title> + <title>Qt Mobility Project 1.1: QMessageFolderFilter Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -154,8 +154,8 @@ <p>See also <a href="qmessagefolderfilter.html#isEmpty">isEmpty</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmessagefolderid-members.html b/doc/html/qmessagefolderid-members.html index 988de1adc7..0fafbd8dd7 100644 --- a/doc/html/qmessagefolderid-members.html +++ b/doc/html/qmessagefolderid-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmessagefolderid.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QMessageFolderId</title> + <title>Qt Mobility Project 1.1: List of All Members for QMessageFolderId</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -25,8 +25,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmessagefolderid.html b/doc/html/qmessagefolderid.html index 6ef50819b0..138741eab4 100644 --- a/doc/html/qmessagefolderid.html +++ b/doc/html/qmessagefolderid.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmessagefolderid.cpp --> <head> - <title>Qt Mobility Project 1.0: QMessageFolderId Class Reference</title> + <title>Qt Mobility Project 1.1: QMessageFolderId Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -64,8 +64,8 @@ <p>Returns true if this identifier is ordered before <i>other</i> using an implementation-defined ordering.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmessagefoldersortorder-members.html b/doc/html/qmessagefoldersortorder-members.html index a80e43fd57..cb770eaa4f 100644 --- a/doc/html/qmessagefoldersortorder-members.html +++ b/doc/html/qmessagefoldersortorder-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmessagefoldersortorder.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QMessageFolderSortOrder</title> + <title>Qt Mobility Project 1.1: List of All Members for QMessageFolderSortOrder</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -27,8 +27,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmessagefoldersortorder.html b/doc/html/qmessagefoldersortorder.html index f3e167a493..2198a1aae3 100644 --- a/doc/html/qmessagefoldersortorder.html +++ b/doc/html/qmessagefoldersortorder.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmessagefoldersortorder.cpp --> <head> - <title>Qt Mobility Project 1.0: QMessageFolderSortOrder Class Reference</title> + <title>Qt Mobility Project 1.1: QMessageFolderSortOrder Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -80,8 +80,8 @@ <p>This function determines sorting precedence.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmessageid-members.html b/doc/html/qmessageid-members.html index 67693ba408..e2800fdce6 100644 --- a/doc/html/qmessageid-members.html +++ b/doc/html/qmessageid-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmessageid.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QMessageId</title> + <title>Qt Mobility Project 1.1: List of All Members for QMessageId</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -25,8 +25,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmessageid.html b/doc/html/qmessageid.html index bef0dc5d0b..9defc5aaa0 100644 --- a/doc/html/qmessageid.html +++ b/doc/html/qmessageid.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmessageid.cpp --> <head> - <title>Qt Mobility Project 1.0: QMessageId Class Reference</title> + <title>Qt Mobility Project 1.1: QMessageId Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -65,8 +65,8 @@ <p>Returns true if this identifier is ordered before <i>other</i> using an implementation-defined ordering.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmessagemanager-members.html b/doc/html/qmessagemanager-members.html index b3b436f211..be1eb74d2c 100644 --- a/doc/html/qmessagemanager-members.html +++ b/doc/html/qmessagemanager-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmessagemanager.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QMessageManager</title> + <title>Qt Mobility Project 1.1: List of All Members for QMessageManager</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -97,8 +97,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmessagemanager.html b/doc/html/qmessagemanager.html index a46aa025d9..63ad833929 100644 --- a/doc/html/qmessagemanager.html +++ b/doc/html/qmessagemanager.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmessagemanager.cpp --> <head> - <title>Qt Mobility Project 1.0: QMessageManager Class Reference</title> + <title>Qt Mobility Project 1.1: QMessageManager Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -262,8 +262,8 @@ <p>See also <a href="qmessagemanager.html#addMessage">addMessage</a>(), <a href="qmessagemanager.html#removeMessage">removeMessage</a>(), and <a href="qmessageservice.html#exportUpdates">QMessageService::exportUpdates</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmessageservice-members.html b/doc/html/qmessageservice-members.html index 0c95d4c177..2e6b23c949 100644 --- a/doc/html/qmessageservice-members.html +++ b/doc/html/qmessageservice-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmessageservice.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QMessageService</title> + <title>Qt Mobility Project 1.1: List of All Members for QMessageService</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -87,8 +87,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmessageservice.html b/doc/html/qmessageservice.html index c12d040b2f..ae60aa84e9 100644 --- a/doc/html/qmessageservice.html +++ b/doc/html/qmessageservice.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmessageservice.cpp --> <head> - <title>Qt Mobility Project 1.0: QMessageService Class Reference</title> + <title>Qt Mobility Project 1.1: QMessageService Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -213,8 +213,8 @@ <p>See also <a href="qmessageservice.html#state">state</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmessagesortorder-members.html b/doc/html/qmessagesortorder-members.html index cd42d1e02f..a3fba25976 100644 --- a/doc/html/qmessagesortorder-members.html +++ b/doc/html/qmessagesortorder-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmessagesortorder.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QMessageSortOrder</title> + <title>Qt Mobility Project 1.1: List of All Members for QMessageSortOrder</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -38,8 +38,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmessagesortorder.html b/doc/html/qmessagesortorder.html index a25485408b..bc384a7baf 100644 --- a/doc/html/qmessagesortorder.html +++ b/doc/html/qmessagesortorder.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmessagesortorder.cpp --> <head> - <title>Qt Mobility Project 1.0: QMessageSortOrder Class Reference</title> + <title>Qt Mobility Project 1.1: QMessageSortOrder Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -125,8 +125,8 @@ <p>On the Windows Mobile platform <a href="qmessagesortorder.html#bySubject">bySubject</a>() and <a href="qmessagesortorder.html#byReceptionTimeStamp">byReceptionTimeStamp</a>() sort orders can not be combined with each other.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmetadatacontrol-members.html b/doc/html/qmetadatacontrol-members.html index 3c0234a8ee..a670ef483b 100644 --- a/doc/html/qmetadatacontrol-members.html +++ b/doc/html/qmetadatacontrol-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmetadatacontrol.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QMetaDataControl</title> + <title>Qt Mobility Project 1.1: List of All Members for QMetaDataControl</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -80,8 +80,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmetadatacontrol.html b/doc/html/qmetadatacontrol.html index 622d9aa782..9c2606fb50 100644 --- a/doc/html/qmetadatacontrol.html +++ b/doc/html/qmetadatacontrol.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmetadatacontrol.cpp --> <head> - <title>Qt Mobility Project 1.0: QMetaDataControl Class Reference</title> + <title>Qt Mobility Project 1.1: QMetaDataControl Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -136,8 +136,8 @@ <p>Defines the interface name of the <a href="qmetadatacontrol.html">QMetaDataControl</a> class.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmlcontacts-contents-default-svg.html b/doc/html/qmlcontacts-contents-default-svg.html index d2ea735475..69be9a2f51 100644 --- a/doc/html/qmlcontacts-contents-default-svg.html +++ b/doc/html/qmlcontacts-contents-default-svg.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: default.svg Example File (qmlcontacts/contents/default.svg)</title> + <title>Qt Mobility Project 1.1: default.svg Example File (qmlcontacts/contents/default.svg)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -97,8 +97,8 @@ </svg></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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmlcontacts-main-cpp.html b/doc/html/qmlcontacts-main-cpp.html index 7bfc2d03d2..bbd1ee1c27 100644 --- a/doc/html/qmlcontacts-main-cpp.html +++ b/doc/html/qmlcontacts-main-cpp.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: main.cpp Example File (qmlcontacts/main.cpp)</title> + <title>Qt Mobility Project 1.1: main.cpp Example File (qmlcontacts/main.cpp)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -92,8 +92,8 @@ }</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmlcontacts-qmlcontact-cpp.html b/doc/html/qmlcontacts-qmlcontact-cpp.html index 6b189b52c1..12afddc62e 100644 --- a/doc/html/qmlcontacts-qmlcontact-cpp.html +++ b/doc/html/qmlcontacts-qmlcontact-cpp.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: qmlcontact.cpp Example File (qmlcontacts/qmlcontact.cpp)</title> + <title>Qt Mobility Project 1.1: qmlcontact.cpp Example File (qmlcontacts/qmlcontact.cpp)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -207,8 +207,8 @@ #include "moc_qmlcontact.cpp"</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmlcontacts-qmlcontact-h.html b/doc/html/qmlcontacts-qmlcontact-h.html index 3cacc6b9ab..a173cb7515 100644 --- a/doc/html/qmlcontacts-qmlcontact-h.html +++ b/doc/html/qmlcontacts-qmlcontact-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: qmlcontact.h Example File (qmlcontacts/qmlcontact.h)</title> + <title>Qt Mobility Project 1.1: qmlcontact.h Example File (qmlcontacts/qmlcontact.h)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -116,8 +116,8 @@ #endif <span class="comment">// QMLCONTACT_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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmlcontacts-qmlcontacts-cpp.html b/doc/html/qmlcontacts-qmlcontacts-cpp.html index a0c5d29c45..f0da2e927d 100644 --- a/doc/html/qmlcontacts-qmlcontacts-cpp.html +++ b/doc/html/qmlcontacts-qmlcontacts-cpp.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: qmlcontacts.cpp Example File (qmlcontacts/qmlcontacts.cpp)</title> + <title>Qt Mobility Project 1.1: qmlcontacts.cpp Example File (qmlcontacts/qmlcontacts.cpp)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -196,8 +196,8 @@ #include "moc_qmlcontactsa.cpp"</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmlcontacts-qmlcontacts-pro.html b/doc/html/qmlcontacts-qmlcontacts-pro.html index 485da9f746..5cac41f487 100644 --- a/doc/html/qmlcontacts-qmlcontacts-pro.html +++ b/doc/html/qmlcontacts-qmlcontacts-pro.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: qmlcontacts.pro Example File (qmlcontacts/qmlcontacts.pro)</title> + <title>Qt Mobility Project 1.1: qmlcontacts.pro Example File (qmlcontacts/qmlcontacts.pro)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -53,8 +53,8 @@ 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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmlcontacts-qmlcontacts-qrc.html b/doc/html/qmlcontacts-qmlcontacts-qrc.html index 2bc72869ae..32bfa465e0 100644 --- a/doc/html/qmlcontacts-qmlcontacts-qrc.html +++ b/doc/html/qmlcontacts-qmlcontacts-qrc.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: qmlcontacts.qrc Example File (qmlcontacts/qmlcontacts.qrc)</title> + <title>Qt Mobility Project 1.1: qmlcontacts.qrc Example File (qmlcontacts/qmlcontacts.qrc)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -24,8 +24,8 @@ </RCC></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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmlcontacts-qmlcontactsa-h.html b/doc/html/qmlcontacts-qmlcontactsa-h.html index 625f7192b4..79482d14a6 100644 --- a/doc/html/qmlcontacts-qmlcontactsa-h.html +++ b/doc/html/qmlcontacts-qmlcontactsa-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: qmlcontactsa.h Example File (qmlcontacts/qmlcontactsa.h)</title> + <title>Qt Mobility Project 1.1: qmlcontactsa.h Example File (qmlcontacts/qmlcontactsa.h)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -125,8 +125,8 @@ #endif <span class="comment">// QMLCONTACTS_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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qmlcontacts.html b/doc/html/qmlcontacts.html index 8fc8b0b6c8..269f6d9f29 100644 --- a/doc/html/qmlcontacts.html +++ b/doc/html/qmlcontacts.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmlcontacts.qdoc --> <head> - <title>Qt Mobility Project 1.0: Sample QML-based Phonebook Example</title> + <title>Qt Mobility Project 1.1: Sample QML-based Phonebook Example</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -45,8 +45,8 @@ <p>The example is not intended to be feature complete. Only a very limited subset of detail types are supported by the application. It exercises only a very small portion of the Qt Contacts API. The example is read-only and not performant.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qnetworkconfiguration-members.html b/doc/html/qnetworkconfiguration-members.html index 96618291bf..6835eea450 100644 --- a/doc/html/qnetworkconfiguration-members.html +++ b/doc/html/qnetworkconfiguration-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qnetworkconfiguration.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QNetworkConfiguration</title> + <title>Qt Mobility Project 1.1: List of All Members for QNetworkConfiguration</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -41,8 +41,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qnetworkconfiguration.html b/doc/html/qnetworkconfiguration.html index 5d4e34d9d5..28cc374973 100644 --- a/doc/html/qnetworkconfiguration.html +++ b/doc/html/qnetworkconfiguration.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qnetworkconfiguration.cpp --> <head> - <title>Qt Mobility Project 1.0: QNetworkConfiguration Class Reference</title> + <title>Qt Mobility Project 1.1: QNetworkConfiguration Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -177,8 +177,8 @@ <p>Returns true, if this configuration is the same as the <i>other</i> configuration given; otherwise returns false.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qnetworkconfigurationmanager-members.html b/doc/html/qnetworkconfigurationmanager-members.html index b311fcb81f..db069840db 100644 --- a/doc/html/qnetworkconfigurationmanager-members.html +++ b/doc/html/qnetworkconfigurationmanager-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qnetworkconfigmanager.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QNetworkConfigurationManager</title> + <title>Qt Mobility Project 1.1: List of All Members for QNetworkConfigurationManager</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -82,8 +82,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qnetworkconfigurationmanager.html b/doc/html/qnetworkconfigurationmanager.html index c3d6963708..07607c39d3 100644 --- a/doc/html/qnetworkconfigurationmanager.html +++ b/doc/html/qnetworkconfigurationmanager.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qnetworkconfigmanager.cpp --> <head> - <title>Qt Mobility Project 1.0: QNetworkConfigurationManager Class Reference</title> + <title>Qt Mobility Project 1.1: QNetworkConfigurationManager Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -161,8 +161,8 @@ <p>See also <a href="qnetworkconfigurationmanager.html#allConfigurations">allConfigurations</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qnetworksession-members.html b/doc/html/qnetworksession-members.html index ce6e4756bf..335cb2df4c 100644 --- a/doc/html/qnetworksession-members.html +++ b/doc/html/qnetworksession-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qnetworksession.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QNetworkSession</title> + <title>Qt Mobility Project 1.1: List of All Members for QNetworkSession</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -96,8 +96,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qnetworksession.html b/doc/html/qnetworksession.html index e108c1e784..67745ab29c 100644 --- a/doc/html/qnetworksession.html +++ b/doc/html/qnetworksession.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qnetworksession.cpp --> <head> - <title>Qt Mobility Project 1.0: QNetworkSession Class Reference</title> + <title>Qt Mobility Project 1.1: QNetworkSession Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -294,8 +294,8 @@ <p>See also <a href="qnetworksession.html#open">open</a>() and <a href="qnetworksession.html#error">error</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qnmeapositioninfosource-members.html b/doc/html/qnmeapositioninfosource-members.html index ee06554b5e..693f2eed3d 100644 --- a/doc/html/qnmeapositioninfosource-members.html +++ b/doc/html/qnmeapositioninfosource-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qnmeapositioninfosource.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QNmeaPositionInfoSource</title> + <title>Qt Mobility Project 1.1: List of All Members for QNmeaPositionInfoSource</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -89,8 +89,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qnmeapositioninfosource.html b/doc/html/qnmeapositioninfosource.html index c220e8d8a3..7576580599 100644 --- a/doc/html/qnmeapositioninfosource.html +++ b/doc/html/qnmeapositioninfosource.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qnmeapositioninfosource.cpp --> <head> - <title>Qt Mobility Project 1.0: QNmeaPositionInfoSource Class Reference</title> + <title>Qt Mobility Project 1.1: QNmeaPositionInfoSource Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -151,8 +151,8 @@ <p>Returns the update mode.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qorientationfilter-members.html b/doc/html/qorientationfilter-members.html index b936f67920..31b1080859 100644 --- a/doc/html/qorientationfilter-members.html +++ b/doc/html/qorientationfilter-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qorientationsensor.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QOrientationFilter</title> + <title>Qt Mobility Project 1.1: List of All Members for QOrientationFilter</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -20,8 +20,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qorientationfilter.html b/doc/html/qorientationfilter.html index daac82aebf..0e934d5425 100644 --- a/doc/html/qorientationfilter.html +++ b/doc/html/qorientationfilter.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qorientationsensor.cpp --> <head> - <title>Qt Mobility Project 1.0: QOrientationFilter Class Reference</title> + <title>Qt Mobility Project 1.1: QOrientationFilter Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -41,8 +41,8 @@ <p>See also <a href="qsensorfilter.html#filter">QSensorFilter::filter</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qorientationreading-members.html b/doc/html/qorientationreading-members.html index 54d56bdd6f..3422c805c5 100644 --- a/doc/html/qorientationreading-members.html +++ b/doc/html/qorientationreading-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qorientationsensor.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QOrientationReading</title> + <title>Qt Mobility Project 1.1: List of All Members for QOrientationReading</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -74,8 +74,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qorientationreading.html b/doc/html/qorientationreading.html index 0054eb2b85..50fd3020b0 100644 --- a/doc/html/qorientationreading.html +++ b/doc/html/qorientationreading.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qorientationsensor.cpp --> <head> - <title>Qt Mobility Project 1.0: QOrientationReading Class Reference</title> + <title>Qt Mobility Project 1.1: QOrientationReading Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -105,8 +105,8 @@ <p>See also <a href="qorientationreading.html#orientation-prop">orientation</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qorientationsensor-members.html b/doc/html/qorientationsensor-members.html index f54f29535d..00e9e8db6b 100644 --- a/doc/html/qorientationsensor-members.html +++ b/doc/html/qorientationsensor-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qorientationsensor.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QOrientationSensor</title> + <title>Qt Mobility Project 1.1: List of All Members for QOrientationSensor</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -96,8 +96,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qorientationsensor.html b/doc/html/qorientationsensor.html index 471a7fc2af..9fe78a272c 100644 --- a/doc/html/qorientationsensor.html +++ b/doc/html/qorientationsensor.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qorientationsensor.cpp --> <head> - <title>Qt Mobility Project 1.0: QOrientationSensor Class Reference</title> + <title>Qt Mobility Project 1.1: QOrientationSensor Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -67,8 +67,8 @@ <p>See also <a href="qsensor.html#reading-prop">QSensor::reading</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qproximityfilter-members.html b/doc/html/qproximityfilter-members.html index e0be760864..1a5675bd61 100644 --- a/doc/html/qproximityfilter-members.html +++ b/doc/html/qproximityfilter-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qproximitysensor.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QProximityFilter</title> + <title>Qt Mobility Project 1.1: List of All Members for QProximityFilter</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -20,8 +20,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qproximityfilter.html b/doc/html/qproximityfilter.html index 2ac099c196..5a848df674 100644 --- a/doc/html/qproximityfilter.html +++ b/doc/html/qproximityfilter.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qproximitysensor.cpp --> <head> - <title>Qt Mobility Project 1.0: QProximityFilter Class Reference</title> + <title>Qt Mobility Project 1.1: QProximityFilter Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -41,8 +41,8 @@ <p>See also <a href="qsensorfilter.html#filter">QSensorFilter::filter</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qproximityreading-members.html b/doc/html/qproximityreading-members.html index d18f251500..bfb6dbbe5e 100644 --- a/doc/html/qproximityreading-members.html +++ b/doc/html/qproximityreading-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qproximitysensor.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QProximityReading</title> + <title>Qt Mobility Project 1.1: List of All Members for QProximityReading</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -73,8 +73,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qproximityreading.html b/doc/html/qproximityreading.html index e88131f921..e87e12cf03 100644 --- a/doc/html/qproximityreading.html +++ b/doc/html/qproximityreading.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qproximitysensor.cpp --> <head> - <title>Qt Mobility Project 1.0: QProximityReading Class Reference</title> + <title>Qt Mobility Project 1.1: QProximityReading Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -74,8 +74,8 @@ <p>See also <a href="qproximityreading.html#close-prop">close</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qproximitysensor-members.html b/doc/html/qproximitysensor-members.html index f904da7d78..94a0830b47 100644 --- a/doc/html/qproximitysensor-members.html +++ b/doc/html/qproximitysensor-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qproximitysensor.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QProximitySensor</title> + <title>Qt Mobility Project 1.1: List of All Members for QProximitySensor</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -96,8 +96,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qproximitysensor.html b/doc/html/qproximitysensor.html index ecb41ae8bc..4a74bf44be 100644 --- a/doc/html/qproximitysensor.html +++ b/doc/html/qproximitysensor.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qproximitysensor.cpp --> <head> - <title>Qt Mobility Project 1.0: QProximitySensor Class Reference</title> + <title>Qt Mobility Project 1.1: QProximitySensor Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -67,8 +67,8 @@ <p>See also <a href="qsensor.html#reading-prop">QSensor::reading</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qradiotuner-members.html b/doc/html/qradiotuner-members.html index 4622971a3d..0ccd8eb433 100644 --- a/doc/html/qradiotuner-members.html +++ b/doc/html/qradiotuner-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qradiotuner.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QRadioTuner</title> + <title>Qt Mobility Project 1.1: List of All Members for QRadioTuner</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -126,8 +126,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qradiotuner.html b/doc/html/qradiotuner.html index 4e3ddeed1a..bd817624d6 100644 --- a/doc/html/qradiotuner.html +++ b/doc/html/qradiotuner.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qradiotuner.cpp --> <head> - <title>Qt Mobility Project 1.0: QRadioTuner Class Reference</title> + <title>Qt Mobility Project 1.1: QRadioTuner Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -394,8 +394,8 @@ <p>Signals that the <i>volume</i> of a radio tuner's audio output has changed.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qradiotunercontrol-members.html b/doc/html/qradiotunercontrol-members.html index 056d80c367..1a50b064df 100644 --- a/doc/html/qradiotunercontrol-members.html +++ b/doc/html/qradiotunercontrol-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qradiotunercontrol.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QRadioTunerControl</title> + <title>Qt Mobility Project 1.1: List of All Members for QRadioTunerControl</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -104,8 +104,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qradiotunercontrol.html b/doc/html/qradiotunercontrol.html index 97b06b8473..d1d5723b7c 100644 --- a/doc/html/qradiotunercontrol.html +++ b/doc/html/qradiotunercontrol.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qradiotunercontrol.cpp --> <head> - <title>Qt Mobility Project 1.0: QRadioTunerControl Class Reference</title> + <title>Qt Mobility Project 1.1: QRadioTunerControl Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -237,8 +237,8 @@ <p>Defines the interface name of the <a href="qradiotunercontrol.html">QRadioTunerControl</a> class.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qrotationfilter-members.html b/doc/html/qrotationfilter-members.html index 31e282975a..4f844c0f5d 100644 --- a/doc/html/qrotationfilter-members.html +++ b/doc/html/qrotationfilter-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qrotationsensor.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QRotationFilter</title> + <title>Qt Mobility Project 1.1: List of All Members for QRotationFilter</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -20,8 +20,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qrotationfilter.html b/doc/html/qrotationfilter.html index e2bc9f074b..a0a1fae825 100644 --- a/doc/html/qrotationfilter.html +++ b/doc/html/qrotationfilter.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qrotationsensor.cpp --> <head> - <title>Qt Mobility Project 1.0: QRotationFilter Class Reference</title> + <title>Qt Mobility Project 1.1: QRotationFilter Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -41,8 +41,8 @@ <p>See also <a href="qsensorfilter.html#filter">QSensorFilter::filter</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qrotationreading-members.html b/doc/html/qrotationreading-members.html index 673b2aca58..eada7c0ef9 100644 --- a/doc/html/qrotationreading-members.html +++ b/doc/html/qrotationreading-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qrotationsensor.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QRotationReading</title> + <title>Qt Mobility Project 1.1: List of All Members for QRotationReading</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -77,8 +77,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qrotationreading.html b/doc/html/qrotationreading.html index ede7d05252..bfe3e86188 100644 --- a/doc/html/qrotationreading.html +++ b/doc/html/qrotationreading.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qrotationsensor.cpp --> <head> - <title>Qt Mobility Project 1.0: QRotationReading Class Reference</title> + <title>Qt Mobility Project 1.1: QRotationReading Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -119,8 +119,8 @@ <p>See also <a href="qrotationreading.html#z-prop">z</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qrotationsensor-members.html b/doc/html/qrotationsensor-members.html index f2fe39917f..6f611c6bf5 100644 --- a/doc/html/qrotationsensor-members.html +++ b/doc/html/qrotationsensor-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qrotationsensor.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QRotationSensor</title> + <title>Qt Mobility Project 1.1: List of All Members for QRotationSensor</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -96,8 +96,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qrotationsensor.html b/doc/html/qrotationsensor.html index c15562c253..437db8ab1c 100644 --- a/doc/html/qrotationsensor.html +++ b/doc/html/qrotationsensor.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qrotationsensor.cpp --> <head> - <title>Qt Mobility Project 1.0: QRotationSensor Class Reference</title> + <title>Qt Mobility Project 1.1: QRotationSensor Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -80,8 +80,8 @@ <p>See also <a href="qsensor.html#reading-prop">QSensor::reading</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qsearchresponse-members.html b/doc/html/qsearchresponse-members.html index cf3d4ea8f8..eed0d82a1e 100644 --- a/doc/html/qsearchresponse-members.html +++ b/doc/html/qsearchresponse-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qsearchresponse.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QSearchResponse</title> + <title>Qt Mobility Project 1.1: List of All Members for QSearchResponse</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -78,8 +78,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qsearchresponse.html b/doc/html/qsearchresponse.html index 846ab718b3..bb4d7f11ed 100644 --- a/doc/html/qsearchresponse.html +++ b/doc/html/qsearchresponse.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qsearchresponse.cpp --> <head> - <title>Qt Mobility Project 1.0: QSearchResponse Class Reference</title> + <title>Qt Mobility Project 1.1: QSearchResponse Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -114,8 +114,8 @@ <p>See also <a href="qsearchresponse.html#places">places</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qsensor-members.html b/doc/html/qsensor-members.html index eedf03f222..23ba0de220 100644 --- a/doc/html/qsensor-members.html +++ b/doc/html/qsensor-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qsensor.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QSensor</title> + <title>Qt Mobility Project 1.1: List of All Members for QSensor</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -95,8 +95,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qsensor.html b/doc/html/qsensor.html index 0ed60b941b..f46efc9bc7 100644 --- a/doc/html/qsensor.html +++ b/doc/html/qsensor.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qsensor.cpp --> <head> - <title>Qt Mobility Project 1.0: QSensor Class Reference</title> + <title>Qt Mobility Project 1.1: QSensor Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -314,8 +314,8 @@ <p>Note that sensor timestamps from different sensors may not be directly comparable (as they may choose different fixed points for their reference).</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qsensorbackend-members.html b/doc/html/qsensorbackend-members.html index 8bb55767e7..9dc4bbd537 100644 --- a/doc/html/qsensorbackend-members.html +++ b/doc/html/qsensorbackend-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qsensorbackend.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QSensorBackend</title> + <title>Qt Mobility Project 1.1: List of All Members for QSensorBackend</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -80,8 +80,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qsensorbackend.html b/doc/html/qsensorbackend.html index 7b6b8b0f36..2d55d9578a 100644 --- a/doc/html/qsensorbackend.html +++ b/doc/html/qsensorbackend.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qsensorbackend.cpp --> <head> - <title>Qt Mobility Project 1.0: QSensorBackend Class Reference</title> + <title>Qt Mobility Project 1.1: QSensorBackend Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -150,8 +150,8 @@ <p>Stop reporting values.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qsensorbackendfactory-members.html b/doc/html/qsensorbackendfactory-members.html index e100018bb7..7f760f3439 100644 --- a/doc/html/qsensorbackendfactory-members.html +++ b/doc/html/qsensorbackendfactory-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qsensormanager.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QSensorBackendFactory</title> + <title>Qt Mobility Project 1.1: List of All Members for QSensorBackendFactory</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -19,8 +19,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qsensorbackendfactory.html b/doc/html/qsensorbackendfactory.html index c7fb8d3cbc..ec6a206be0 100644 --- a/doc/html/qsensorbackendfactory.html +++ b/doc/html/qsensorbackendfactory.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qsensormanager.cpp --> <head> - <title>Qt Mobility Project 1.0: QSensorBackendFactory Class Reference</title> + <title>Qt Mobility Project 1.1: QSensorBackendFactory Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -38,8 +38,8 @@ <p>If the factory cannot create a backend it should return 0.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qsensorfilter-members.html b/doc/html/qsensorfilter-members.html index 43b264500c..c732aab58f 100644 --- a/doc/html/qsensorfilter-members.html +++ b/doc/html/qsensorfilter-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qsensor.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QSensorFilter</title> + <title>Qt Mobility Project 1.1: List of All Members for QSensorFilter</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -21,8 +21,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qsensorfilter.html b/doc/html/qsensorfilter.html index 31cdd2c75d..be090afea5 100644 --- a/doc/html/qsensorfilter.html +++ b/doc/html/qsensorfilter.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qsensor.cpp --> <head> - <title>Qt Mobility Project 1.0: QSensorFilter Class Reference</title> + <title>Qt Mobility Project 1.1: QSensorFilter Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -52,8 +52,8 @@ <p>Returns false to drop the reading.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qsensormanager-members.html b/doc/html/qsensormanager-members.html index cbbd376148..6632a04300 100644 --- a/doc/html/qsensormanager-members.html +++ b/doc/html/qsensormanager-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qsensormanager.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QSensorManager</title> + <title>Qt Mobility Project 1.1: List of All Members for QSensorManager</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -20,8 +20,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qsensormanager.html b/doc/html/qsensormanager.html index 5b4c8143c8..a278466e66 100644 --- a/doc/html/qsensormanager.html +++ b/doc/html/qsensormanager.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qsensormanager.cpp --> <head> - <title>Qt Mobility Project 1.0: QSensorManager Class Reference</title> + <title>Qt Mobility Project 1.1: QSensorManager Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -55,8 +55,8 @@ <p>See also <a href="creating-a-sensor-plugin.html">Creating a sensor plugin</a>.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qsensorplugininterface-members.html b/doc/html/qsensorplugininterface-members.html index 5761d4533b..8394413b21 100644 --- a/doc/html/qsensorplugininterface-members.html +++ b/doc/html/qsensorplugininterface-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qsensorplugin.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QSensorPluginInterface</title> + <title>Qt Mobility Project 1.1: List of All Members for QSensorPluginInterface</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -19,8 +19,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qsensorplugininterface.html b/doc/html/qsensorplugininterface.html index 870240d60e..38185f1298 100644 --- a/doc/html/qsensorplugininterface.html +++ b/doc/html/qsensorplugininterface.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qsensorplugin.cpp --> <head> - <title>Qt Mobility Project 1.0: QSensorPluginInterface Class Reference</title> + <title>Qt Mobility Project 1.1: QSensorPluginInterface Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -38,8 +38,8 @@ <p>See also <a href="creating-a-sensor-plugin.html">Creating a sensor plugin</a>.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qsensorreading-members.html b/doc/html/qsensorreading-members.html index 78f1ba23f6..b01d4c34e3 100644 --- a/doc/html/qsensorreading-members.html +++ b/doc/html/qsensorreading-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qsensor.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QSensorReading</title> + <title>Qt Mobility Project 1.1: List of All Members for QSensorReading</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -71,8 +71,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qsensorreading.html b/doc/html/qsensorreading.html index 9ce0cd1611..367be17ac7 100644 --- a/doc/html/qsensorreading.html +++ b/doc/html/qsensorreading.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qsensor.cpp --> <head> - <title>Qt Mobility Project 1.0: QSensorReading Class Reference</title> + <title>Qt Mobility Project 1.1: QSensorReading Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -121,8 +121,8 @@ <p>See also <a href="qsensorreading.html#DECLARE_READING">DECLARE_READING</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qservice.html b/doc/html/qservice.html index f81d0c257f..a9ab3e1998 100644 --- a/doc/html/qservice.html +++ b/doc/html/qservice.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qservice.qdoc --> <head> - <title>Qt Mobility Project 1.0: QService Namespace Reference</title> + <title>Qt Mobility Project 1.1: QService Namespace Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -40,8 +40,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qservicecontext-members.html b/doc/html/qservicecontext-members.html index b38d1af724..61173c0d5d 100644 --- a/doc/html/qservicecontext-members.html +++ b/doc/html/qservicecontext-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qservicecontext.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QServiceContext</title> + <title>Qt Mobility Project 1.1: List of All Members for QServiceContext</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -75,8 +75,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qservicecontext.html b/doc/html/qservicecontext.html index baee05ee72..995bbd49eb 100644 --- a/doc/html/qservicecontext.html +++ b/doc/html/qservicecontext.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qservicecontext.cpp --> <head> - <title>Qt Mobility Project 1.0: QServiceContext Class Reference</title> + <title>Qt Mobility Project 1.1: QServiceContext Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -115,8 +115,8 @@ <p>Services may call this function to notify the service client about service related context information of the given <i>type</i>. The contextual information is stored in <i>data</i>.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qservicefilter-members.html b/doc/html/qservicefilter-members.html index 6375c30ab7..fa6c9a0d49 100644 --- a/doc/html/qservicefilter-members.html +++ b/doc/html/qservicefilter-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qservicefilter.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QServiceFilter</title> + <title>Qt Mobility Project 1.1: List of All Members for QServiceFilter</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -43,8 +43,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qservicefilter.html b/doc/html/qservicefilter.html index 296b13f0e0..eeb30c5d64 100644 --- a/doc/html/qservicefilter.html +++ b/doc/html/qservicefilter.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qservicefilter.cpp --> <head> - <title>Qt Mobility Project 1.0: QServiceFilter Class Reference</title> + <title>Qt Mobility Project 1.1: QServiceFilter Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -185,8 +185,8 @@ <p>Reads a service filter into <i>sf</i> from the stream <i>in</i> and returns a reference to the stream.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qserviceinterfacedescriptor-members.html b/doc/html/qserviceinterfacedescriptor-members.html index 34703d3bc4..9d74c349cf 100644 --- a/doc/html/qserviceinterfacedescriptor-members.html +++ b/doc/html/qserviceinterfacedescriptor-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qserviceinterfacedescriptor.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QServiceInterfaceDescriptor</title> + <title>Qt Mobility Project 1.1: List of All Members for QServiceInterfaceDescriptor</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -38,8 +38,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qserviceinterfacedescriptor.html b/doc/html/qserviceinterfacedescriptor.html index 4bc20ee087..9dd58ed6f8 100644 --- a/doc/html/qserviceinterfacedescriptor.html +++ b/doc/html/qserviceinterfacedescriptor.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qserviceinterfacedescriptor.cpp --> <head> - <title>Qt Mobility Project 1.0: QServiceInterfaceDescriptor Class Reference</title> + <title>Qt Mobility Project 1.1: QServiceInterfaceDescriptor Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -135,8 +135,8 @@ <p>Reads a service interface descriptor into <i>dc</i> from the stream <i>in</i> and returns a reference to the stream.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qservicemanager-members.html b/doc/html/qservicemanager-members.html index f0aab14989..aaa3c7dc00 100644 --- a/doc/html/qservicemanager-members.html +++ b/doc/html/qservicemanager-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qservicemanager.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QServiceManager</title> + <title>Qt Mobility Project 1.1: List of All Members for QServiceManager</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -88,8 +88,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qservicemanager.html b/doc/html/qservicemanager.html index 6ddcf8ccb0..613fd53e3b 100644 --- a/doc/html/qservicemanager.html +++ b/doc/html/qservicemanager.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qservicemanager.cpp --> <head> - <title>Qt Mobility Project 1.0: QServiceManager Class Reference</title> + <title>Qt Mobility Project 1.1: QServiceManager Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -206,8 +206,8 @@ <p><b>Note:</b> When in system scope, the <i>descriptor</i> must refer to a system-wide service rather than a user-specific service; otherwise, this will fail.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qserviceplugininterface-members.html b/doc/html/qserviceplugininterface-members.html index d0b0ba447b..e32009c228 100644 --- a/doc/html/qserviceplugininterface-members.html +++ b/doc/html/qserviceplugininterface-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qserviceplugininterface.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QServicePluginInterface</title> + <title>Qt Mobility Project 1.1: List of All Members for QServicePluginInterface</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -21,8 +21,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qserviceplugininterface.html b/doc/html/qserviceplugininterface.html index d66b8bef74..f59e542a8b 100644 --- a/doc/html/qserviceplugininterface.html +++ b/doc/html/qserviceplugininterface.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qserviceplugininterface.cpp --> <head> - <title>Qt Mobility Project 1.0: QServicePluginInterface Class Reference</title> + <title>Qt Mobility Project 1.1: QServicePluginInterface Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -48,8 +48,8 @@ <p>See also <a href="qservicemanager.html#removeService">QServiceManager::removeService</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qsystemdeviceinfo-members.html b/doc/html/qsystemdeviceinfo-members.html index 44b7b9dffe..97a815f00d 100644 --- a/doc/html/qsystemdeviceinfo-members.html +++ b/doc/html/qsystemdeviceinfo-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qsysteminfo.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QSystemDeviceInfo</title> + <title>Qt Mobility Project 1.1: List of All Members for QSystemDeviceInfo</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -92,8 +92,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qsystemdeviceinfo.html b/doc/html/qsystemdeviceinfo.html index 3d9843e28b..debd145964 100644 --- a/doc/html/qsystemdeviceinfo.html +++ b/doc/html/qsystemdeviceinfo.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qsysteminfo.cpp --> <head> - <title>Qt Mobility Project 1.0: QSystemDeviceInfo Class Reference</title> + <title>Qt Mobility Project 1.1: QSystemDeviceInfo Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -324,14 +324,14 @@ <p>This signal is emitted whenever bluetooth state changes, specified by <i>on</i>.</p> <a name="//apple_ref/cpp/instm/QSystemDeviceInfo/currentProfileChanged"></a> <h3 class="fn"><a name="currentProfileChanged"></a>void QSystemDeviceInfo::currentProfileChanged ( <a href="qsystemdeviceinfo.html#Profile-enum">QSystemDeviceInfo::Profile</a> <i>profile</i> ) <tt> [signal]</tt></h3> -<p>This signal is emitted whenever the network profile changes, specified by <i>profile</i>.</p> +<p>This signal is emitted whenever the users active profile changes, specified by <i>profile</i>.</p> <a name="//apple_ref/cpp/instm/QSystemDeviceInfo/powerStateChanged"></a> <h3 class="fn"><a name="powerStateChanged"></a>void QSystemDeviceInfo::powerStateChanged ( <a href="qsystemdeviceinfo.html#PowerState-enum">QSystemDeviceInfo::PowerState</a> <i>state</i> ) <tt> [signal]</tt></h3> -<p>This signal is emitted when the power state has changed, such as when a phone gets plugged qint32o the wall. <i>state</i> is the new power state.</p> +<p>This signal is emitted when the power state has changed, such as when a phone gets plugged in to the wall. <i>state</i> is the new power state.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qsystemdisplayinfo-members.html b/doc/html/qsystemdisplayinfo-members.html index 3a14f2b828..c146cbc5f8 100644 --- a/doc/html/qsystemdisplayinfo-members.html +++ b/doc/html/qsystemdisplayinfo-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qsysteminfo.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QSystemDisplayInfo</title> + <title>Qt Mobility Project 1.1: List of All Members for QSystemDisplayInfo</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -71,8 +71,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qsystemdisplayinfo.html b/doc/html/qsystemdisplayinfo.html index 03c0ba2ed0..4b01f3a779 100644 --- a/doc/html/qsystemdisplayinfo.html +++ b/doc/html/qsystemdisplayinfo.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qsysteminfo.cpp --> <head> - <title>Qt Mobility Project 1.0: QSystemDisplayInfo Class Reference</title> + <title>Qt Mobility Project 1.1: QSystemDisplayInfo Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -71,8 +71,8 @@ <p>See also <a href="http://qt.nokia.com/doc/4.6/qdesktopwidget.html#screenCount-prop">QDesktopWidget::screenCount</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qsysteminfo-members.html b/doc/html/qsysteminfo-members.html index 774dc85032..e26bdf88d3 100644 --- a/doc/html/qsysteminfo-members.html +++ b/doc/html/qsysteminfo-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qsysteminfo.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QSystemInfo</title> + <title>Qt Mobility Project 1.1: List of All Members for QSystemInfo</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -77,8 +77,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qsysteminfo.html b/doc/html/qsysteminfo.html index 5297166f49..b07b656c01 100644 --- a/doc/html/qsysteminfo.html +++ b/doc/html/qsysteminfo.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qsysteminfo.cpp --> <head> - <title>Qt Mobility Project 1.0: QSystemInfo Class Reference</title> + <title>Qt Mobility Project 1.1: QSystemInfo Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -182,8 +182,8 @@ <p>In case a particular version does not use the "build" part, it is set to 0. If a particular element is not available at all, an error "Not Installed" will be returned by the API.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qsystemnetworkinfo-members.html b/doc/html/qsystemnetworkinfo-members.html index 9c4395bf69..bedcd12304 100644 --- a/doc/html/qsystemnetworkinfo-members.html +++ b/doc/html/qsystemnetworkinfo-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qsysteminfo.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QSystemNetworkInfo</title> + <title>Qt Mobility Project 1.1: List of All Members for QSystemNetworkInfo</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -90,8 +90,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qsystemnetworkinfo.html b/doc/html/qsystemnetworkinfo.html index e7bd17cea9..547c52cdb3 100644 --- a/doc/html/qsystemnetworkinfo.html +++ b/doc/html/qsystemnetworkinfo.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qsysteminfo.cpp --> <head> - <title>Qt Mobility Project 1.0: QSystemNetworkInfo Class Reference</title> + <title>Qt Mobility Project 1.1: QSystemNetworkInfo Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -260,8 +260,8 @@ <p>This signal is emitted whenever the network status of <i>mode</i> changes, specified by <i>status</i>.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qsystemscreensaver-members.html b/doc/html/qsystemscreensaver-members.html index a1d1a041f0..a80e4fe58c 100644 --- a/doc/html/qsystemscreensaver-members.html +++ b/doc/html/qsystemscreensaver-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qsysteminfo.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QSystemScreenSaver</title> + <title>Qt Mobility Project 1.1: List of All Members for QSystemScreenSaver</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -71,8 +71,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qsystemscreensaver.html b/doc/html/qsystemscreensaver.html index 98fa5a191d..0119c1659a 100644 --- a/doc/html/qsystemscreensaver.html +++ b/doc/html/qsystemscreensaver.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qsysteminfo.cpp --> <head> - <title>Qt Mobility Project 1.0: QSystemScreenSaver Class Reference</title> + <title>Qt Mobility Project 1.1: QSystemScreenSaver Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -79,8 +79,8 @@ <p>On platforms that support it, if screensaver is secure by policy, the policy will be honored and this will fail.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qsystemstorageinfo-members.html b/doc/html/qsystemstorageinfo-members.html index d8ce53995a..1b5505d655 100644 --- a/doc/html/qsystemstorageinfo-members.html +++ b/doc/html/qsystemstorageinfo-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qsysteminfo.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QSystemStorageInfo</title> + <title>Qt Mobility Project 1.1: List of All Members for QSystemStorageInfo</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -74,8 +74,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qsystemstorageinfo.html b/doc/html/qsystemstorageinfo.html index 3263594689..112318e0fd 100644 --- a/doc/html/qsystemstorageinfo.html +++ b/doc/html/qsystemstorageinfo.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qsysteminfo.cpp --> <head> - <title>Qt Mobility Project 1.0: QSystemStorageInfo Class Reference</title> + <title>Qt Mobility Project 1.1: QSystemStorageInfo Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -115,8 +115,8 @@ <p>Returns the type of volume <i>driveVolume</i></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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qt-mobility-project-library.index b/doc/html/qt-mobility-project-library.index index fb37dd8fd7..17cd85df81 100644 --- a/doc/html/qt-mobility-project-library.index +++ b/doc/html/qt-mobility-project-library.index @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE QDOCINDEX> -<INDEX url="" title="Qt Mobility Project Library Reference Documentation" version="Mobility Project 1.0.0"> +<INDEX url="" title="Qt Mobility Project Library Reference Documentation" version="Mobility Project 1.1.0"> <namespace access="public" threadsafety="unspecified" status="commendable" name="" href="" location="" module=""> <class access="public" threadsafety="unspecified" status="commendable" name="QContactRelationship" href="qcontactrelationship.html" location="qcontactrelationship.h" bases="" module=""> <variable access="public" threadsafety="unspecified" status="commendable" name="HasMember" fullname="QContactRelationship::HasMember" href="qcontactrelationship.html#HasMember-var" location="qcontactrelationship.h" type="const QLatin1Constant" static="true"/> @@ -8784,19 +8784,12 @@ <page access="public" status="commendable" name="declarative-sfw-dialer/landlinedialer/landlinedialer.h" href="declarative-sfw-dialer-landlinedialer-landlinedialer-h.html" subtype="file" title="" fulltitle="landlinedialer.h Example File" subtitle="declarative-sfw-dialer/landlinedialer/landlinedialer.h" location=""/> <page access="public" status="commendable" name="declarative-sfw-dialer/landlinedialer/landlinedialerplugin.cpp" href="declarative-sfw-dialer-landlinedialer-landlinedialerplugin-cpp.html" subtype="file" title="" fulltitle="landlinedialerplugin.cpp Example File" subtitle="declarative-sfw-dialer/landlinedialer/landlinedialerplugin.cpp" location=""/> <page access="public" status="commendable" name="declarative-sfw-dialer/landlinedialer/landlinedialerplugin.h" href="declarative-sfw-dialer-landlinedialer-landlinedialerplugin-h.html" subtype="file" title="" fulltitle="landlinedialerplugin.h Example File" subtitle="declarative-sfw-dialer/landlinedialer/landlinedialerplugin.h" location=""/> - <page access="public" status="commendable" name="declarative-sfw-dialer/sfwexample/qdeclarativeservice.cpp" href="declarative-sfw-dialer-sfwexample-qdeclarativeservice-cpp.html" subtype="file" title="" fulltitle="qdeclarativeservice.cpp Example File" subtitle="declarative-sfw-dialer/sfwexample/qdeclarativeservice.cpp" location=""/> - <page access="public" status="commendable" name="declarative-sfw-dialer/sfwexample/qdeclarativeservice.h" href="declarative-sfw-dialer-sfwexample-qdeclarativeservice-h.html" subtype="file" title="" fulltitle="qdeclarativeservice.h Example File" subtitle="declarative-sfw-dialer/sfwexample/qdeclarativeservice.h" location=""/> - <page access="public" status="commendable" name="declarative-sfw-dialer/sfwexample/sfwexample.cpp" href="declarative-sfw-dialer-sfwexample-sfwexample-cpp.html" subtype="file" title="" fulltitle="sfwexample.cpp Example File" subtitle="declarative-sfw-dialer/sfwexample/sfwexample.cpp" location=""/> - <page access="public" status="commendable" name="declarative-sfw-dialer/sfwexample/sfwexample.h" href="declarative-sfw-dialer-sfwexample-sfwexample-h.html" subtype="file" title="" fulltitle="sfwexample.h Example File" subtitle="declarative-sfw-dialer/sfwexample/sfwexample.h" location=""/> <page access="public" status="commendable" name="declarative-sfw-dialer/voipdialer/voipdialer.cpp" href="declarative-sfw-dialer-voipdialer-voipdialer-cpp.html" subtype="file" title="" fulltitle="voipdialer.cpp Example File" subtitle="declarative-sfw-dialer/voipdialer/voipdialer.cpp" location=""/> <page access="public" status="commendable" name="declarative-sfw-dialer/voipdialer/voipdialer.h" href="declarative-sfw-dialer-voipdialer-voipdialer-h.html" subtype="file" title="" fulltitle="voipdialer.h Example File" subtitle="declarative-sfw-dialer/voipdialer/voipdialer.h" location=""/> <page access="public" status="commendable" name="declarative-sfw-dialer/voipdialer/voipdialerplugin.cpp" href="declarative-sfw-dialer-voipdialer-voipdialerplugin-cpp.html" subtype="file" title="" fulltitle="voipdialerplugin.cpp Example File" subtitle="declarative-sfw-dialer/voipdialer/voipdialerplugin.cpp" location=""/> <page access="public" status="commendable" name="declarative-sfw-dialer/voipdialer/voipdialerplugin.h" href="declarative-sfw-dialer-voipdialer-voipdialerplugin-h.html" subtype="file" title="" fulltitle="voipdialerplugin.h Example File" subtitle="declarative-sfw-dialer/voipdialer/voipdialerplugin.h" location=""/> - <page access="public" status="commendable" name="declarative-sfw-dialer/sfwexample/main.cpp" href="declarative-sfw-dialer-sfwexample-main-cpp.html" subtype="file" title="" fulltitle="main.cpp Example File" subtitle="declarative-sfw-dialer/sfwexample/main.cpp" location=""/> <page access="public" status="commendable" name="declarative-sfw-dialer/declarative-sfw-dialer.pro" href="declarative-sfw-dialer-declarative-sfw-dialer-pro.html" subtype="file" title="" fulltitle="declarative-sfw-dialer.pro Example File" subtitle="declarative-sfw-dialer/declarative-sfw-dialer.pro" location=""/> <page access="public" status="commendable" name="declarative-sfw-dialer/landlinedialer/landlinedialer.pro" href="declarative-sfw-dialer-landlinedialer-landlinedialer-pro.html" subtype="file" title="" fulltitle="landlinedialer.pro Example File" subtitle="declarative-sfw-dialer/landlinedialer/landlinedialer.pro" location=""/> - <page access="public" status="commendable" name="declarative-sfw-dialer/sfwexample/resource.qrc" href="declarative-sfw-dialer-sfwexample-resource-qrc.html" subtype="file" title="" fulltitle="resource.qrc Example File" subtitle="declarative-sfw-dialer/sfwexample/resource.qrc" location=""/> - <page access="public" status="commendable" name="declarative-sfw-dialer/sfwexample/sfwexample.pro" href="declarative-sfw-dialer-sfwexample-sfwexample-pro.html" subtype="file" title="" fulltitle="sfwexample.pro Example File" subtitle="declarative-sfw-dialer/sfwexample/sfwexample.pro" location=""/> <page access="public" status="commendable" name="declarative-sfw-dialer/voipdialer/voipdialer.pro" href="declarative-sfw-dialer-voipdialer-voipdialer-pro.html" subtype="file" title="" fulltitle="voipdialer.pro Example File" subtitle="declarative-sfw-dialer/voipdialer/voipdialer.pro" location=""/> </page> <page access="public" status="commendable" name="fetchgooglemaps" href="fetchgooglemaps.html" subtype="example" title="Fetch Google Maps Example" fulltitle="Fetch Google Maps Example" subtitle="" location="undocumented.qdoc"> @@ -9061,8 +9054,8 @@ </page> <page access="public" status="commendable" name="bearer" href="bearer.html" subtype="group" title="Qt Bearer Management API" fulltitle="Qt Bearer Management API" subtitle="" location="bearermanagement.qdoc"/> <page access="public" status="commendable" name="bearer-management.html" href="bearer-management.html" subtype="page" title="Bearer Management" fulltitle="Bearer Management" subtitle="" location="bearermanagement.qdoc"> - <contents name="namespace" title="Namespace" level="1"/> <contents name="overview" title="Overview" level="1"/> + <contents name="migration-to-qt-4-7-or-higher" title="Migration to Qt 4.7 or higher" level="2"/> <contents name="the-api-in-detail" title="The API in Detail" level="2"/> <contents name="service-networks" title="Service networks" level="3"/> <contents name="managing-network-sessions" title="Managing network sessions" level="3"/> @@ -9092,6 +9085,7 @@ <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="namespace" title="Namespace" level="1"/> <contents name="getting-started" title="Getting Started" level="2"/> <contents name="known-issues" title="Known Issues" level="2"/> <contents name="the-new-qt-apis" title="The New Qt APIs" level="1"/> @@ -9118,19 +9112,12 @@ <page access="public" status="commendable" name="declarative-sfw-dialer/landlinedialer/landlinedialer.h" href="declarative-sfw-dialer-landlinedialer-landlinedialer-h.html" subtype="file" title="" fulltitle="landlinedialer.h Example File" subtitle="declarative-sfw-dialer/landlinedialer/landlinedialer.h" location=""/> <page access="public" status="commendable" name="declarative-sfw-dialer/landlinedialer/landlinedialerplugin.cpp" href="declarative-sfw-dialer-landlinedialer-landlinedialerplugin-cpp.html" subtype="file" title="" fulltitle="landlinedialerplugin.cpp Example File" subtitle="declarative-sfw-dialer/landlinedialer/landlinedialerplugin.cpp" location=""/> <page access="public" status="commendable" name="declarative-sfw-dialer/landlinedialer/landlinedialerplugin.h" href="declarative-sfw-dialer-landlinedialer-landlinedialerplugin-h.html" subtype="file" title="" fulltitle="landlinedialerplugin.h Example File" subtitle="declarative-sfw-dialer/landlinedialer/landlinedialerplugin.h" location=""/> - <page access="public" status="commendable" name="declarative-sfw-dialer/sfwexample/qdeclarativeservice.cpp" href="declarative-sfw-dialer-sfwexample-qdeclarativeservice-cpp.html" subtype="file" title="" fulltitle="qdeclarativeservice.cpp Example File" subtitle="declarative-sfw-dialer/sfwexample/qdeclarativeservice.cpp" location=""/> - <page access="public" status="commendable" name="declarative-sfw-dialer/sfwexample/qdeclarativeservice.h" href="declarative-sfw-dialer-sfwexample-qdeclarativeservice-h.html" subtype="file" title="" fulltitle="qdeclarativeservice.h Example File" subtitle="declarative-sfw-dialer/sfwexample/qdeclarativeservice.h" location=""/> - <page access="public" status="commendable" name="declarative-sfw-dialer/sfwexample/sfwexample.cpp" href="declarative-sfw-dialer-sfwexample-sfwexample-cpp.html" subtype="file" title="" fulltitle="sfwexample.cpp Example File" subtitle="declarative-sfw-dialer/sfwexample/sfwexample.cpp" location=""/> - <page access="public" status="commendable" name="declarative-sfw-dialer/sfwexample/sfwexample.h" href="declarative-sfw-dialer-sfwexample-sfwexample-h.html" subtype="file" title="" fulltitle="sfwexample.h Example File" subtitle="declarative-sfw-dialer/sfwexample/sfwexample.h" location=""/> <page access="public" status="commendable" name="declarative-sfw-dialer/voipdialer/voipdialer.cpp" href="declarative-sfw-dialer-voipdialer-voipdialer-cpp.html" subtype="file" title="" fulltitle="voipdialer.cpp Example File" subtitle="declarative-sfw-dialer/voipdialer/voipdialer.cpp" location=""/> <page access="public" status="commendable" name="declarative-sfw-dialer/voipdialer/voipdialer.h" href="declarative-sfw-dialer-voipdialer-voipdialer-h.html" subtype="file" title="" fulltitle="voipdialer.h Example File" subtitle="declarative-sfw-dialer/voipdialer/voipdialer.h" location=""/> <page access="public" status="commendable" name="declarative-sfw-dialer/voipdialer/voipdialerplugin.cpp" href="declarative-sfw-dialer-voipdialer-voipdialerplugin-cpp.html" subtype="file" title="" fulltitle="voipdialerplugin.cpp Example File" subtitle="declarative-sfw-dialer/voipdialer/voipdialerplugin.cpp" location=""/> <page access="public" status="commendable" name="declarative-sfw-dialer/voipdialer/voipdialerplugin.h" href="declarative-sfw-dialer-voipdialer-voipdialerplugin-h.html" subtype="file" title="" fulltitle="voipdialerplugin.h Example File" subtitle="declarative-sfw-dialer/voipdialer/voipdialerplugin.h" location=""/> - <page access="public" status="commendable" name="declarative-sfw-dialer/sfwexample/main.cpp" href="declarative-sfw-dialer-sfwexample-main-cpp.html" subtype="file" title="" fulltitle="main.cpp Example File" subtitle="declarative-sfw-dialer/sfwexample/main.cpp" location=""/> <page access="public" status="commendable" name="declarative-sfw-dialer/declarative-sfw-dialer.pro" href="declarative-sfw-dialer-declarative-sfw-dialer-pro.html" subtype="file" title="" fulltitle="declarative-sfw-dialer.pro Example File" subtitle="declarative-sfw-dialer/declarative-sfw-dialer.pro" location=""/> <page access="public" status="commendable" name="declarative-sfw-dialer/landlinedialer/landlinedialer.pro" href="declarative-sfw-dialer-landlinedialer-landlinedialer-pro.html" subtype="file" title="" fulltitle="landlinedialer.pro Example File" subtitle="declarative-sfw-dialer/landlinedialer/landlinedialer.pro" location=""/> - <page access="public" status="commendable" name="declarative-sfw-dialer/sfwexample/resource.qrc" href="declarative-sfw-dialer-sfwexample-resource-qrc.html" subtype="file" title="" fulltitle="resource.qrc Example File" subtitle="declarative-sfw-dialer/sfwexample/resource.qrc" location=""/> - <page access="public" status="commendable" name="declarative-sfw-dialer/sfwexample/sfwexample.pro" href="declarative-sfw-dialer-sfwexample-sfwexample-pro.html" subtype="file" title="" fulltitle="sfwexample.pro Example File" subtitle="declarative-sfw-dialer/sfwexample/sfwexample.pro" location=""/> <page access="public" status="commendable" name="declarative-sfw-dialer/voipdialer/voipdialer.pro" href="declarative-sfw-dialer-voipdialer-voipdialer-pro.html" subtype="file" title="" fulltitle="voipdialer.pro Example File" subtitle="declarative-sfw-dialer/voipdialer/voipdialer.pro" location=""/> </page> <function access="public" threadsafety="unspecified" status="commendable" name="QAudioEncoderControl_iid" href="qaudioencodercontrol.html#QAudioEncoderControl_iid" location="qaudioencodercontrol.cpp" virtual="non" meta="macrowithoutparams" const="false" static="false" overload="false" relates="QAudioEncoderControl" type="" signature="QAudioEncoderControl_iid()"/> @@ -9540,14 +9527,6 @@ <contents name="other-considerations" title="Other Considerations" level="2"/> <contents name="example-implementation" title="Example Implementation" level="2"/> </page> - <page access="public" status="commendable" name="declarative-sfw-notes" href="declarative-sfw-notes.html" subtype="example" title="Declarative Service Framework Notes Manager" fulltitle="Declarative Service Framework Notes Manager" subtitle="" location="declarative-sfw-notes.qdoc"> - <page access="public" status="commendable" name="declarative-sfw-notes/qdeclarativeservice.cpp" href="declarative-sfw-notes-qdeclarativeservice-cpp.html" subtype="file" title="" fulltitle="qdeclarativeservice.cpp Example File" subtitle="declarative-sfw-notes/qdeclarativeservice.cpp" location=""/> - <page access="public" status="commendable" name="declarative-sfw-notes/qdeclarativeservice.h" href="declarative-sfw-notes-qdeclarativeservice-h.html" subtype="file" title="" fulltitle="qdeclarativeservice.h Example File" subtitle="declarative-sfw-notes/qdeclarativeservice.h" location=""/> - <page access="public" status="commendable" name="declarative-sfw-notes/sfwnotes.cpp" href="declarative-sfw-notes-sfwnotes-cpp.html" subtype="file" title="" fulltitle="sfwnotes.cpp Example File" subtitle="declarative-sfw-notes/sfwnotes.cpp" location=""/> - <page access="public" status="commendable" name="declarative-sfw-notes/sfwnotes.h" href="declarative-sfw-notes-sfwnotes-h.html" subtype="file" title="" fulltitle="sfwnotes.h Example File" subtitle="declarative-sfw-notes/sfwnotes.h" location=""/> - <page access="public" status="commendable" name="declarative-sfw-notes/main.cpp" href="declarative-sfw-notes-main-cpp.html" subtype="file" title="" fulltitle="main.cpp Example File" subtitle="declarative-sfw-notes/main.cpp" location=""/> - <page access="public" status="commendable" name="declarative-sfw-notes/declarative-sfw-notes.pro" href="declarative-sfw-notes-declarative-sfw-notes-pro.html" subtype="file" title="" fulltitle="declarative-sfw-notes.pro Example File" subtitle="declarative-sfw-notes/declarative-sfw-notes.pro" location=""/> - <page access="public" status="commendable" name="declarative-sfw-notes/sfwnotes.qrc" href="declarative-sfw-notes-sfwnotes-qrc.html" subtype="file" title="" fulltitle="sfwnotes.qrc Example File" subtitle="declarative-sfw-notes/sfwnotes.qrc" location=""/> - </page> + <page access="public" status="commendable" name="declarative-sfw-notes" href="declarative-sfw-notes.html" subtype="example" title="Declarative Service Framework Notes Manager" fulltitle="Declarative Service Framework Notes Manager" subtitle="" location="declarative-sfw-notes.qdoc"/> </namespace> </INDEX> diff --git a/doc/html/qtapfilter-members.html b/doc/html/qtapfilter-members.html index 5c6b3c324b..3995698a3d 100644 --- a/doc/html/qtapfilter-members.html +++ b/doc/html/qtapfilter-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qtapsensor.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QTapFilter</title> + <title>Qt Mobility Project 1.1: List of All Members for QTapFilter</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -20,8 +20,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qtapfilter.html b/doc/html/qtapfilter.html index 581146c14d..8e19cd1775 100644 --- a/doc/html/qtapfilter.html +++ b/doc/html/qtapfilter.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qtapsensor.cpp --> <head> - <title>Qt Mobility Project 1.0: QTapFilter Class Reference</title> + <title>Qt Mobility Project 1.1: QTapFilter Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -41,8 +41,8 @@ <p>See also <a href="qsensorfilter.html#filter">QSensorFilter::filter</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qtapreading-members.html b/doc/html/qtapreading-members.html index d26f7879f1..feb2d1676c 100644 --- a/doc/html/qtapreading-members.html +++ b/doc/html/qtapreading-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qtapsensor.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QTapReading</title> + <title>Qt Mobility Project 1.1: List of All Members for QTapReading</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -76,8 +76,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qtapreading.html b/doc/html/qtapreading.html index b314f2d584..87129054f4 100644 --- a/doc/html/qtapreading.html +++ b/doc/html/qtapreading.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qtapsensor.cpp --> <head> - <title>Qt Mobility Project 1.0: QTapReading Class Reference</title> + <title>Qt Mobility Project 1.1: QTapReading Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -65,7 +65,7 @@ <a name="qtapreading-units"></a> <h3>QTapReading Units</h3> <p>The tap sensor registers tap events in one of the six directions. There are 3 axes that originate from the phone. They are arranged as follows.</p> -<p align="center"><img src="images/sensors-coordinates2.jpg" /></p><p>By default it returns double tap events. The <a href="qtapsensor.html#returnDoubleTapEvents-prop">QTapSensor::returnDoubleTapEvents</a> property must be set to false to return individual tap events.</p> +<p align="center"><img src="images/sensors-coordinates2.jpg" /></p><p>By default it returns only double tap events. The <a href="qtapsensor.html#returnDoubleTapEvents-prop">QTapSensor::returnDoubleTapEvents</a> property must be set to false to return individual tap events.</p> <hr /> <h2>Member Type Documentation</h2> <a name="//apple_ref/cpp/tag/QTapReading/TapDirection"></a> @@ -128,8 +128,8 @@ <p>See also <a href="qtapreading.html#tapDirection-prop">tapDirection</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qtapsensor-members.html b/doc/html/qtapsensor-members.html index 8e5aaf3251..974c7e942e 100644 --- a/doc/html/qtapsensor-members.html +++ b/doc/html/qtapsensor-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qtapsensor.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QTapSensor</title> + <title>Qt Mobility Project 1.1: List of All Members for QTapSensor</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -96,8 +96,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qtapsensor.html b/doc/html/qtapsensor.html index 3f81c9fe4a..1cd376711a 100644 --- a/doc/html/qtapsensor.html +++ b/doc/html/qtapsensor.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qtapsensor.cpp --> <head> - <title>Qt Mobility Project 1.0: QTapSensor Class Reference</title> + <title>Qt Mobility Project 1.1: QTapSensor Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -65,7 +65,8 @@ <h2>Property Documentation</h2> <h3 class="fn"><a name="returnDoubleTapEvents-prop"></a>returnDoubleTapEvents : const bool</h3> <p>This property holds a value indicating if double tap events should be reported.</p> -<p>Set to true (the default) to have the sensor report on double tap events. Set to false to have the sensor report on individual tap events.</p> +<p>Set to true (the default) to have the sensor report only on double tap events. Set to false to have the sensor report only on individual tap events.</p> +<p>It is not possible to have the sensor report both single and double tap events. If both are needed the app should create 2 sensor objects.</p> <p>Note that you must access this property via <a href="http://qt.nokia.com/doc/4.6/qobject.html#property">QObject::property</a>() and <a href="http://qt.nokia.com/doc/4.6/qobject.html#setProperty">QObject::setProperty</a>(). The property must be set before calling <a href="qsensor.html#start">start</a>().</p> <hr /> <h2>Member Function Documentation</h2> @@ -81,8 +82,8 @@ <p>See also <a href="qsensor.html#reading-prop">QSensor::reading</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qtmediaservices.html b/doc/html/qtmediaservices.html index 5611d856af..a84960572c 100644 --- a/doc/html/qtmediaservices.html +++ b/doc/html/qtmediaservices.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qtmedianamespace.qdoc --> <head> - <title>Qt Mobility Project 1.0: QtMediaServices Namespace Reference</title> + <title>Qt Mobility Project 1.1: QtMediaServices Namespace Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -279,8 +279,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 d57c0ceaf4..d63b6092ef 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</title> + <title>Qt Mobility Project 1.1: Release Notes of the QtMobility Project</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -117,10 +117,6 @@ <ul> <li>Qt Mobility does not compile if Qt using a namespace.</li> <li>Not all example applications will display(fit) well on small screens.</li> -<li>S60: it is currently not possible to use Qt convenience header includes:<pre> #include <QSystemInfo> <span class="comment">//does not work on Symbian</span> -<span class="comment"> //use</span> - #include <qsysteminfo.h></pre> -</li> </ul> <a name="contacts-api"></a> <h3>Contacts API</h3> @@ -179,8 +175,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qtmobility.qhp b/doc/html/qtmobility.qhp index 3138bbc292..259def9a3a 100644 --- a/doc/html/qtmobility.qhp +++ b/doc/html/qtmobility.qhp @@ -4421,7 +4421,6 @@ <file>images/writemessage-example.png</file> <file>logfilepositionsource-logfilepositionsource-cpp.html</file> <file>qmessagefolder-members.html</file> - <file>declarative-sfw-dialer-sfwexample-qdeclarativeservice-h.html</file> <file>qmessageaccountfilter-members.html</file> <file>contactsschema.html</file> <file>qgeocoordinate-members.html</file> @@ -4452,7 +4451,6 @@ <file>qlandmarkcategoryremoverequest.html</file> <file>lightmaps.html</file> <file>flickrdemo-flickr-icon-svg.html</file> - <file>declarative-sfw-dialer-sfwexample-main-cpp.html</file> <file>qsystemnetworkinfo-members.html</file> <file>qsystemdisplayinfo.html</file> <file>keepintouch-main-cpp.html</file> @@ -4471,7 +4469,6 @@ <file>fetchgooglemaps-mapwindow-h.html</file> <file>qradiotuner.html</file> <file>3rdparty.html</file> - <file>declarative-sfw-dialer-sfwexample-sfwexample-h.html</file> <file>creating-a-sensor-plugin.html</file> <file>qmagnetometer-members.html</file> <file>qcontactphonenumber.html</file> @@ -4566,7 +4563,6 @@ <file>qcontactthumbnail-members.html</file> <file>qcontactremoverequest-members.html</file> <file>publish-subscribe.html</file> - <file>declarative-sfw-notes-sfwnotes-cpp.html</file> <file>battery-charge-battery-publisher-batterypublisher-cpp.html</file> <file>qcontactmanagerenginefactory.html</file> <file>qcontactsortorder-members.html</file> @@ -4601,7 +4597,6 @@ <file>qmappolygon.html</file> <file>qlandmarksaverequest.html</file> <file>qgeopositioninfosource-members.html</file> - <file>declarative-sfw-notes-sfwnotes-h.html</file> <file>qlandmarkdistancesort.html</file> <file>qlandmarkidfetchrequest-members.html</file> <file>qaudiocapturesource.html</file> @@ -4656,8 +4651,8 @@ <file>qlandmarkcategory-members.html</file> <file>qmediaservicesupporteddevicesinterface.html</file> <file>qcontactgeolocation.html</file> - <file>annotated.html</file> <file>weatherinfo-icons-weather-overcast-svg.html</file> + <file>annotated.html</file> <file>qcontactmanagerenginefactory-members.html</file> <file>qnetworksession-members.html</file> <file>qtapsensor-members.html</file> @@ -4679,8 +4674,8 @@ <file>qlandmarkcategoryidfetchrequest.html</file> <file>qlandmarkimportrequest-members.html</file> <file>bearercloud-unknown-svg.html</file> - <file>qsystemstorageinfo.html</file> <file>weatherinfo-icons-weather-icy-svg.html</file> + <file>qsystemstorageinfo.html</file> <file>weatherinfo-icons-weather-thundershower-svg.html</file> <file>flickrdemo-flickrdemo-h.html</file> <file>qvideorenderercontrol-members.html</file> @@ -4723,7 +4718,6 @@ <file>flickrdemo-connectivityhelper-cpp.html</file> <file>bearer-management.html</file> <file>fetchgooglemaps-main-cpp.html</file> - <file>declarative-sfw-dialer-sfwexample-qdeclarativeservice-cpp.html</file> <file>qcontactbirthday-members.html</file> <file>publ-subs.html</file> <file>qversitcontactexporterdetailhandler-members.html</file> @@ -4793,7 +4787,6 @@ <file>qlandmarkproximityfilter.html</file> <file>filemanagerplugin-filemanagerstorage-cpp.html</file> <file>serviceactions-mainwindow-h.html</file> - <file>declarative-sfw-notes-qdeclarativeservice-cpp.html</file> <file>qmediarecorder-members.html</file> <file>player-player-cpp.html</file> <file>qmessagemanager-members.html</file> @@ -4833,7 +4826,6 @@ <file>qgeocodereply.html</file> <file>qmediaplaylistcontrol-members.html</file> <file>qmessageid-members.html</file> - <file>declarative-sfw-notes-qdeclarativeservice-h.html</file> <file>qserviceinterfacedescriptor.html</file> <file>index.html</file> <file>bearercloud.html</file> @@ -4949,13 +4941,12 @@ <file>bearermonitor-bearermonitor-h.html</file> <file>qvideooutputcontrol-members.html</file> <file>qservicefilter.html</file> + <file>versit.html</file> <file>qvaluespace.html</file> <file>bearermonitor-sessionwidget-cpp.html</file> - <file>versit.html</file> <file>qmessagedatacomparator.html</file> <file>qcontactremoverequest.html</file> <file>logfilepositionsource-logfilepositionsource-h.html</file> - <file>declarative-sfw-notes-main-cpp.html</file> <file>declarative-sfw-dialer-landlinedialer-landlinedialerplugin-cpp.html</file> <file>battery-charge-battery-subscriber-battery-subscriber-qrc.html</file> <file>notesmanagerplugin-notesmanager-h.html</file> @@ -5046,7 +5037,6 @@ <file>player-player-h.html</file> <file>qmediaservice.html</file> <file>qcompassfilter-members.html</file> - <file>declarative-sfw-notes-sfwnotes-qrc.html</file> <file>sfw-notes-sfwnotes-qrc.html</file> <file>qcontactrelationship-members.html</file> <file>declarative-sfw-dialer-voipdialer-voipdialerplugin-h.html</file> @@ -5110,7 +5100,6 @@ <file>qcontactsynctarget.html</file> <file>qradiotunercontrol-members.html</file> <file>qmediacontent-members.html</file> - <file>declarative-sfw-notes-declarative-sfw-notes-pro.html</file> <file>qmediacontainercontrol.html</file> <file>flickrdemo-flickrdemo-pro.html</file> <file>qmlcontacts-qmlcontacts-pro.html</file> @@ -5124,8 +5113,6 @@ <file>qlandmarkattributefilter-members.html</file> <file>qlandmarksaverequest-members.html</file> <file>qmagnetometerfilter-members.html</file> - <file>declarative-sfw-dialer-sfwexample-sfwexample-cpp.html</file> - <file>declarative-sfw-dialer-sfwexample-resource-qrc.html</file> <file>player-mediakeysobserver-cpp.html</file> <file>qmlcontacts-main-cpp.html</file> <file>qmediaserviceprovider.html</file> @@ -5162,7 +5149,6 @@ <file>qgeopositioninfo-members.html</file> <file>qlandmarkabstractrequest.html</file> <file>images/battery-subscriber.png</file> - <file>declarative-sfw-dialer-sfwexample-sfwexample-pro.html</file> <file>qmessageservice.html</file> <file>qcontactfetchrequest-members.html</file> <file>qnmeapositioninfosource-members.html</file> @@ -5182,9 +5168,9 @@ <file>images/battery-publisher.png</file> <file>qsensormanager.html</file> <file>serviceactions-attachmentlistwidget-cpp.html</file> + <file>weatherinfo-icons-weather-haze-svg.html</file> <file>qmlcontacts-qmlcontacts-qrc.html</file> <file>writemessage-writemessage-pro.html</file> - <file>weatherinfo-icons-weather-haze-svg.html</file> <file>flickrdemo-main-cpp.html</file> <file>sensors-api.html</file> <file>qmessagefolderid-members.html</file> diff --git a/doc/html/querymessages-main-cpp.html b/doc/html/querymessages-main-cpp.html index 9474948567..e99d019dc5 100644 --- a/doc/html/querymessages-main-cpp.html +++ b/doc/html/querymessages-main-cpp.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: main.cpp Example File (querymessages/main.cpp)</title> + <title>Qt Mobility Project 1.1: main.cpp Example File (querymessages/main.cpp)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -148,8 +148,8 @@ }</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 cf174c39aa..0e3f4dd24c 100644 --- a/doc/html/querymessages-querymessages-pro.html +++ b/doc/html/querymessages-querymessages-pro.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: querymessages.pro Example File (querymessages/querymessages.pro)</title> + <title>Qt Mobility Project 1.1: querymessages.pro Example File (querymessages/querymessages.pro)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -42,8 +42,8 @@ WriteDeviceData</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/querymessages.html b/doc/html/querymessages.html index 7c5f27467f..e87fc59f98 100644 --- a/doc/html/querymessages.html +++ b/doc/html/querymessages.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- querymessages.qdoc --> <head> - <title>Qt Mobility Project 1.0: Query Messages Example</title> + <title>Qt Mobility Project 1.1: Query Messages Example</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -49,8 +49,8 @@ <pre> printMessage(QString::number(++n) + '\t' + result.join("\t"));</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 be6a316e5a..d4195b416f 100644 --- a/doc/html/quickstart-main-cpp.html +++ b/doc/html/quickstart-main-cpp.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: main.cpp Example File (quickstart/main.cpp)</title> + <title>Qt Mobility Project 1.1: main.cpp Example File (quickstart/main.cpp)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -56,11 +56,7 @@ #include <QApplication> #include <QLabel> - #ifdef Q_OS_SYMBIAN - #include <qsysteminfo.h> - #else #include <QSystemInfo> <span class="comment">//(1)</span> - #endif QTM_USE_NAMESPACE <span class="comment">//(2)</span> @@ -75,8 +71,8 @@ }</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 4e8b32dc1d..d2126a6ac2 100644 --- a/doc/html/quickstart-quickstart-pro.html +++ b/doc/html/quickstart-quickstart-pro.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: quickstart.pro Example File (quickstart/quickstart.pro)</title> + <title>Qt Mobility Project 1.1: quickstart.pro Example File (quickstart/quickstart.pro)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -30,8 +30,8 @@ }</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/quickstart.html b/doc/html/quickstart.html index c4fb3b317b..14e4631346 100644 --- a/doc/html/quickstart.html +++ b/doc/html/quickstart.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- quickstart.qdoc --> <head> - <title>Qt Mobility Project 1.0: Quickstart Example</title> + <title>Qt Mobility Project 1.1: Quickstart Example</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -30,11 +30,7 @@ <pre> #include <QApplication> #include <QLabel> - #ifdef Q_OS_SYMBIAN - #include <qsysteminfo.h> - #else #include <QSystemInfo> <span class="comment">//(1)</span> - #endif QTM_USE_NAMESPACE <span class="comment">//(2)</span> @@ -47,7 +43,7 @@ label->resize(100,30); return app.exec(); }</pre> -<p>This example uses the <a href="qsysteminfo.html">QSystemInfo</a> headers to print out the system's current country code. All the domain APIs are wrapped within a Qt Mobility namespace and thus developers need to use the QTM_USE_NAMESPACE macro. (<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>This example uses the <a href="qsysteminfo.html">QSystemInfo</a> headers to print out the system's current country code. All the domain APIs are wrapped within a Qt Mobility namespace and thus developers need to use the QTM_USE_NAMESPACE macro.</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> @@ -81,6 +77,7 @@ <tr valign="top" class="even"><td><a href="systeminfo.html">System Information</a></td><td>LocalServices ReadUserData WriteUserData NetworkServices UserEnvironment Location TrustedUI ReadDeviceData</td></tr> <tr valign="top" class="odd"></tr> </table></p> +<p>The complete list of all Symbian capabilities and how they can be obtained can be found in the <a href="http://developer.symbian.org/wiki/index.php/Capabilities_(Symbian_Signed)#Which_capabilities_can_I_access.3F">Symbian developer documentation</a>.</p> <p>And we're done. If you are using the command line simply enter:</p> <pre> qmake make <span class="comment">//or nmake on Windows</span></pre> @@ -96,8 +93,8 @@ <p>For further details on how to build applications for Symbian see <a href="http://qt.nokia.com/doc/4.6/symbian-with-qt-introduction.html">The Symbian Platform - Introduction to Qt</a> and <a href="http://developer.symbian.org/wiki/index.php/Qt_Quick_Start">Qt Quick Start</a></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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qvaluespace.html b/doc/html/qvaluespace.html index 3bbe5f0912..b6da4945ca 100644 --- a/doc/html/qvaluespace.html +++ b/doc/html/qvaluespace.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qvaluespace.cpp --> <head> - <title>Qt Mobility Project 1.0: QValueSpace Namespace Reference</title> + <title>Qt Mobility Project 1.1: QValueSpace Namespace Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -86,8 +86,8 @@ <p>You can test if the Volatile Registry layer is available by checking if the list returned by QValueSpace::availableLayers() contains this value. The Volatile Registry layer is only available on Windows platforms.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qvaluespacepublisher-members.html b/doc/html/qvaluespacepublisher-members.html index 4bf026a426..8269ca4b3f 100644 --- a/doc/html/qvaluespacepublisher-members.html +++ b/doc/html/qvaluespacepublisher-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qvaluespacepublisher.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QValueSpacePublisher</title> + <title>Qt Mobility Project 1.1: List of All Members for QValueSpacePublisher</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -77,8 +77,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qvaluespacepublisher.html b/doc/html/qvaluespacepublisher.html index 8d8bfe519f..0084156673 100644 --- a/doc/html/qvaluespacepublisher.html +++ b/doc/html/qvaluespacepublisher.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qvaluespacepublisher.cpp --> <head> - <title>Qt Mobility Project 1.0: QValueSpacePublisher Class Reference</title> + <title>Qt Mobility Project 1.1: QValueSpacePublisher Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -158,8 +158,8 @@ <p>Generally, calling this function is unnecessary.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qvaluespacesubscriber-members.html b/doc/html/qvaluespacesubscriber-members.html index 963de5d11e..fac4528786 100644 --- a/doc/html/qvaluespacesubscriber-members.html +++ b/doc/html/qvaluespacesubscriber-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qvaluespacesubscriber.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QValueSpaceSubscriber</title> + <title>Qt Mobility Project 1.1: List of All Members for QValueSpaceSubscriber</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -81,8 +81,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qvaluespacesubscriber.html b/doc/html/qvaluespacesubscriber.html index 8072728703..c13335d5d9 100644 --- a/doc/html/qvaluespacesubscriber.html +++ b/doc/html/qvaluespacesubscriber.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qvaluespacesubscriber.cpp --> <head> - <title>Qt Mobility Project 1.0: QValueSpaceSubscriber Class Reference</title> + <title>Qt Mobility Project 1.1: QValueSpaceSubscriber Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -158,8 +158,8 @@ equiv.value() == base.value("Nokia/General/Mapping");</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qversitcontactexporter-members.html b/doc/html/qversitcontactexporter-members.html index c9b5e7d67c..ff338a99da 100644 --- a/doc/html/qversitcontactexporter-members.html +++ b/doc/html/qversitcontactexporter-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qversitcontactexporter.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QVersitContactExporter</title> + <title>Qt Mobility Project 1.1: List of All Members for QVersitContactExporter</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -28,8 +28,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qversitcontactexporter.html b/doc/html/qversitcontactexporter.html index 744963706f..c906395011 100644 --- a/doc/html/qversitcontactexporter.html +++ b/doc/html/qversitcontactexporter.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qversitcontactexporter.cpp --> <head> - <title>Qt Mobility Project 1.0: QVersitContactExporter Class Reference</title> + <title>Qt Mobility Project 1.1: QVersitContactExporter Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -189,8 +189,8 @@ <p>See also <a href="qversitcontactexporter.html#resourceHandler">resourceHandler</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qversitcontactexporterdetailhandler-members.html b/doc/html/qversitcontactexporterdetailhandler-members.html index b0cdc58e54..309a3a6cbf 100644 --- a/doc/html/qversitcontactexporterdetailhandler-members.html +++ b/doc/html/qversitcontactexporterdetailhandler-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qversitcontactexporter.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QVersitContactExporterDetailHandler</title> + <title>Qt Mobility Project 1.1: List of All Members for QVersitContactExporterDetailHandler</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -21,8 +21,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qversitcontactexporterdetailhandler.html b/doc/html/qversitcontactexporterdetailhandler.html index 46d609a7e6..792cd1d3d3 100644 --- a/doc/html/qversitcontactexporterdetailhandler.html +++ b/doc/html/qversitcontactexporterdetailhandler.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qversitcontactexporter.cpp --> <head> - <title>Qt Mobility Project 1.0: QVersitContactExporterDetailHandler Class Reference</title> + <title>Qt Mobility Project 1.1: QVersitContactExporterDetailHandler Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -48,8 +48,8 @@ <p>This function is called on every <a href="qcontactdetail.html">QContactDetail</a> encountered during an export. Supply this function and return true to implement custom export behaviour.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qversitcontactimporter-members.html b/doc/html/qversitcontactimporter-members.html index 30802f9386..4e59e3f89a 100644 --- a/doc/html/qversitcontactimporter-members.html +++ b/doc/html/qversitcontactimporter-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qversitcontactimporter.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QVersitContactImporter</title> + <title>Qt Mobility Project 1.1: List of All Members for QVersitContactImporter</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -28,8 +28,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qversitcontactimporter.html b/doc/html/qversitcontactimporter.html index 5622978968..37040379f7 100644 --- a/doc/html/qversitcontactimporter.html +++ b/doc/html/qversitcontactimporter.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qversitcontactimporter.cpp --> <head> - <title>Qt Mobility Project 1.0: QVersitContactImporter Class Reference</title> + <title>Qt Mobility Project 1.1: QVersitContactImporter Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -201,8 +201,8 @@ <p>See also <a href="qversitcontactimporter.html#resourceHandler">resourceHandler</a>().</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qversitcontactimporterpropertyhandler-members.html b/doc/html/qversitcontactimporterpropertyhandler-members.html index 84948e9499..9595d1eceb 100644 --- a/doc/html/qversitcontactimporterpropertyhandler-members.html +++ b/doc/html/qversitcontactimporterpropertyhandler-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qversitcontactimporter.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QVersitContactImporterPropertyHandler</title> + <title>Qt Mobility Project 1.1: List of All Members for QVersitContactImporterPropertyHandler</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -21,8 +21,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qversitcontactimporterpropertyhandler.html b/doc/html/qversitcontactimporterpropertyhandler.html index 3a4db64814..1e226636ef 100644 --- a/doc/html/qversitcontactimporterpropertyhandler.html +++ b/doc/html/qversitcontactimporterpropertyhandler.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qversitcontactimporter.cpp --> <head> - <title>Qt Mobility Project 1.0: QVersitContactImporterPropertyHandler Class Reference</title> + <title>Qt Mobility Project 1.1: QVersitContactImporterPropertyHandler Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -48,8 +48,8 @@ <p>This function is called on every <a href="qversitproperty.html">QVersitProperty</a> encountered during an import. Supply this function and return true to implement custom import behaviour.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qversitdefaultresourcehandler-members.html b/doc/html/qversitdefaultresourcehandler-members.html index 6f07974e68..7349927888 100644 --- a/doc/html/qversitdefaultresourcehandler-members.html +++ b/doc/html/qversitdefaultresourcehandler-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qversitresourcehandler.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QVersitDefaultResourceHandler</title> + <title>Qt Mobility Project 1.1: List of All Members for QVersitDefaultResourceHandler</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -23,8 +23,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qversitdefaultresourcehandler.html b/doc/html/qversitdefaultresourcehandler.html index 76b740a807..650b3bfcf7 100644 --- a/doc/html/qversitdefaultresourcehandler.html +++ b/doc/html/qversitdefaultresourcehandler.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qversitresourcehandler.cpp --> <head> - <title>Qt Mobility Project 1.0: QVersitDefaultResourceHandler Class Reference</title> + <title>Qt Mobility Project 1.1: QVersitDefaultResourceHandler Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -76,8 +76,8 @@ <p>Default resource saver. Does nothing and returns false, ignoring <i>contents</i>, <i>property</i> and <i>location</i>. By default, resources aren't persisted because we don't know when it is safe to remove them.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qversitdocument-members.html b/doc/html/qversitdocument-members.html index 1e9c1cd659..5b780389b0 100644 --- a/doc/html/qversitdocument-members.html +++ b/doc/html/qversitdocument-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qversitdocument.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QVersitDocument</title> + <title>Qt Mobility Project 1.1: List of All Members for QVersitDocument</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -38,8 +38,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qversitdocument.html b/doc/html/qversitdocument.html index d007cbe1a3..58254ff991 100644 --- a/doc/html/qversitdocument.html +++ b/doc/html/qversitdocument.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qversitdocument.cpp --> <head> - <title>Qt Mobility Project 1.0: QVersitDocument Class Reference</title> + <title>Qt Mobility Project 1.1: QVersitDocument Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -114,8 +114,8 @@ <p>Returns true if this is equal to <i>other</i>; false otherwise.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qversitproperty-members.html b/doc/html/qversitproperty-members.html index 09202d42a2..2714933a39 100644 --- a/doc/html/qversitproperty-members.html +++ b/doc/html/qversitproperty-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qversitproperty.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QVersitProperty</title> + <title>Qt Mobility Project 1.1: List of All Members for QVersitProperty</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -46,8 +46,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qversitproperty.html b/doc/html/qversitproperty.html index 11b88b6bd1..3803fe15bd 100644 --- a/doc/html/qversitproperty.html +++ b/doc/html/qversitproperty.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qversitproperty.cpp --> <head> - <title>Qt Mobility Project 1.0: QVersitProperty Class Reference</title> + <title>Qt Mobility Project 1.1: QVersitProperty Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -163,8 +163,8 @@ <p>Returns true if this is equal to <i>other</i>; false otherwise.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qversitreader-members.html b/doc/html/qversitreader-members.html index 4ed35bf753..eea130832c 100644 --- a/doc/html/qversitreader-members.html +++ b/doc/html/qversitreader-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qversitreader.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QVersitReader</title> + <title>Qt Mobility Project 1.1: List of All Members for QVersitReader</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -86,8 +86,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qversitreader.html b/doc/html/qversitreader.html index 226c4ba1b9..1b32215395 100644 --- a/doc/html/qversitreader.html +++ b/doc/html/qversitreader.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qversitreader.cpp --> <head> - <title>Qt Mobility Project 1.0: QVersitReader Class Reference</title> + <title>Qt Mobility Project 1.1: QVersitReader Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -172,8 +172,8 @@ <p>If the state is <a href="qversitreader.html#State-enum">ActiveState</a>, blocks until the reader has finished reading or <i>msec</i> milliseconds has elapsed, returning true if it successfully finishes or is cancelled by the user. If the state is <a href="qversitreader.html#State-enum">FinishedState</a>, returns true immediately. Otherwise, returns false immediately.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qversitresourcehandler-members.html b/doc/html/qversitresourcehandler-members.html index 79a0780b02..19bfb0d46d 100644 --- a/doc/html/qversitresourcehandler-members.html +++ b/doc/html/qversitresourcehandler-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qversitresourcehandler.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QVersitResourceHandler</title> + <title>Qt Mobility Project 1.1: List of All Members for QVersitResourceHandler</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -21,8 +21,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qversitresourcehandler.html b/doc/html/qversitresourcehandler.html index 62d3b2cef1..a277eef258 100644 --- a/doc/html/qversitresourcehandler.html +++ b/doc/html/qversitresourcehandler.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qversitresourcehandler.cpp --> <head> - <title>Qt Mobility Project 1.0: QVersitResourceHandler Class Reference</title> + <title>Qt Mobility Project 1.1: QVersitResourceHandler Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -46,8 +46,8 @@ <p><i>property</i> holds the <a href="qversitproperty.html">QVersitProperty</a> which is the context in which the binary is coming from. The <a href="qversitresourcehandler.html">QVersitResourceHandler</a> can use this, for example, to determine file extension it should choose. *<i>location</i> is filled with the contents of the file. Returns true on success, false on failure.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qversitwriter-members.html b/doc/html/qversitwriter-members.html index 0759ea8383..0bd071df46 100644 --- a/doc/html/qversitwriter-members.html +++ b/doc/html/qversitwriter-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qversitwriter.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QVersitWriter</title> + <title>Qt Mobility Project 1.1: List of All Members for QVersitWriter</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -83,8 +83,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qversitwriter.html b/doc/html/qversitwriter.html index ac2c38d801..540391e350 100644 --- a/doc/html/qversitwriter.html +++ b/doc/html/qversitwriter.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qversitwriter.cpp --> <head> - <title>Qt Mobility Project 1.0: QVersitWriter Class Reference</title> + <title>Qt Mobility Project 1.1: QVersitWriter Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -165,8 +165,8 @@ <p>If the state is <a href="qversitwriter.html#State-enum">ActiveState</a>, blocks until the writer has finished writing or <i>msec</i> milliseconds has elapsed, returning true if it successfully finishes or is cancelled by the user. If the state is <a href="qversitwriter.html#State-enum">FinishedState</a>, returns true immediately. Otherwise, returns false immediately.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qvideodevicecontrol-members.html b/doc/html/qvideodevicecontrol-members.html index 37e0c6d788..42ff97dbf0 100644 --- a/doc/html/qvideodevicecontrol-members.html +++ b/doc/html/qvideodevicecontrol-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qvideodevicecontrol.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QVideoDeviceControl</title> + <title>Qt Mobility Project 1.1: List of All Members for QVideoDeviceControl</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -79,8 +79,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qvideodevicecontrol.html b/doc/html/qvideodevicecontrol.html index 8fe389eed6..451d9b69d3 100644 --- a/doc/html/qvideodevicecontrol.html +++ b/doc/html/qvideodevicecontrol.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qvideodevicecontrol.cpp --> <head> - <title>Qt Mobility Project 1.0: QVideoDeviceControl Class Reference</title> + <title>Qt Mobility Project 1.1: QVideoDeviceControl Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -130,8 +130,8 @@ <p>Defines the interface name of the <a href="qvideodevicecontrol.html">QVideoDeviceControl</a> class.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qvideoencodercontrol-members.html b/doc/html/qvideoencodercontrol-members.html index a551d91747..6556bc417e 100644 --- a/doc/html/qvideoencodercontrol-members.html +++ b/doc/html/qvideoencodercontrol-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qvideoencodercontrol.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QVideoEncoderControl</title> + <title>Qt Mobility Project 1.1: List of All Members for QVideoEncoderControl</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -78,8 +78,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qvideoencodercontrol.html b/doc/html/qvideoencodercontrol.html index 3a4f8b191f..5756afd7da 100644 --- a/doc/html/qvideoencodercontrol.html +++ b/doc/html/qvideoencodercontrol.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qvideoencodercontrol.cpp --> <head> - <title>Qt Mobility Project 1.0: QVideoEncoderControl Class Reference</title> + <title>Qt Mobility Project 1.1: QVideoEncoderControl Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -124,8 +124,8 @@ <p>Defines the interface name of the <a href="qvideoencodercontrol.html">QVideoEncoderControl</a> class.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qvideoencodersettings-members.html b/doc/html/qvideoencodersettings-members.html index 442ce73288..9b66b7e79f 100644 --- a/doc/html/qvideoencodersettings-members.html +++ b/doc/html/qvideoencodersettings-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmediaencodersettings.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QVideoEncoderSettings</title> + <title>Qt Mobility Project 1.1: List of All Members for QVideoEncoderSettings</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -42,8 +42,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qvideoencodersettings.html b/doc/html/qvideoencodersettings.html index 01ca75754a..c6bdab287b 100644 --- a/doc/html/qvideoencodersettings.html +++ b/doc/html/qvideoencodersettings.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qmediaencodersettings.cpp --> <head> - <title>Qt Mobility Project 1.0: QVideoEncoderSettings Class Reference</title> + <title>Qt Mobility Project 1.1: QVideoEncoderSettings Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -139,8 +139,8 @@ <p>Returns true if the settings objects are of equal value, and true if they are not of equal value.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qvideooutputcontrol-members.html b/doc/html/qvideooutputcontrol-members.html index 09d61b6058..49a004e374 100644 --- a/doc/html/qvideooutputcontrol-members.html +++ b/doc/html/qvideooutputcontrol-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qvideooutputcontrol.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QVideoOutputControl</title> + <title>Qt Mobility Project 1.1: List of All Members for QVideoOutputControl</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -74,8 +74,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qvideooutputcontrol.html b/doc/html/qvideooutputcontrol.html index 44c41d0d43..cc5b888121 100644 --- a/doc/html/qvideooutputcontrol.html +++ b/doc/html/qvideooutputcontrol.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qvideooutputcontrol.cpp --> <head> - <title>Qt Mobility Project 1.0: QVideoOutputControl Class Reference</title> + <title>Qt Mobility Project 1.1: QVideoOutputControl Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -128,8 +128,8 @@ <p>Defines the interface name of the <a href="qvideooutputcontrol.html">QVideoOutputControl</a> class.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qvideorenderercontrol-members.html b/doc/html/qvideorenderercontrol-members.html index 3dc94d9ece..d4d90ecea9 100644 --- a/doc/html/qvideorenderercontrol-members.html +++ b/doc/html/qvideorenderercontrol-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qvideorenderercontrol.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QVideoRendererControl</title> + <title>Qt Mobility Project 1.1: List of All Members for QVideoRendererControl</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -71,8 +71,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qvideorenderercontrol.html b/doc/html/qvideorenderercontrol.html index bbc385e348..f411e8eb9e 100644 --- a/doc/html/qvideorenderercontrol.html +++ b/doc/html/qvideorenderercontrol.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qvideorenderercontrol.cpp --> <head> - <title>Qt Mobility Project 1.0: QVideoRendererControl Class Reference</title> + <title>Qt Mobility Project 1.1: QVideoRendererControl Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -91,8 +91,8 @@ <p>Defines the interface name of the <a href="qvideorenderercontrol.html">QVideoRendererControl</a> class.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qvideowidget-members.html b/doc/html/qvideowidget-members.html index 35e38df982..b441c258df 100644 --- a/doc/html/qvideowidget-members.html +++ b/doc/html/qvideowidget-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qvideowidget.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QVideoWidget</title> + <title>Qt Mobility Project 1.1: List of All Members for QVideoWidget</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -368,8 +368,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qvideowidget.html b/doc/html/qvideowidget.html index 5ae2eea573..a576434fea 100644 --- a/doc/html/qvideowidget.html +++ b/doc/html/qvideowidget.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qvideowidget.cpp --> <head> - <title>Qt Mobility Project 1.0: QVideoWidget Class Reference</title> + <title>Qt Mobility Project 1.1: QVideoWidget Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -285,8 +285,8 @@ <p>Returns the size hint for the current back end, if there is one, or else the size hint from <a href="http://qt.nokia.com/doc/4.6/qwidget.html">QWidget</a>.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qvideowidgetcontrol-members.html b/doc/html/qvideowidgetcontrol-members.html index 3a98531db9..84acbd585b 100644 --- a/doc/html/qvideowidgetcontrol-members.html +++ b/doc/html/qvideowidgetcontrol-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qvideowidgetcontrol.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QVideoWidgetControl</title> + <title>Qt Mobility Project 1.1: List of All Members for QVideoWidgetControl</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -87,8 +87,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qvideowidgetcontrol.html b/doc/html/qvideowidgetcontrol.html index e96ad1feea..9182b2ab50 100644 --- a/doc/html/qvideowidgetcontrol.html +++ b/doc/html/qvideowidgetcontrol.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qvideowidgetcontrol.cpp --> <head> - <title>Qt Mobility Project 1.0: QVideoWidgetControl Class Reference</title> + <title>Qt Mobility Project 1.1: QVideoWidgetControl Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -178,8 +178,8 @@ <p>Defines the interface name of the <a href="qvideowidgetcontrol.html">QVideoWidgetControl</a> class.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qvideowindowcontrol-members.html b/doc/html/qvideowindowcontrol-members.html index c67a37bacd..1d9f8869da 100644 --- a/doc/html/qvideowindowcontrol-members.html +++ b/doc/html/qvideowindowcontrol-members.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qvideowindowcontrol.cpp --> <head> - <title>Qt Mobility Project 1.0: List of All Members for QVideoWindowControl</title> + <title>Qt Mobility Project 1.1: List of All Members for QVideoWindowControl</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -93,8 +93,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/qvideowindowcontrol.html b/doc/html/qvideowindowcontrol.html index 28bacc5e50..4489e894f4 100644 --- a/doc/html/qvideowindowcontrol.html +++ b/doc/html/qvideowindowcontrol.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- qvideowindowcontrol.cpp --> <head> - <title>Qt Mobility Project 1.0: QVideoWindowControl Class Reference</title> + <title>Qt Mobility Project 1.1: QVideoWindowControl Class Reference</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -210,8 +210,8 @@ <p>Defines the interface name of the <a href="qvideowindowcontrol.html">QVideoWindowControl</a> class.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 e678b735ca..9a275e8380 100644 --- a/doc/html/radio-main-cpp.html +++ b/doc/html/radio-main-cpp.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: main.cpp Example File (radio/main.cpp)</title> + <title>Qt Mobility Project 1.1: main.cpp Example File (radio/main.cpp)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -72,8 +72,8 @@ };</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 917373cf09..79a65a5778 100644 --- a/doc/html/radio-radio-cpp.html +++ b/doc/html/radio-radio-cpp.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: radio.cpp Example File (radio/radio.cpp)</title> + <title>Qt Mobility Project 1.1: radio.cpp Example File (radio/radio.cpp)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -183,8 +183,8 @@ }</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 758ca13bd0..82b80aabca 100644 --- a/doc/html/radio-radio-h.html +++ b/doc/html/radio-radio-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: radio.h Example File (radio/radio.h)</title> + <title>Qt Mobility Project 1.1: radio.h Example File (radio/radio.h)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -96,8 +96,8 @@ #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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 8dd54e1828..59bf079587 100644 --- a/doc/html/radio-radio-pro.html +++ b/doc/html/radio-radio-pro.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: radio.pro Example File (radio/radio.pro)</title> + <title>Qt Mobility Project 1.1: radio.pro Example File (radio/radio.pro)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -32,8 +32,8 @@ radio.cpp</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/radio.html b/doc/html/radio.html index 62d3db9e3e..cb7eceffd7 100644 --- a/doc/html/radio.html +++ b/doc/html/radio.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- undocumented.qdoc --> <head> - <title>Qt Mobility Project 1.0: Radio Example</title> + <title>Qt Mobility Project 1.1: Radio Example</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -23,8 +23,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/recorder.html b/doc/html/recorder.html index b6ff3beb0d..37c687cb99 100644 --- a/doc/html/recorder.html +++ b/doc/html/recorder.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- undocumented.qdoc --> <head> - <title>Qt Mobility Project 1.0: Recorder Example</title> + <title>Qt Mobility Project 1.1: Recorder Example</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -16,8 +16,8 @@ </h1> <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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/samplephonebook-contacteditor-cpp.html b/doc/html/samplephonebook-contacteditor-cpp.html index a3f22e6ab9..5164e2afa6 100644 --- a/doc/html/samplephonebook-contacteditor-cpp.html +++ b/doc/html/samplephonebook-contacteditor-cpp.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: contacteditor.cpp Example File (samplephonebook/contacteditor.cpp)</title> + <title>Qt Mobility Project 1.1: contacteditor.cpp Example File (samplephonebook/contacteditor.cpp)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -345,8 +345,8 @@ }</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/samplephonebook-contacteditor-h.html b/doc/html/samplephonebook-contacteditor-h.html index 476ea99209..7c19fd32bb 100644 --- a/doc/html/samplephonebook-contacteditor-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: contacteditor.h Example File (samplephonebook/contacteditor.h)</title> + <title>Qt Mobility Project 1.1: contacteditor.h Example File (samplephonebook/contacteditor.h)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -119,8 +119,8 @@ #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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 index 44ffa31b1d..dab8887c18 100644 --- a/doc/html/samplephonebook-contactlistpage-cpp.html +++ b/doc/html/samplephonebook-contactlistpage-cpp.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: contactlistpage.cpp Example File (samplephonebook/contactlistpage.cpp)</title> + <title>Qt Mobility Project 1.1: contactlistpage.cpp Example File (samplephonebook/contactlistpage.cpp)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -328,8 +328,8 @@ }</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/samplephonebook-contactlistpage-h.html b/doc/html/samplephonebook-contactlistpage-h.html index 67a06bf2d3..c79beffa69 100644 --- a/doc/html/samplephonebook-contactlistpage-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: contactlistpage.h Example File (samplephonebook/contactlistpage.h)</title> + <title>Qt Mobility Project 1.1: contactlistpage.h Example File (samplephonebook/contactlistpage.h)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -118,8 +118,8 @@ #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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 index a2d15faee9..f995fe910c 100644 --- a/doc/html/samplephonebook-filterpage-cpp.html +++ b/doc/html/samplephonebook-filterpage-cpp.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: filterpage.cpp Example File (samplephonebook/filterpage.cpp)</title> + <title>Qt Mobility Project 1.1: filterpage.cpp Example File (samplephonebook/filterpage.cpp)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -215,8 +215,8 @@ }</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/samplephonebook-filterpage-h.html b/doc/html/samplephonebook-filterpage-h.html index ec3939b863..57da9a1b3a 100644 --- a/doc/html/samplephonebook-filterpage-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: filterpage.h Example File (samplephonebook/filterpage.h)</title> + <title>Qt Mobility Project 1.1: filterpage.h Example File (samplephonebook/filterpage.h)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -111,8 +111,8 @@ #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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</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 b0877aa9cc..9024c4a6fa 100644 --- a/doc/html/samplephonebook-main-cpp.html +++ b/doc/html/samplephonebook-main-cpp.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: main.cpp Example File (samplephonebook/main.cpp)</title> + <title>Qt Mobility Project 1.1: main.cpp Example File (samplephonebook/main.cpp)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -70,8 +70,8 @@ }</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</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 e65faa0960..89a531f364 100644 --- a/doc/html/samplephonebook-phonebook-cpp.html +++ b/doc/html/samplephonebook-phonebook-cpp.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: phonebook.cpp Example File (samplephonebook/phonebook.cpp)</title> + <title>Qt Mobility Project 1.1: phonebook.cpp Example File (samplephonebook/phonebook.cpp)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -132,8 +132,8 @@ }</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 7ab865783c..e8fcb47046 100644 --- a/doc/html/samplephonebook-phonebook-h.html +++ b/doc/html/samplephonebook-phonebook-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: phonebook.h Example File (samplephonebook/phonebook.h)</title> + <title>Qt Mobility Project 1.1: phonebook.h Example File (samplephonebook/phonebook.h)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -109,8 +109,8 @@ #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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 e263edef34..e0388d84e8 100644 --- a/doc/html/samplephonebook-samplephonebook-pro.html +++ b/doc/html/samplephonebook-samplephonebook-pro.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: samplephonebook.pro Example File (samplephonebook/samplephonebook.pro)</title> + <title>Qt Mobility Project 1.1: samplephonebook.pro Example File (samplephonebook/samplephonebook.pro)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -57,8 +57,8 @@ }</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/samplephonebook.html b/doc/html/samplephonebook.html index c2045d7f32..08dc727a4d 100644 --- a/doc/html/samplephonebook.html +++ b/doc/html/samplephonebook.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- samplephonebook.qdoc --> <head> - <title>Qt Mobility Project 1.0: Sample Phonebook Example</title> + <title>Qt Mobility Project 1.1: Sample Phonebook Example</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -74,8 +74,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/sensors-api.html b/doc/html/sensors-api.html index e773a9d452..ece176ab9c 100644 --- a/doc/html/sensors-api.html +++ b/doc/html/sensors-api.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- sensors.qdoc --> <head> - <title>Qt Mobility Project 1.0: Sensors API</title> + <title>Qt Mobility Project 1.1: Sensors API</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -130,8 +130,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/sensors-backend.html b/doc/html/sensors-backend.html index a1b3dcbd52..66bfc59ad5 100644 --- a/doc/html/sensors-backend.html +++ b/doc/html/sensors-backend.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- sensors.qdoc --> <head> - <title>Qt Mobility Project 1.0: Sensors Backend</title> + <title>Qt Mobility Project 1.1: Sensors Backend</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -35,8 +35,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 02fd5723f9..8fa9d6bd3e 100644 --- a/doc/html/service-framework-on-symbian.html +++ b/doc/html/service-framework-on-symbian.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- sfw_s60.qdoc --> <head> - <title>Qt Mobility Project 1.0: Qt Service Framework on Symbian</title> + <title>Qt Mobility Project 1.1: Qt Service Framework on Symbian</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -55,8 +55,8 @@ <p>Note! The greatest part of the S60 specific code is located under the symbian folder in a directory hierarchy of Service FW. ServiceDatabase class contains also S60 specific code and the DatabaseManager class has been replaced totally with the corresponding class.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/service-frameworks.html b/doc/html/service-frameworks.html index 1e5ab08ab2..d601884d0e 100644 --- a/doc/html/service-frameworks.html +++ b/doc/html/service-frameworks.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- sf.qdoc --> <head> - <title>Qt Mobility Project 1.0: Qt Service Framework</title> + <title>Qt Mobility Project 1.1: Qt Service Framework</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -74,10 +74,11 @@ fileStorage = manager.loadInterface(foundServices.at(0));</pre> <a name="default-lookup"></a> <h4>Default Lookup</h4> -<p>It is assumed that the client has knowledge of the interface but does not really care about the specific type or version of the service implementing the interface. In such cases the default service lookup can be utilized to create a service object instance. If the same service provides multiple versions of the same interface the latest version is returned. Therefore subsequent versions of the same interface must always be binary compatible to previous versions.</p> +<p>It is assumed that the client has knowledge of the interface but does not really care about the specific type or version of the service implementing the interface. In such cases the default service lookup can be utilized to create a service object instance.</p> <pre> QServiceManager manager; manager.setInterfaceDefault("FileStorageService", "com.nokia.qt.examples.FileStorage");</pre> -<p>The above call to <a href="qservicemanager.html#setInterfaceDefault">QServiceManager::setInterfaceDefault</a>() registers the <i>FileStorageService</i> as default implementation. Whenever a client asks for an implementation of <i>com.nokia.qt.examples.FileStorage</i> the <i>FileStorageService</i> service will be loaded. The current scope of the service manager object determines whether the default assignment is valid for all users or whether it is valid for the current user only. The system default is used if the user scope has not been defined. This enables users to customize their personal preferences. By default the first service installing a so far unknown interface becomes the system wide default selection.</p> +<p>The above call to <a href="qservicemanager.html#setInterfaceDefault">QServiceManager::setInterfaceDefault</a>() registers the <i>FileStorageService</i> as default implementation. Whenever a client asks for an implementation of <i>com.nokia.qt.examples.FileStorage</i> the <i>FileStorageService</i> service will be loaded. If (at the time of this call) the <i>FileStorageService</i> provides multiple registered implementations/versions for the same interface the latest version becomes the default. Therefore subsequent versions of the same interface must always be binary compatible to previous versions.</p> +<p>The current scope of the service manager object determines whether the default assignment is valid for all users or whether it is valid for the current user only. The system default is used if the user scope has not been defined. This enables users to customize their personal preferences. By default the first service installing a so far unknown interface becomes the system wide default selection.</p> <a name="qobject-based-services"></a> <h5>QObject based services</h5> <p>This is the most common way of interacting with services.</p> @@ -216,8 +217,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 8adfc11b09..5c4f9eed8b 100644 --- a/doc/html/serviceactions-attachmentlistwidget-cpp.html +++ b/doc/html/serviceactions-attachmentlistwidget-cpp.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: attachmentlistwidget.cpp Example File (serviceactions/attachmentlistwidget.cpp)</title> + <title>Qt Mobility Project 1.1: attachmentlistwidget.cpp Example File (serviceactions/attachmentlistwidget.cpp)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -527,8 +527,8 @@ #include <attachmentlistwidget.moc></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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 2e29500077..87bf7aa1f0 100644 --- a/doc/html/serviceactions-attachmentlistwidget-h.html +++ b/doc/html/serviceactions-attachmentlistwidget-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: attachmentlistwidget.h Example File (serviceactions/attachmentlistwidget.h)</title> + <title>Qt Mobility Project 1.1: attachmentlistwidget.h Example File (serviceactions/attachmentlistwidget.h)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -104,8 +104,8 @@ #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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 e1babdf98c..08f8a4d2cf 100644 --- a/doc/html/serviceactions-main-cpp.html +++ b/doc/html/serviceactions-main-cpp.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: main.cpp Example File (serviceactions/main.cpp)</title> + <title>Qt Mobility Project 1.1: main.cpp Example File (serviceactions/main.cpp)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -74,8 +74,8 @@ }</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 a780548295..e885f9626f 100644 --- a/doc/html/serviceactions-mainwindow-cpp.html +++ b/doc/html/serviceactions-mainwindow-cpp.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: mainwindow.cpp Example File (serviceactions/mainwindow.cpp)</title> + <title>Qt Mobility Project 1.1: mainwindow.cpp Example File (serviceactions/mainwindow.cpp)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -1364,8 +1364,8 @@ #include <mainwindow.moc></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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 73ab095226..2d0c391c54 100644 --- a/doc/html/serviceactions-mainwindow-h.html +++ b/doc/html/serviceactions-mainwindow-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: mainwindow.h Example File (serviceactions/mainwindow.h)</title> + <title>Qt Mobility Project 1.1: mainwindow.h Example File (serviceactions/mainwindow.h)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -92,8 +92,8 @@ #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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 96eb169a94..1b955afa4b 100644 --- a/doc/html/serviceactions-serviceactions-pro.html +++ b/doc/html/serviceactions-serviceactions-pro.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: serviceactions.pro Example File (serviceactions/serviceactions.pro)</title> + <title>Qt Mobility Project 1.1: serviceactions.pro Example File (serviceactions/serviceactions.pro)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -48,8 +48,8 @@ WriteDeviceData</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/serviceactions.html b/doc/html/serviceactions.html index ee5cbb294e..63ec664305 100644 --- a/doc/html/serviceactions.html +++ b/doc/html/serviceactions.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- serviceactions.qdoc --> <head> - <title>Qt Mobility Project 1.0: Service Actions Example</title> + <title>Qt Mobility Project 1.1: Service Actions Example</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -250,8 +250,8 @@ }</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 cc5832cc69..f136e540db 100644 --- a/doc/html/servicebrowser-main-cpp.html +++ b/doc/html/servicebrowser-main-cpp.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: main.cpp Example File (servicebrowser/main.cpp)</title> + <title>Qt Mobility Project 1.1: main.cpp Example File (servicebrowser/main.cpp)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -89,8 +89,8 @@ }</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 66021f0d92..6c590b1fa1 100644 --- a/doc/html/servicebrowser-servicebrowser-cpp.html +++ b/doc/html/servicebrowser-servicebrowser-cpp.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: servicebrowser.cpp Example File (servicebrowser/servicebrowser.cpp)</title> + <title>Qt Mobility Project 1.1: servicebrowser.cpp Example File (servicebrowser/servicebrowser.cpp)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -325,8 +325,8 @@ }</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 84685ecff6..74d38a6b8a 100644 --- a/doc/html/servicebrowser-servicebrowser-h.html +++ b/doc/html/servicebrowser-servicebrowser-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: servicebrowser.h Example File (servicebrowser/servicebrowser.h)</title> + <title>Qt Mobility Project 1.1: servicebrowser.h Example File (servicebrowser/servicebrowser.h)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -113,8 +113,8 @@ #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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 c22fbaaee1..3c9701b794 100644 --- a/doc/html/servicebrowser-servicebrowser-pro.html +++ b/doc/html/servicebrowser-servicebrowser-pro.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: servicebrowser.pro Example File (servicebrowser/servicebrowser.pro)</title> + <title>Qt Mobility Project 1.1: servicebrowser.pro Example File (servicebrowser/servicebrowser.pro)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -39,8 +39,8 @@ }</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/servicebrowser.html b/doc/html/servicebrowser.html index 5d97af6215..84bbc77af3 100644 --- a/doc/html/servicebrowser.html +++ b/doc/html/servicebrowser.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- servicebrowser.qdoc --> <head> - <title>Qt Mobility Project 1.0: Service Browser Example</title> + <title>Qt Mobility Project 1.1: Service Browser Example</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -183,8 +183,8 @@ <p>Of course, the <a href="qservicemanager.html#loadInterface">QServiceManager::loadInterface</a>() call here assumes the FileManagerStorage implementation is the default for the com.nokia.qt.examples.FileStorage interface. Otherwise, it would have to pass a <a href="qserviceinterfacedescriptor.html">QServiceInterfaceDescriptor</a> object to <a href="qservicemanager.html#loadInterface">QServiceManager::loadInterface</a>() instead of just the interface name to ensure the correct implementation is loaded.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/servicefw.html b/doc/html/servicefw.html index fc8efec717..ad78fd1f2a 100644 --- a/doc/html/servicefw.html +++ b/doc/html/servicefw.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- sf.qdoc --> <head> - <title>Qt Mobility Project 1.0: Service Frameworks Classes</title> + <title>Qt Mobility Project 1.1: Service Frameworks Classes</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -26,8 +26,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/sfw-notes-main-cpp.html b/doc/html/sfw-notes-main-cpp.html index 5897630c5d..c712a833c2 100644 --- a/doc/html/sfw-notes-main-cpp.html +++ b/doc/html/sfw-notes-main-cpp.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: main.cpp Example File (sfw-notes/main.cpp)</title> + <title>Qt Mobility Project 1.1: main.cpp Example File (sfw-notes/main.cpp)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -71,8 +71,8 @@ }</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/sfw-notes-sfw-notes-pro.html b/doc/html/sfw-notes-sfw-notes-pro.html index 6db831c7b3..4625d79c7a 100644 --- a/doc/html/sfw-notes-sfw-notes-pro.html +++ b/doc/html/sfw-notes-sfw-notes-pro.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: sfw-notes.pro Example File (sfw-notes/sfw-notes.pro)</title> + <title>Qt Mobility Project 1.1: sfw-notes.pro Example File (sfw-notes/sfw-notes.pro)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -55,8 +55,8 @@ }</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/sfw-notes-sfwnotes-cpp.html b/doc/html/sfw-notes-sfwnotes-cpp.html index 4b62e1537a..9a8c542af9 100644 --- a/doc/html/sfw-notes-sfwnotes-cpp.html +++ b/doc/html/sfw-notes-sfwnotes-cpp.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: sfwnotes.cpp Example File (sfw-notes/sfwnotes.cpp)</title> + <title>Qt Mobility Project 1.1: sfwnotes.cpp Example File (sfw-notes/sfwnotes.cpp)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -260,8 +260,8 @@ }</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/sfw-notes-sfwnotes-h.html b/doc/html/sfw-notes-sfwnotes-h.html index d21b26a048..898db8df64 100644 --- a/doc/html/sfw-notes-sfwnotes-h.html +++ b/doc/html/sfw-notes-sfwnotes-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: sfwnotes.h Example File (sfw-notes/sfwnotes.h)</title> + <title>Qt Mobility Project 1.1: sfwnotes.h Example File (sfw-notes/sfwnotes.h)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -105,8 +105,8 @@ #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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/sfw-notes-sfwnotes-qrc.html b/doc/html/sfw-notes-sfwnotes-qrc.html index a74c07904a..17b8974c66 100644 --- a/doc/html/sfw-notes-sfwnotes-qrc.html +++ b/doc/html/sfw-notes-sfwnotes-qrc.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: sfwnotes.qrc Example File (sfw-notes/sfwnotes.qrc)</title> + <title>Qt Mobility Project 1.1: sfwnotes.qrc Example File (sfw-notes/sfwnotes.qrc)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -24,8 +24,8 @@ </RCC></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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/sfw-notes.html b/doc/html/sfw-notes.html index b138dff553..aefb1f75ac 100644 --- a/doc/html/sfw-notes.html +++ b/doc/html/sfw-notes.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- sfw-notes.qdoc --> <head> - <title>Qt Mobility Project 1.0: Service Framework Notes Manager</title> + <title>Qt Mobility Project 1.1: Service Framework Notes Manager</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -26,8 +26,8 @@ <p>There is also a declarative example which implements identical functionality using QML as the main user-interface context. This example is called the <a href="declarative-sfw-notes.html">Declarative Notes Manager</a></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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 e269746153..e4d827a2dd 100644 --- a/doc/html/slideshow-main-cpp.html +++ b/doc/html/slideshow-main-cpp.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: main.cpp Example File (slideshow/main.cpp)</title> + <title>Qt Mobility Project 1.1: main.cpp Example File (slideshow/main.cpp)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -72,8 +72,8 @@ }</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 4ac3b8f7a7..e7444fa63a 100644 --- a/doc/html/slideshow-slideshow-cpp.html +++ b/doc/html/slideshow-slideshow-cpp.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: slideshow.cpp Example File (slideshow/slideshow.cpp)</title> + <title>Qt Mobility Project 1.1: slideshow.cpp Example File (slideshow/slideshow.cpp)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -267,8 +267,8 @@ }</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 4eefcb3028..8870cbdce4 100644 --- a/doc/html/slideshow-slideshow-h.html +++ b/doc/html/slideshow-slideshow-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: slideshow.h Example File (slideshow/slideshow.h)</title> + <title>Qt Mobility Project 1.1: slideshow.h Example File (slideshow/slideshow.h)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -103,8 +103,8 @@ #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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 3a4736affe..ccfee95eb2 100644 --- a/doc/html/slideshow-slideshow-pro.html +++ b/doc/html/slideshow-slideshow-pro.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: slideshow.pro Example File (slideshow/slideshow.pro)</title> + <title>Qt Mobility Project 1.1: slideshow.pro Example File (slideshow/slideshow.pro)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -29,8 +29,8 @@ slideshow.cpp</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/slideshow.html b/doc/html/slideshow.html index 7d04b0a585..6bfe604d53 100644 --- a/doc/html/slideshow.html +++ b/doc/html/slideshow.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- slideshow.qdoc --> <head> - <title>Qt Mobility Project 1.0: SlideShow Example</title> + <title>Qt Mobility Project 1.1: SlideShow Example</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -36,8 +36,8 @@ <pre> imageViewer->setTimeout( 5000 );</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 23a40b025a..7661112078 100644 --- a/doc/html/sysinfo-dialog-cpp.html +++ b/doc/html/sysinfo-dialog-cpp.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: dialog.cpp Example File (sysinfo/dialog.cpp)</title> + <title>Qt Mobility Project 1.1: dialog.cpp Example File (sysinfo/dialog.cpp)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -750,8 +750,8 @@ }</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 2e43e8ef3b..e35e149179 100644 --- a/doc/html/sysinfo-dialog-h.html +++ b/doc/html/sysinfo-dialog-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: dialog.h Example File (sysinfo/dialog.h)</title> + <title>Qt Mobility Project 1.1: dialog.h Example File (sysinfo/dialog.h)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -119,8 +119,8 @@ #endif <span class="comment">// DIALOG_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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/sysinfo-examples-qrc.html b/doc/html/sysinfo-examples-qrc.html index 285bb04e3b..4e226c24f3 100644 --- a/doc/html/sysinfo-examples-qrc.html +++ b/doc/html/sysinfo-examples-qrc.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: examples.qrc Example File (sysinfo/examples.qrc)</title> + <title>Qt Mobility Project 1.1: examples.qrc Example File (sysinfo/examples.qrc)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -23,8 +23,8 @@ </RCC></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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 4c0d1b9f11..fe1b779295 100644 --- a/doc/html/sysinfo-main-cpp.html +++ b/doc/html/sysinfo-main-cpp.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: main.cpp Example File (sysinfo/main.cpp)</title> + <title>Qt Mobility Project 1.1: main.cpp Example File (sysinfo/main.cpp)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -71,8 +71,8 @@ }</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 1b94df757b..5537ce14cc 100644 --- a/doc/html/sysinfo-sysinfo-pro.html +++ b/doc/html/sysinfo-sysinfo-pro.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: sysinfo.pro Example File (sysinfo/sysinfo.pro)</title> + <title>Qt Mobility Project 1.1: sysinfo.pro Example File (sysinfo/sysinfo.pro)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -57,8 +57,8 @@ }</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/sysinfo.html b/doc/html/sysinfo.html index 16c39dcc0c..7092802ff1 100644 --- a/doc/html/sysinfo.html +++ b/doc/html/sysinfo.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- sysinfo.qdoc --> <head> - <title>Qt Mobility Project 1.0: System Information Example</title> + <title>Qt Mobility Project 1.1: System Information Example</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -67,8 +67,8 @@ featuresLineEdit->setText((si.hasFeatureSupported(feature) ? "true":"false" ));</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/systeminfo.html b/doc/html/systeminfo.html index 03983414dc..3638d007aa 100644 --- a/doc/html/systeminfo.html +++ b/doc/html/systeminfo.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- si.qdoc --> <head> - <title>Qt Mobility Project 1.0: System Information</title> + <title>Qt Mobility Project 1.1: System Information</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -90,8 +90,8 @@ <p>The <a href="sysinfo.html">System Information</a> example demonstrates how an application can very easily access the system information of the device.</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/trademarks.html b/doc/html/trademarks.html index 991c71ea70..e6dcb8afaa 100644 --- a/doc/html/trademarks.html +++ b/doc/html/trademarks.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- trademarks.qdoc --> <head> - <title>Qt Mobility Project 1.0: Trademarks</title> + <title>Qt Mobility Project 1.1: Trademarks</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -29,8 +29,8 @@ </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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/versit.html b/doc/html/versit.html index 7b2e7abb29..bc8ba9020a 100644 --- a/doc/html/versit.html +++ b/doc/html/versit.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- versit.qdoc --> <head> - <title>Qt Mobility Project 1.0: Versit API</title> + <title>Qt Mobility Project 1.1: Versit API</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -170,8 +170,8 @@ };</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/weatherinfo-icons-weather-few-clouds-svg.html b/doc/html/weatherinfo-icons-weather-few-clouds-svg.html index 7944c0bde5..f0bb300446 100644 --- a/doc/html/weatherinfo-icons-weather-few-clouds-svg.html +++ b/doc/html/weatherinfo-icons-weather-few-clouds-svg.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: weather-few-clouds.svg Example File (weatherinfo/icons/weather-few-clouds.svg)</title> + <title>Qt Mobility Project 1.1: weather-few-clouds.svg Example File (weatherinfo/icons/weather-few-clouds.svg)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -188,8 +188,8 @@ </svg></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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/weatherinfo-icons-weather-fog-svg.html b/doc/html/weatherinfo-icons-weather-fog-svg.html index 4a26239278..7875f5a5dc 100644 --- a/doc/html/weatherinfo-icons-weather-fog-svg.html +++ b/doc/html/weatherinfo-icons-weather-fog-svg.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: weather-fog.svg Example File (weatherinfo/icons/weather-fog.svg)</title> + <title>Qt Mobility Project 1.1: weather-fog.svg Example File (weatherinfo/icons/weather-fog.svg)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -129,8 +129,8 @@ </svg></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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/weatherinfo-icons-weather-haze-svg.html b/doc/html/weatherinfo-icons-weather-haze-svg.html index 7f57600d72..8c7a063254 100644 --- a/doc/html/weatherinfo-icons-weather-haze-svg.html +++ b/doc/html/weatherinfo-icons-weather-haze-svg.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: weather-haze.svg Example File (weatherinfo/icons/weather-haze.svg)</title> + <title>Qt Mobility Project 1.1: weather-haze.svg Example File (weatherinfo/icons/weather-haze.svg)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -177,8 +177,8 @@ </svg></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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/weatherinfo-icons-weather-icy-svg.html b/doc/html/weatherinfo-icons-weather-icy-svg.html index bf8b56c893..865f90651f 100644 --- a/doc/html/weatherinfo-icons-weather-icy-svg.html +++ b/doc/html/weatherinfo-icons-weather-icy-svg.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: weather-icy.svg Example File (weatherinfo/icons/weather-icy.svg)</title> + <title>Qt Mobility Project 1.1: weather-icy.svg Example File (weatherinfo/icons/weather-icy.svg)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -66,8 +66,8 @@ </svg></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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/weatherinfo-icons-weather-overcast-svg.html b/doc/html/weatherinfo-icons-weather-overcast-svg.html index a449eb7487..ed105da53d 100644 --- a/doc/html/weatherinfo-icons-weather-overcast-svg.html +++ b/doc/html/weatherinfo-icons-weather-overcast-svg.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: weather-overcast.svg Example File (weatherinfo/icons/weather-overcast.svg)</title> + <title>Qt Mobility Project 1.1: weather-overcast.svg Example File (weatherinfo/icons/weather-overcast.svg)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -206,8 +206,8 @@ </svg></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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/weatherinfo-icons-weather-showers-svg.html b/doc/html/weatherinfo-icons-weather-showers-svg.html index 22ae5921e7..6f8932f8f2 100644 --- a/doc/html/weatherinfo-icons-weather-showers-svg.html +++ b/doc/html/weatherinfo-icons-weather-showers-svg.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: weather-showers.svg Example File (weatherinfo/icons/weather-showers.svg)</title> + <title>Qt Mobility Project 1.1: weather-showers.svg Example File (weatherinfo/icons/weather-showers.svg)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -194,8 +194,8 @@ </svg></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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/weatherinfo-icons-weather-sleet-svg.html b/doc/html/weatherinfo-icons-weather-sleet-svg.html index 0674e6cfa0..a2dbeae66d 100644 --- a/doc/html/weatherinfo-icons-weather-sleet-svg.html +++ b/doc/html/weatherinfo-icons-weather-sleet-svg.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: weather-sleet.svg Example File (weatherinfo/icons/weather-sleet.svg)</title> + <title>Qt Mobility Project 1.1: weather-sleet.svg Example File (weatherinfo/icons/weather-sleet.svg)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -245,8 +245,8 @@ </svg></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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/weatherinfo-icons-weather-snow-svg.html b/doc/html/weatherinfo-icons-weather-snow-svg.html index e9a74de9fc..40d178d271 100644 --- a/doc/html/weatherinfo-icons-weather-snow-svg.html +++ b/doc/html/weatherinfo-icons-weather-snow-svg.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: weather-snow.svg Example File (weatherinfo/icons/weather-snow.svg)</title> + <title>Qt Mobility Project 1.1: weather-snow.svg Example File (weatherinfo/icons/weather-snow.svg)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -215,8 +215,8 @@ </svg></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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/weatherinfo-icons-weather-storm-svg.html b/doc/html/weatherinfo-icons-weather-storm-svg.html index 0a88cc8d3b..f079668ba1 100644 --- a/doc/html/weatherinfo-icons-weather-storm-svg.html +++ b/doc/html/weatherinfo-icons-weather-storm-svg.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: weather-storm.svg Example File (weatherinfo/icons/weather-storm.svg)</title> + <title>Qt Mobility Project 1.1: weather-storm.svg Example File (weatherinfo/icons/weather-storm.svg)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -205,8 +205,8 @@ </svg></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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/weatherinfo-icons-weather-sunny-svg.html b/doc/html/weatherinfo-icons-weather-sunny-svg.html index 930bf6bdfa..7bfcbf5908 100644 --- a/doc/html/weatherinfo-icons-weather-sunny-svg.html +++ b/doc/html/weatherinfo-icons-weather-sunny-svg.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: weather-sunny.svg Example File (weatherinfo/icons/weather-sunny.svg)</title> + <title>Qt Mobility Project 1.1: weather-sunny.svg Example File (weatherinfo/icons/weather-sunny.svg)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -97,8 +97,8 @@ </svg></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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/weatherinfo-icons-weather-sunny-very-few-clouds-svg.html b/doc/html/weatherinfo-icons-weather-sunny-very-few-clouds-svg.html index 54ca7657af..ff3a6e1970 100644 --- a/doc/html/weatherinfo-icons-weather-sunny-very-few-clouds-svg.html +++ b/doc/html/weatherinfo-icons-weather-sunny-very-few-clouds-svg.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: weather-sunny-very-few-clouds.svg Example File (weatherinfo/icons/weather-sunny-very-few-clouds.svg)</title> + <title>Qt Mobility Project 1.1: weather-sunny-very-few-clouds.svg Example File (weatherinfo/icons/weather-sunny-very-few-clouds.svg)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -156,8 +156,8 @@ </svg></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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/weatherinfo-icons-weather-thundershower-svg.html b/doc/html/weatherinfo-icons-weather-thundershower-svg.html index 95feaedaa1..dbcbcff94b 100644 --- a/doc/html/weatherinfo-icons-weather-thundershower-svg.html +++ b/doc/html/weatherinfo-icons-weather-thundershower-svg.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: weather-thundershower.svg Example File (weatherinfo/icons/weather-thundershower.svg)</title> + <title>Qt Mobility Project 1.1: weather-thundershower.svg Example File (weatherinfo/icons/weather-thundershower.svg)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -239,8 +239,8 @@ </svg></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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/weatherinfo-weatherinfo-cpp.html b/doc/html/weatherinfo-weatherinfo-cpp.html index 1b33487944..138b83a920 100644 --- a/doc/html/weatherinfo-weatherinfo-cpp.html +++ b/doc/html/weatherinfo-weatherinfo-cpp.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: weatherinfo.cpp Example File (weatherinfo/weatherinfo.cpp)</title> + <title>Qt Mobility Project 1.1: weatherinfo.cpp Example File (weatherinfo/weatherinfo.cpp)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -692,8 +692,8 @@ }</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/weatherinfo-weatherinfo-pro.html b/doc/html/weatherinfo-weatherinfo-pro.html index 71c28270c1..c8fb6f34ef 100644 --- a/doc/html/weatherinfo-weatherinfo-pro.html +++ b/doc/html/weatherinfo-weatherinfo-pro.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: weatherinfo.pro Example File (weatherinfo/weatherinfo.pro)</title> + <title>Qt Mobility Project 1.1: weatherinfo.pro Example File (weatherinfo/weatherinfo.pro)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -37,23 +37,27 @@ ../flickrdemo symbian { - TARGET.CAPABILITY = NetworkServices Location ReadUserData - } - - symbian: { - addFiles.sources = nmealog.txt - DEPLOYMENT += addFiles + symbian { + addFiles.sources = nmealog.txt + DEPLOYMENT += addFiles + TARGET.CAPABILITY += Location \ + NetworkServices \ + ReadUserData + } + wince* { + addFiles.sources = ./nmealog.txt + addFiles.path = . + DEPLOYMENT += addFiles + } } else { - logfile.path = $$DESTDIR + logfile.path = $$QT_MOBILITY_PREFIX/bin 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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/weatherinfo-weatherinfo-qrc.html b/doc/html/weatherinfo-weatherinfo-qrc.html index 0af395131d..c65f285131 100644 --- a/doc/html/weatherinfo-weatherinfo-qrc.html +++ b/doc/html/weatherinfo-weatherinfo-qrc.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: weatherinfo.qrc Example File (weatherinfo/weatherinfo.qrc)</title> + <title>Qt Mobility Project 1.1: weatherinfo.qrc Example File (weatherinfo/weatherinfo.qrc)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -31,8 +31,8 @@ </RCC></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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/weatherinfo.html b/doc/html/weatherinfo.html index 86e2b83760..225077032f 100644 --- a/doc/html/weatherinfo.html +++ b/doc/html/weatherinfo.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- weatherinfo.qdoc --> <head> - <title>Qt Mobility Project 1.0: Weather Info Example</title> + <title>Qt Mobility Project 1.1: Weather Info Example</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -35,8 +35,8 @@ <p>The Weather Info demo displays the weather forecast for several days at the current location. If no GPS is found then a default is used. Right clicking on the background will display a short list of hard-coded cities that can be used.</p> <p align="center"><img src="images/weatherinfo-bris.png" /></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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 cc061af428..aa4c353fc7 100644 --- a/doc/html/writemessage-main-cpp.html +++ b/doc/html/writemessage-main-cpp.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: main.cpp Example File (writemessage/main.cpp)</title> + <title>Qt Mobility Project 1.1: main.cpp Example File (writemessage/main.cpp)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -75,8 +75,8 @@ }</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 19bf7695ac..863a406eac 100644 --- a/doc/html/writemessage-messagesender-cpp.html +++ b/doc/html/writemessage-messagesender-cpp.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: messagesender.cpp Example File (writemessage/messagesender.cpp)</title> + <title>Qt Mobility Project 1.1: messagesender.cpp Example File (writemessage/messagesender.cpp)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -360,8 +360,8 @@ }</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 197e16e93f..5fe992c058 100644 --- a/doc/html/writemessage-messagesender-h.html +++ b/doc/html/writemessage-messagesender-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: messagesender.h Example File (writemessage/messagesender.h)</title> + <title>Qt Mobility Project 1.1: messagesender.h Example File (writemessage/messagesender.h)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -15,7 +15,7 @@ </h1> <pre><span class="comment"> /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -106,8 +106,8 @@ #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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.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 16dcbfbe4e..c1bce8a396 100644 --- a/doc/html/writemessage-writemessage-pro.html +++ b/doc/html/writemessage-writemessage-pro.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: writemessage.pro Example File (writemessage/writemessage.pro)</title> + <title>Qt Mobility Project 1.1: writemessage.pro Example File (writemessage/writemessage.pro)</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -46,8 +46,8 @@ WriteDeviceData</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/html/writemessage.html b/doc/html/writemessage.html index 59ea8dbaca..636108888d 100644 --- a/doc/html/writemessage.html +++ b/doc/html/writemessage.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- writemessage.qdoc --> <head> - <title>Qt Mobility Project 1.0: 'Write Message' Example</title> + <title>Qt Mobility Project 1.1: 'Write Message' Example</title> <link href="classic.css" rel="stylesheet" type="text/css" /> </head> <body> @@ -143,8 +143,8 @@ }</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 align="left">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td> <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> +<td align="right"><div align="right">Qt Mobility Project 1.1.0</div></td> </tr></table></div></address></body> </html> diff --git a/doc/src/bearermanagement.qdoc b/doc/src/bearermanagement.qdoc index 7c654c4d4d..6a7360b46b 100644 --- a/doc/src/bearermanagement.qdoc +++ b/doc/src/bearermanagement.qdoc @@ -59,13 +59,6 @@ access points. \tableofcontents -\section1 Namespace - -The QtMobility API's are placed into the \i{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 Overview The Bearer Management API controls the system's connectivity state. This @@ -77,13 +70,32 @@ session management so that a network interface remains up for as long as clients have a registered interest in them while at the same time optimizes the interface's uptime. -This API is a key enabler for HTTP level roaming in -\l {QNetworkAccessManager}{QNetworkAccessManager}. - This API does not provide support for management of network configurations themselves. It is up to the platform to provide infrastructure which enables to user to create, edit or delete network configurations. +\section2 Migration to Qt 4.7 or higher + +The Bearer API has been migrated to the Qt 4.7 QtNetwork library. This enables +connection manager and roaming support for \l QNetworkAccessManager. +Starting with Qt 4.7 the Mobility version has been deprecated in favor of +Qt's Bearer API. Furthermore the roaming enabled QNetworkAccessManager cannot be used +in connection with Mobility's Bearer API. + +The porting effort from Mobility Bearer to Qt Bearer is minimal as +the relevant classes are source compatible. The only exception is the +removal of the QtMobility namespace. Already deployed applications will continue +to work but cannot make use of the new features in Qt 4.7 and QNetworkAccessManager. + +An application can select the Bearer API to be used via its project file. +As long as the MOBILITY variable contains the \c bearer string the project +will link Mobility's bearer library (even if the project links against QtNetwork at the same time). + +\code + MOBILITY+=bearer #choose Mobility bearer +\endcode + + \section2 The API in Detail Computer systems manage their network interfaces via a set of configurations. diff --git a/doc/src/classes.qdoc b/doc/src/classes.qdoc index 188725b8cd..172e5d316d 100644 --- a/doc/src/classes.qdoc +++ b/doc/src/classes.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/doc/src/contacts.qdoc b/doc/src/contacts.qdoc index 000fb064c0..28174bbfe9 100644 --- a/doc/src/contacts.qdoc +++ b/doc/src/contacts.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/doc/src/contactsasync.qdoc b/doc/src/contactsasync.qdoc index 0a47b25354..b594d98ae9 100644 --- a/doc/src/contactsasync.qdoc +++ b/doc/src/contactsasync.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/doc/src/contactsengines.qdoc b/doc/src/contactsengines.qdoc index 6714e0ad5e..d29c58e96a 100644 --- a/doc/src/contactsengines.qdoc +++ b/doc/src/contactsengines.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/doc/src/contactsschema.qdoc b/doc/src/contactsschema.qdoc index eab9d70759..11bc5ad5e1 100644 --- a/doc/src/contactsschema.qdoc +++ b/doc/src/contactsschema.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/doc/src/contactssync.qdoc b/doc/src/contactssync.qdoc index fb80655b49..840e00bdb0 100644 --- a/doc/src/contactssync.qdoc +++ b/doc/src/contactssync.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/doc/src/contactsusage.qdoc b/doc/src/contactsusage.qdoc index 16b7980f94..fd700b834a 100644 --- a/doc/src/contactsusage.qdoc +++ b/doc/src/contactsusage.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/doc/src/examples.qdoc b/doc/src/examples.qdoc index ca4b634d7d..57509934ed 100644 --- a/doc/src/examples.qdoc +++ b/doc/src/examples.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/doc/src/examples/audiorecorder.qdoc b/doc/src/examples/audiorecorder.qdoc index 4c61811f70..2fbd91e017 100644 --- a/doc/src/examples/audiorecorder.qdoc +++ b/doc/src/examples/audiorecorder.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/doc/src/examples/battery-charge.qdoc b/doc/src/examples/battery-charge.qdoc index d673464aa4..24ec5f7b91 100644 --- a/doc/src/examples/battery-charge.qdoc +++ b/doc/src/examples/battery-charge.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/doc/src/examples/bearercloud.qdoc b/doc/src/examples/bearercloud.qdoc index 90cdbfa1b8..7cbf55fcd9 100644 --- a/doc/src/examples/bearercloud.qdoc +++ b/doc/src/examples/bearercloud.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/doc/src/examples/bearermonitor.qdoc b/doc/src/examples/bearermonitor.qdoc index 8d3892b5f8..f23425b922 100644 --- a/doc/src/examples/bearermonitor.qdoc +++ b/doc/src/examples/bearermonitor.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/doc/src/examples/bluetoothtransferplugin.qdoc b/doc/src/examples/bluetoothtransferplugin.qdoc index 615afa10e6..b075dfee32 100644 --- a/doc/src/examples/bluetoothtransferplugin.qdoc +++ b/doc/src/examples/bluetoothtransferplugin.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/doc/src/examples/declarative-sfw-dialer.qdoc b/doc/src/examples/declarative-sfw-dialer.qdoc index f6bedb4111..52668a05c0 100644 --- a/doc/src/examples/declarative-sfw-dialer.qdoc +++ b/doc/src/examples/declarative-sfw-dialer.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/doc/src/examples/declarative-sfw-notes.qdoc b/doc/src/examples/declarative-sfw-notes.qdoc index 4ab0600677..7234b0f356 100644 --- a/doc/src/examples/declarative-sfw-notes.qdoc +++ b/doc/src/examples/declarative-sfw-notes.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/doc/src/examples/filemanagerplugin.qdoc b/doc/src/examples/filemanagerplugin.qdoc index fd7afb30a3..41bf5944ce 100644 --- a/doc/src/examples/filemanagerplugin.qdoc +++ b/doc/src/examples/filemanagerplugin.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/doc/src/examples/flickrdemo.qdoc b/doc/src/examples/flickrdemo.qdoc index 3d44787977..d7792efccf 100644 --- a/doc/src/examples/flickrdemo.qdoc +++ b/doc/src/examples/flickrdemo.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/doc/src/examples/keepintouch.qdoc b/doc/src/examples/keepintouch.qdoc index 60d8535a7a..733dd18fa9 100644 --- a/doc/src/examples/keepintouch.qdoc +++ b/doc/src/examples/keepintouch.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/doc/src/examples/lightmaps.qdoc b/doc/src/examples/lightmaps.qdoc index 8e81b77fa1..36468f1c72 100644 --- a/doc/src/examples/lightmaps.qdoc +++ b/doc/src/examples/lightmaps.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/doc/src/examples/notesmanagerplugin.qdoc b/doc/src/examples/notesmanagerplugin.qdoc index fc1f1b4b2d..ded738e98e 100644 --- a/doc/src/examples/notesmanagerplugin.qdoc +++ b/doc/src/examples/notesmanagerplugin.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/doc/src/examples/player.qdoc b/doc/src/examples/player.qdoc index 64b74c72cc..f8c5c04dc4 100644 --- a/doc/src/examples/player.qdoc +++ b/doc/src/examples/player.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/doc/src/examples/publish-subscribe.qdoc b/doc/src/examples/publish-subscribe.qdoc index 46e88582ce..9d091c4696 100644 --- a/doc/src/examples/publish-subscribe.qdoc +++ b/doc/src/examples/publish-subscribe.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/doc/src/examples/qmlcontacts.qdoc b/doc/src/examples/qmlcontacts.qdoc index 8050f2e08a..1eadb9ad12 100644 --- a/doc/src/examples/qmlcontacts.qdoc +++ b/doc/src/examples/qmlcontacts.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/doc/src/examples/querymessages.qdoc b/doc/src/examples/querymessages.qdoc index ef8aa8640d..a5b342c233 100644 --- a/doc/src/examples/querymessages.qdoc +++ b/doc/src/examples/querymessages.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/doc/src/examples/quickstart.qdoc b/doc/src/examples/quickstart.qdoc index e85b8327f5..7a050e9ebf 100644 --- a/doc/src/examples/quickstart.qdoc +++ b/doc/src/examples/quickstart.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -65,11 +65,6 @@ This example uses the QSystemInfo headers to print out the system's current country code. All the domain APIs are wrapped within a Qt Mobility namespace and thus developers need to use the QTM_USE_NAMESPACE macro. -(\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: @@ -155,6 +150,8 @@ When developing on Symbian we will also need to add the required capabilites to \row \endtable +The complete list of all Symbian capabilities and how they can be obtained can be found in the \l {http://developer.symbian.org/wiki/index.php/Capabilities_(Symbian_Signed)#Which_capabilities_can_I_access.3F}{Symbian developer documentation}. + And we're done. If you are using the command line simply enter: \code diff --git a/doc/src/examples/samplephonebook.qdoc b/doc/src/examples/samplephonebook.qdoc index 3078edbc89..d1bd7fe7c3 100644 --- a/doc/src/examples/samplephonebook.qdoc +++ b/doc/src/examples/samplephonebook.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/doc/src/examples/serviceactions.qdoc b/doc/src/examples/serviceactions.qdoc index 859104b592..8077a14a30 100644 --- a/doc/src/examples/serviceactions.qdoc +++ b/doc/src/examples/serviceactions.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/doc/src/examples/servicebrowser.qdoc b/doc/src/examples/servicebrowser.qdoc index 5a56494793..1a7d5153bd 100644 --- a/doc/src/examples/servicebrowser.qdoc +++ b/doc/src/examples/servicebrowser.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/doc/src/examples/sfw-notes.qdoc b/doc/src/examples/sfw-notes.qdoc index 7ea6d0b813..98737a6fa1 100644 --- a/doc/src/examples/sfw-notes.qdoc +++ b/doc/src/examples/sfw-notes.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/doc/src/examples/slideshow.qdoc b/doc/src/examples/slideshow.qdoc index b048d23675..bedb0e80d4 100644 --- a/doc/src/examples/slideshow.qdoc +++ b/doc/src/examples/slideshow.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/doc/src/examples/sysinfo.qdoc b/doc/src/examples/sysinfo.qdoc index 6ec2ef09dd..f29781b63e 100644 --- a/doc/src/examples/sysinfo.qdoc +++ b/doc/src/examples/sysinfo.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/doc/src/examples/undocumented.qdoc b/doc/src/examples/undocumented.qdoc index 0732063646..d8efd18df8 100644 --- a/doc/src/examples/undocumented.qdoc +++ b/doc/src/examples/undocumented.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/doc/src/examples/weatherinfo.qdoc b/doc/src/examples/weatherinfo.qdoc index a291de9f75..5543193934 100644 --- a/doc/src/examples/weatherinfo.qdoc +++ b/doc/src/examples/weatherinfo.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/doc/src/examples/writemessage.qdoc b/doc/src/examples/writemessage.qdoc index d7b914ba7b..389a05e09f 100644 --- a/doc/src/examples/writemessage.qdoc +++ b/doc/src/examples/writemessage.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/doc/src/future.qdoc b/doc/src/future.qdoc index 4647f155ba..e9168ba083 100644 --- a/doc/src/future.qdoc +++ b/doc/src/future.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc index d52bcdb765..e9ceb7043d 100644 --- a/doc/src/index.qdoc +++ b/doc/src/index.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -102,6 +102,13 @@ there is the possibility of easy transfer of user experience from PC to phone or vice versa. + \section1 Namespace + + The QtMobility API's are placed into the \i{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. + \section2 Getting Started To get started with Qt Mobility see the \list diff --git a/doc/src/installation.qdoc b/doc/src/installation.qdoc index 732f713efb..cc2ba15bfe 100644 --- a/doc/src/installation.qdoc +++ b/doc/src/installation.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/doc/src/legal/3rdparty.qdoc b/doc/src/legal/3rdparty.qdoc index f8988d7dfd..427ed88dce 100644 --- a/doc/src/legal/3rdparty.qdoc +++ b/doc/src/legal/3rdparty.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/doc/src/legal/editions.qdoc b/doc/src/legal/editions.qdoc index d00078566a..4de77c1fd0 100644 --- a/doc/src/legal/editions.qdoc +++ b/doc/src/legal/editions.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/doc/src/legal/gpl.qdoc b/doc/src/legal/gpl.qdoc index 82eeea1313..58967b7780 100644 --- a/doc/src/legal/gpl.qdoc +++ b/doc/src/legal/gpl.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -44,7 +44,7 @@ \ingroup licensing \brief About the LGPL license used for Qt. -The Qt GUI Toolkit is Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).\br +The Qt GUI Toolkit is Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).\br Contact: Nokia Corporation (qt-info@nokia.com) Qt is available under the LGPL. diff --git a/doc/src/legal/opensourceedition.qdoc b/doc/src/legal/opensourceedition.qdoc index 9858360936..c199e34ce4 100644 --- a/doc/src/legal/opensourceedition.qdoc +++ b/doc/src/legal/opensourceedition.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/doc/src/legal/trademarks.qdoc b/doc/src/legal/trademarks.qdoc index 293b401bda..c6e82d38e7 100644 --- a/doc/src/legal/trademarks.qdoc +++ b/doc/src/legal/trademarks.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/doc/src/location.qdoc b/doc/src/location.qdoc index 8f9035e51a..b770785952 100644 --- a/doc/src/location.qdoc +++ b/doc/src/location.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/doc/src/messaging.qdoc b/doc/src/messaging.qdoc index 06e2b31d8e..86f025bccd 100644 --- a/doc/src/messaging.qdoc +++ b/doc/src/messaging.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/doc/src/multimedia.qdoc b/doc/src/multimedia.qdoc index 8d8cdf47aa..4cc661f86d 100644 --- a/doc/src/multimedia.qdoc +++ b/doc/src/multimedia.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/doc/src/preview.qdoc b/doc/src/preview.qdoc index 44da9c01b4..5f84fc9e01 100644 --- a/doc/src/preview.qdoc +++ b/doc/src/preview.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/doc/src/publ-subs.qdoc b/doc/src/publ-subs.qdoc index 1466058118..d07ce5d6a0 100644 --- a/doc/src/publ-subs.qdoc +++ b/doc/src/publ-subs.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/doc/src/qtmobility-known-issues.qdoc b/doc/src/qtmobility-known-issues.qdoc index d52dd678a4..ceb35803b8 100644 --- a/doc/src/qtmobility-known-issues.qdoc +++ b/doc/src/qtmobility-known-issues.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -143,12 +143,6 @@ Support is present for the following System Info API classes \list \o Qt Mobility does not compile if Qt using a namespace. \o Not all example applications will display(fit) well on small screens. - \o S60: it is currently not possible to use Qt convenience header includes: - \code - #include <QSystemInfo> //does not work on Symbian - //use - #include <qsysteminfo.h> - \endcode \endlist \section2 Contacts API diff --git a/doc/src/qtmobility.qdocconf b/doc/src/qtmobility.qdocconf index 82f4246497..88b23e093e 100644 --- a/doc/src/qtmobility.qdocconf +++ b/doc/src/qtmobility.qdocconf @@ -47,8 +47,8 @@ outputdir = ../html extraimages.HTML = qtlogo \ codeless -versionsym = "QtMobility Project 1.0.0" -version = Mobility Project 1.0.0 +versionsym = "QtMobility Project 1.1.0" +version = Mobility Project 1.1.0 base = file:./doc/html @@ -175,9 +175,9 @@ HTML.postheader = "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0 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 align=\"left\">Copyright © 2010 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</div></td>\n" \ + "<td align=\"right\"><div align=\"right\">Qt Mobility Project 1.1.0</div></td>\n" \ "</tr></table></div></address>" macro.raisedaster.HTML = "<sup>*</sup>" diff --git a/doc/src/sensors.qdoc b/doc/src/sensors.qdoc index 7f4a3df8e4..8dd41f4e86 100644 --- a/doc/src/sensors.qdoc +++ b/doc/src/sensors.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/doc/src/sf.qdoc b/doc/src/sf.qdoc index d5fbe3abcd..9b7b2a8f52 100644 --- a/doc/src/sf.qdoc +++ b/doc/src/sf.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -150,21 +150,23 @@ The client code has precise knowledge of the service and its interfaces. It is assumed that the client has knowledge of the interface but does not really care about the specific type or version of the service implementing the interface. In such cases the default -service lookup can be utilized to create a service object instance. If the -same service provides multiple versions of the same interface the latest -version is returned. Therefore subsequent versions of the same interface -must always be binary compatible to previous versions. +service lookup can be utilized to create a service object instance. \code QServiceManager manager; manager.setInterfaceDefault("FileStorageService", "com.nokia.qt.examples.FileStorage"); \endcode -The above call to \l QServiceManager::setInterfaceDefault() registers the \i FileStorageService as default implementation. Whenever a client asks -for an implementation of \i com.nokia.qt.examples.FileStorage the \i FileStorageService service will be loaded. The current scope of the service manager object -determines whether the default assignment is valid for all users or whether it is valid for the current user only. The system default is used if the user -scope has not been defined. This enables users to customize their personal preferences. By default the first service installing a so far unknown interface -becomes the system wide default selection. +The above call to \l QServiceManager::setInterfaceDefault() registers the \i FileStorageService as default implementation. +Whenever a client asks for an implementation of \i com.nokia.qt.examples.FileStorage the \i FileStorageService +service will be loaded. If (at the time of this call) the \i FileStorageService provides multiple registered implementations/versions for the +same interface the latest version becomes the default. Therefore subsequent versions of the same interface +must always be binary compatible to previous versions. + +The current scope of the service manager object determines whether the default assignment is valid for all users +or whether it is valid for the current user only. The system default is used if the user +scope has not been defined. This enables users to customize their personal preferences. +By default the first service installing a so far unknown interface becomes the system wide default selection. \section3 QObject based services diff --git a/doc/src/sfw_s60.qdoc b/doc/src/sfw_s60.qdoc index 2521beb8ed..07275009fa 100644 --- a/doc/src/sfw_s60.qdoc +++ b/doc/src/sfw_s60.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/doc/src/si.qdoc b/doc/src/si.qdoc index ece40e753c..70b22c06d1 100644 --- a/doc/src/si.qdoc +++ b/doc/src/si.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/doc/src/snippets/code/doc_src_lgpl.qdoc b/doc/src/snippets/code/doc_src_lgpl.qdoc index 5d802c91a6..1f97703819 100644 --- a/doc/src/snippets/code/doc_src_lgpl.qdoc +++ b/doc/src/snippets/code/doc_src_lgpl.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/doc/src/snippets/multimedia-snippets/audiorecorder.cpp b/doc/src/snippets/multimedia-snippets/audiorecorder.cpp index 547f32f935..fa1ef60d35 100644 --- a/doc/src/snippets/multimedia-snippets/audiorecorder.cpp +++ b/doc/src/snippets/multimedia-snippets/audiorecorder.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/doc/src/snippets/multimedia-snippets/player.cpp b/doc/src/snippets/multimedia-snippets/player.cpp index 2942a5e70f..e2cf670969 100644 --- a/doc/src/snippets/multimedia-snippets/player.cpp +++ b/doc/src/snippets/multimedia-snippets/player.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.cpp b/doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.cpp index fca0d86ae6..0aed2f32df 100644 --- a/doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.cpp +++ b/doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/doc/src/snippets/qtcontactsdocsample/qtcontactsdocsampleasync.cpp b/doc/src/snippets/qtcontactsdocsample/qtcontactsdocsampleasync.cpp index f848e99d56..d5a580c246 100644 --- a/doc/src/snippets/qtcontactsdocsample/qtcontactsdocsampleasync.cpp +++ b/doc/src/snippets/qtcontactsdocsample/qtcontactsdocsampleasync.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/doc/src/snippets/qtcontactsdocsample/requestexample.h b/doc/src/snippets/qtcontactsdocsample/requestexample.h index b6f2b284dc..ff7f9a5728 100644 --- a/doc/src/snippets/qtcontactsdocsample/requestexample.h +++ b/doc/src/snippets/qtcontactsdocsample/requestexample.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/doc/src/snippets/qtversitdocsample/qtversitdocsample.cpp b/doc/src/snippets/qtversitdocsample/qtversitdocsample.cpp index e857181734..12206e3c2c 100644 --- a/doc/src/snippets/qtversitdocsample/qtversitdocsample.cpp +++ b/doc/src/snippets/qtversitdocsample/qtversitdocsample.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/doc/src/snippets/sensors/creating.cpp b/doc/src/snippets/sensors/creating.cpp index c5a107cae7..6799e37bcc 100644 --- a/doc/src/snippets/sensors/creating.cpp +++ b/doc/src/snippets/sensors/creating.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/doc/src/snippets/sensors/main.cpp b/doc/src/snippets/sensors/main.cpp index c20aa671cc..eeb2e46e24 100644 --- a/doc/src/snippets/sensors/main.cpp +++ b/doc/src/snippets/sensors/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/doc/src/snippets/sensors/mybackend.h b/doc/src/snippets/sensors/mybackend.h index e4a918a12a..a6aa9b3c97 100644 --- a/doc/src/snippets/sensors/mybackend.h +++ b/doc/src/snippets/sensors/mybackend.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/doc/src/snippets/sensors/plugin.cpp b/doc/src/snippets/sensors/plugin.cpp index 6a69e35c7d..d87d98f853 100644 --- a/doc/src/snippets/sensors/plugin.cpp +++ b/doc/src/snippets/sensors/plugin.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/doc/src/snippets/sensors/sensors.pro b/doc/src/snippets/sensors/sensors.pro index ee425c5ca6..a2fe7dda3e 100644 --- a/doc/src/snippets/sensors/sensors.pro +++ b/doc/src/snippets/sensors/sensors.pro @@ -2,6 +2,7 @@ TEMPLATE=app TARGET=sensors include(../../../../common.pri) INCLUDEPATH += ../../../../src/sensors +DESTDIR=$$PWD SOURCES+=main.cpp\ creating.cpp\ start.cpp\ diff --git a/doc/src/snippets/sensors/start.cpp b/doc/src/snippets/sensors/start.cpp index 2b91297e7e..d9d6ac6fc1 100644 --- a/doc/src/snippets/sensors/start.cpp +++ b/doc/src/snippets/sensors/start.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/doc/src/versit.qdoc b/doc/src/versit.qdoc index 557b154e9c..4960714f77 100644 --- a/doc/src/versit.qdoc +++ b/doc/src/versit.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/audiorecorder/audiorecorder.cpp b/examples/audiorecorder/audiorecorder.cpp index 773a48f61c..8011bdcd24 100644 --- a/examples/audiorecorder/audiorecorder.cpp +++ b/examples/audiorecorder/audiorecorder.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/audiorecorder/audiorecorder.h b/examples/audiorecorder/audiorecorder.h index e284ca1bf9..090d3d0e22 100644 --- a/examples/audiorecorder/audiorecorder.h +++ b/examples/audiorecorder/audiorecorder.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/audiorecorder/main.cpp b/examples/audiorecorder/main.cpp index dabf28cee2..509e531a0e 100644 --- a/examples/audiorecorder/main.cpp +++ b/examples/audiorecorder/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/battery-charge/battery-publisher/batterypublisher.cpp b/examples/battery-charge/battery-publisher/batterypublisher.cpp index aa3a95329d..93d0ec2427 100644 --- a/examples/battery-charge/battery-publisher/batterypublisher.cpp +++ b/examples/battery-charge/battery-publisher/batterypublisher.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/battery-charge/battery-publisher/batterypublisher.h b/examples/battery-charge/battery-publisher/batterypublisher.h index cd06af97f5..31ff11beea 100644 --- a/examples/battery-charge/battery-publisher/batterypublisher.h +++ b/examples/battery-charge/battery-publisher/batterypublisher.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/battery-charge/battery-publisher/main.cpp b/examples/battery-charge/battery-publisher/main.cpp index 1c37b603ed..29f573ea4d 100644 --- a/examples/battery-charge/battery-publisher/main.cpp +++ b/examples/battery-charge/battery-publisher/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/battery-charge/battery-subscriber/main.cpp b/examples/battery-charge/battery-subscriber/main.cpp index dcfd59ba7a..1942032a3c 100644 --- a/examples/battery-charge/battery-subscriber/main.cpp +++ b/examples/battery-charge/battery-subscriber/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/bearercloud/bearercloud.cpp b/examples/bearercloud/bearercloud.cpp index c6d3a062b4..ddb48c7b88 100644 --- a/examples/bearercloud/bearercloud.cpp +++ b/examples/bearercloud/bearercloud.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/bearercloud/bearercloud.h b/examples/bearercloud/bearercloud.h index 52e9d1e94c..0dd5a829b0 100644 --- a/examples/bearercloud/bearercloud.h +++ b/examples/bearercloud/bearercloud.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/bearercloud/cloud.cpp b/examples/bearercloud/cloud.cpp index 361e46fda1..17b45baedf 100644 --- a/examples/bearercloud/cloud.cpp +++ b/examples/bearercloud/cloud.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/bearercloud/cloud.h b/examples/bearercloud/cloud.h index bc95d21dfb..37f62b9b52 100644 --- a/examples/bearercloud/cloud.h +++ b/examples/bearercloud/cloud.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/bearercloud/main.cpp b/examples/bearercloud/main.cpp index 0af975b45c..defbf5bd3a 100644 --- a/examples/bearercloud/main.cpp +++ b/examples/bearercloud/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/bearermonitor/bearermonitor.cpp b/examples/bearermonitor/bearermonitor.cpp index 26274a56df..699ab32875 100644 --- a/examples/bearermonitor/bearermonitor.cpp +++ b/examples/bearermonitor/bearermonitor.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/bearermonitor/bearermonitor.h b/examples/bearermonitor/bearermonitor.h index 7c34ac7e5a..08be5349b3 100644 --- a/examples/bearermonitor/bearermonitor.h +++ b/examples/bearermonitor/bearermonitor.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/bearermonitor/main.cpp b/examples/bearermonitor/main.cpp index cfcff1f997..c5e3806d6b 100644 --- a/examples/bearermonitor/main.cpp +++ b/examples/bearermonitor/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/bluetoothtransferplugin/bluetoothtransfer.cpp b/examples/bluetoothtransferplugin/bluetoothtransfer.cpp index 49dc055acb..c02ec63ed1 100644 --- a/examples/bluetoothtransferplugin/bluetoothtransfer.cpp +++ b/examples/bluetoothtransferplugin/bluetoothtransfer.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/bluetoothtransferplugin/bluetoothtransfer.h b/examples/bluetoothtransferplugin/bluetoothtransfer.h index f7678d222e..4a4c85bf48 100644 --- a/examples/bluetoothtransferplugin/bluetoothtransfer.h +++ b/examples/bluetoothtransferplugin/bluetoothtransfer.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/bluetoothtransferplugin/bluetoothtransferplugin.cpp b/examples/bluetoothtransferplugin/bluetoothtransferplugin.cpp index 2c3ba5c554..14a3dd447b 100644 --- a/examples/bluetoothtransferplugin/bluetoothtransferplugin.cpp +++ b/examples/bluetoothtransferplugin/bluetoothtransferplugin.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/bluetoothtransferplugin/bluetoothtransferplugin.h b/examples/bluetoothtransferplugin/bluetoothtransferplugin.h index 06c2edf702..abf094f915 100644 --- a/examples/bluetoothtransferplugin/bluetoothtransferplugin.h +++ b/examples/bluetoothtransferplugin/bluetoothtransferplugin.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/bluetoothtransferplugin/bluetoothtransferplugin.pro b/examples/bluetoothtransferplugin/bluetoothtransferplugin.pro index ad1c76d123..17d85f07f4 100644 --- a/examples/bluetoothtransferplugin/bluetoothtransferplugin.pro +++ b/examples/bluetoothtransferplugin/bluetoothtransferplugin.pro @@ -1,6 +1,8 @@ TEMPLATE = lib CONFIG += plugin +PLUGIN_TYPE=serviceframework INCLUDEPATH += ../../src/serviceframework + HEADERS += bluetoothtransferplugin.h \ bluetoothtransfer.h SOURCES += bluetoothtransferplugin.cpp \ @@ -22,8 +24,6 @@ symbian { TARGET.CAPABILITY = LocalServices Location NetworkServices ReadUserData WriteUserData UserEnvironment } -xml.path = $$DESTDIR/xmldata +xml.path = $$QT_MOBILITY_PREFIX/bin/xmldata xml.files = bluetoothtransferservice.xml -xml.CONFIG = no_link no_dependencies explicit_dependencies no_build combine ignore_no_exist no_clean INSTALLS += xml -build_pass:ALL_DEPS+=install_xml diff --git a/examples/declarative-sfw-dialer/declarative-sfw-dialer.pro b/examples/declarative-sfw-dialer/declarative-sfw-dialer.pro index 00a2f7712f..684a9daf6d 100644 --- a/examples/declarative-sfw-dialer/declarative-sfw-dialer.pro +++ b/examples/declarative-sfw-dialer/declarative-sfw-dialer.pro @@ -1,5 +1,3 @@ TEMPLATE = subdirs -SUBDIRS += sfwexample \ - voipdialer \ +SUBDIRS += voipdialer \ landlinedialer -#gsmdialer diff --git a/examples/declarative-sfw-dialer/declarative-sfw-dialer/README b/examples/declarative-sfw-dialer/declarative-sfw-dialer/README new file mode 100644 index 0000000000..546e6e8cfb --- /dev/null +++ b/examples/declarative-sfw-dialer/declarative-sfw-dialer/README @@ -0,0 +1,9 @@ +This example requires the example Dialer services to be registered in order +for the application to obtain the default interface. This can be done by using the +service framework command line tool to add the corresponding service XML file: + +./servicefw add landlinedialerservice.xml +./servicefw add voipdialerservice.xml + +The XML files for all example services can be found in the QtMobility build directory +under install/bin/xmldata diff --git a/examples/declarative-sfw-dialer/sfwexample/content/DialButton.qml b/examples/declarative-sfw-dialer/declarative-sfw-dialer/content/DialButton.qml index 5bfd68793d..5bfd68793d 100644 --- a/examples/declarative-sfw-dialer/sfwexample/content/DialButton.qml +++ b/examples/declarative-sfw-dialer/declarative-sfw-dialer/content/DialButton.qml diff --git a/examples/declarative-sfw-dialer/sfwexample/content/DialScreen.qml b/examples/declarative-sfw-dialer/declarative-sfw-dialer/content/DialScreen.qml index 5adb6f3c08..5adb6f3c08 100644 --- a/examples/declarative-sfw-dialer/sfwexample/content/DialScreen.qml +++ b/examples/declarative-sfw-dialer/declarative-sfw-dialer/content/DialScreen.qml diff --git a/examples/declarative-sfw-dialer/sfwexample/content/DialerList.qml b/examples/declarative-sfw-dialer/declarative-sfw-dialer/content/DialerList.qml index 397a85ca01..bff7fea4ec 100644 --- a/examples/declarative-sfw-dialer/sfwexample/content/DialerList.qml +++ b/examples/declarative-sfw-dialer/declarative-sfw-dialer/content/DialerList.qml @@ -21,7 +21,7 @@ import QtMobility.serviceframework 1.0 //--------------------------------- Rectangle { - property var dialService: 0 + property variant dialService: 0 signal signalSelected Text { diff --git a/examples/declarative-sfw-dialer/sfwexample/content/call.png b/examples/declarative-sfw-dialer/declarative-sfw-dialer/content/call.png Binary files differindex cee34a709a..cee34a709a 100644 --- a/examples/declarative-sfw-dialer/sfwexample/content/call.png +++ b/examples/declarative-sfw-dialer/declarative-sfw-dialer/content/call.png diff --git a/examples/declarative-sfw-dialer/sfwexample/content/hangup.png b/examples/declarative-sfw-dialer/declarative-sfw-dialer/content/hangup.png Binary files differindex 6c464bda99..6c464bda99 100644 --- a/examples/declarative-sfw-dialer/sfwexample/content/hangup.png +++ b/examples/declarative-sfw-dialer/declarative-sfw-dialer/content/hangup.png diff --git a/examples/declarative-sfw-dialer/declarative-sfw-dialer/content/qmldir b/examples/declarative-sfw-dialer/declarative-sfw-dialer/content/qmldir new file mode 100644 index 0000000000..97908f7310 --- /dev/null +++ b/examples/declarative-sfw-dialer/declarative-sfw-dialer/content/qmldir @@ -0,0 +1,3 @@ +DialButton DialButton.qml +DialerList DialerList.qml +DialScreen DialScreen.qml diff --git a/examples/declarative-sfw-dialer/sfwexample/sfwexample.qml b/examples/declarative-sfw-dialer/declarative-sfw-dialer/declarative-sfw-dialer.qml index 31bcccecc0..e1fc169406 100644 --- a/examples/declarative-sfw-dialer/sfwexample/sfwexample.qml +++ b/examples/declarative-sfw-dialer/declarative-sfw-dialer/declarative-sfw-dialer.qml @@ -23,7 +23,7 @@ import "content" //---------------------------------------------- Rectangle { - property var dialerObject: defaultService.serviceObject + property variant dialerObject: defaultService.serviceObject id: mainPage width: 500 @@ -100,7 +100,7 @@ Rectangle { DialScreen { id: dialScreen property bool activeCall : false - property var currentDialer: 0; + property variant currentDialer: 0; anchors.topMargin: 5 anchors.leftMargin: 5 anchors.rightMargin: 5 diff --git a/examples/declarative-sfw-dialer/landlinedialer/landlinedialer.cpp b/examples/declarative-sfw-dialer/landlinedialer/landlinedialer.cpp index f17f871214..0795d8a96c 100644 --- a/examples/declarative-sfw-dialer/landlinedialer/landlinedialer.cpp +++ b/examples/declarative-sfw-dialer/landlinedialer/landlinedialer.cpp @@ -1,39 +1,40 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 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:BSD$ -** You may use this file under the terms of the BSD license as follows: +** $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. +** +** +** +** +** +** ** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. ** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/examples/declarative-sfw-dialer/landlinedialer/landlinedialer.h b/examples/declarative-sfw-dialer/landlinedialer/landlinedialer.h index 5062da5891..571a2ff3a8 100644 --- a/examples/declarative-sfw-dialer/landlinedialer/landlinedialer.h +++ b/examples/declarative-sfw-dialer/landlinedialer/landlinedialer.h @@ -1,39 +1,40 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 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:BSD$ -** You may use this file under the terms of the BSD license as follows: +** $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. +** +** +** +** +** +** ** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. ** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/examples/declarative-sfw-dialer/landlinedialer/landlinedialer.pro b/examples/declarative-sfw-dialer/landlinedialer/landlinedialer.pro index 6459d4c04f..1f325a3af8 100644 --- a/examples/declarative-sfw-dialer/landlinedialer/landlinedialer.pro +++ b/examples/declarative-sfw-dialer/landlinedialer/landlinedialer.pro @@ -1,6 +1,7 @@ TEMPLATE = lib CONFIG += plugin INCLUDEPATH += ../../../src/serviceframework +PLUGIN_TYPE = serviceframework TARGET = serviceframework_landlinedialerservice include(../../examples.pri) @@ -17,8 +18,6 @@ symbian { TARGET.CAPABILITY = ALL -TCB } -xml.path = $$DESTDIR/xmldata +xml.path = $$QT_MOBILITY_PREFIX/bin/xmldata xml.files = landlinedialerservice.xml -xml.CONFIG = no_link no_dependencies explicit_dependencies no_build combine ignore_no_exist no_clean INSTALLS += xml -build_pass:ALL_DEPS+=install_xml diff --git a/examples/declarative-sfw-dialer/landlinedialer/landlinedialerplugin.cpp b/examples/declarative-sfw-dialer/landlinedialer/landlinedialerplugin.cpp index 8e84939e5b..b1be6d9315 100644 --- a/examples/declarative-sfw-dialer/landlinedialer/landlinedialerplugin.cpp +++ b/examples/declarative-sfw-dialer/landlinedialer/landlinedialerplugin.cpp @@ -1,39 +1,40 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 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:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $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$ ** ****************************************************************************/ diff --git a/examples/declarative-sfw-dialer/landlinedialer/landlinedialerplugin.h b/examples/declarative-sfw-dialer/landlinedialer/landlinedialerplugin.h index 795dcd4458..64a7503f90 100644 --- a/examples/declarative-sfw-dialer/landlinedialer/landlinedialerplugin.h +++ b/examples/declarative-sfw-dialer/landlinedialer/landlinedialerplugin.h @@ -1,39 +1,40 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 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:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $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$ ** ****************************************************************************/ diff --git a/examples/declarative-sfw-dialer/sfwexample/qdeclarativeservice.h b/examples/declarative-sfw-dialer/sfwexample/qdeclarativeservice.h deleted file mode 100644 index dd6b69d885..0000000000 --- a/examples/declarative-sfw-dialer/sfwexample/qdeclarativeservice.h +++ /dev/null @@ -1,125 +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:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** $QT_END_LICENSE$ -** -***************************************************************************/ - -#ifndef QDECLARATIVESERVICE_H -#define QDECLARATIVESERVICE_H - -#include <QtCore> -#include <qserviceinterfacedescriptor.h> -#include <qservicemanager.h> -#include <qdeclarative.h> -#include <qdeclarativelist.h> - -QTM_USE_NAMESPACE - -Q_DECLARE_METATYPE(QServiceInterfaceDescriptor) - -class QServiceWrapper : public QObject { - Q_OBJECT - // ![0] - Q_PROPERTY(QString interfaceName READ interfaceName WRITE setInterfaceName); - Q_PROPERTY(QString serviceName READ serviceName); - Q_PROPERTY(QString versionNumber READ versionNumber); - Q_PROPERTY(bool valid READ isValid NOTIFY validChanged); - Q_PROPERTY(QObject* serviceObject READ serviceObject NOTIFY serviceObjectChanged); - // ![0] - -public: - QServiceWrapper(); - ~QServiceWrapper(); - - void setInterfaceDesc(const QServiceInterfaceDescriptor& desc); - QServiceInterfaceDescriptor interfaceDesc() const; - - void setInterfaceName(const QString& interface); - QString interfaceName() const; - QString serviceName() const; - QString versionNumber() const; - - bool isValid() const; - QObject* serviceObject(); - -Q_SIGNALS: - void validChanged(); - void serviceObjectChanged(); - -private: - QServiceManager* serviceManager; - - QServiceInterfaceDescriptor m_descriptor; - QObject* serviceInstance; -}; - -QML_DECLARE_TYPE(QServiceWrapper); - -class QServiceListWrapper : public QObject { - Q_OBJECT - // ![1] - Q_PROPERTY(QString interfaceName READ interfaceName WRITE setInterfaceName); - Q_PROPERTY(QString minVersion READ minVersion WRITE setMinVersion); - Q_PROPERTY(QDeclarativeListProperty<QServiceWrapper> services READ services NOTIFY servicesChanged); - // ![1] - -public: - QServiceListWrapper(); - ~QServiceListWrapper(); - - QDeclarativeListProperty<QServiceWrapper> services(); - - void setInterfaceName(const QString& interface); - QString interfaceName() const; - - void setMinVersion(const QString& interface); - QString minVersion() const; - -private: - QServiceManager* serviceManager; - QList<QServiceWrapper *> m_services; - QString m_interface; - QString m_version; - -Q_SIGNALS: - void servicesChanged(const QDeclarativeListProperty<QServiceWrapper>&); -}; - -QML_DECLARE_TYPE(QServiceListWrapper) - -#endif - diff --git a/examples/declarative-sfw-dialer/sfwexample/resource.qrc b/examples/declarative-sfw-dialer/sfwexample/resource.qrc deleted file mode 100644 index 900f5d7c1d..0000000000 --- a/examples/declarative-sfw-dialer/sfwexample/resource.qrc +++ /dev/null @@ -1,10 +0,0 @@ -<RCC> - <qresource prefix="/" > - <file>sfwexample.qml</file> - <file>content/DialScreen.qml</file> - <file>content/DialButton.qml</file> - <file>content/DialerList.qml</file> - <file>content/call.png</file> - <file>content/hangup.png</file> - </qresource> -</RCC> diff --git a/examples/declarative-sfw-dialer/sfwexample/sfwexample.cpp b/examples/declarative-sfw-dialer/sfwexample/sfwexample.cpp deleted file mode 100644 index 0da54f7275..0000000000 --- a/examples/declarative-sfw-dialer/sfwexample/sfwexample.cpp +++ /dev/null @@ -1,72 +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:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "sfwexample.h" - -DialerServices::DialerServices() -{ - serviceManager = new QServiceManager(); - - registerExampleServices(); -} - -DialerServices::~DialerServices() -{ - unregisterExampleServices(); -} - -void DialerServices::registerExampleServices() -{ - // ![0] - QStringList exampleXmlFiles; - exampleXmlFiles << "landlinedialerservice.xml" << "voipdialerservice.xml"; - foreach (const QString &fileName, exampleXmlFiles) { - QString path = QCoreApplication::applicationDirPath() + "/xmldata/" + fileName; - serviceManager->addService(path); - } - // ![0] -} - -void DialerServices::unregisterExampleServices() -{ - serviceManager->removeService("LandlineDialer"); - serviceManager->removeService("VoipDialer"); -} - diff --git a/examples/declarative-sfw-dialer/sfwexample/sfwexample.pro b/examples/declarative-sfw-dialer/sfwexample/sfwexample.pro deleted file mode 100644 index 1227925edc..0000000000 --- a/examples/declarative-sfw-dialer/sfwexample/sfwexample.pro +++ /dev/null @@ -1,22 +0,0 @@ -TEMPLATE = app -TARGET = declarative-sfw-dialer -INCLUDEPATH += ../../../src/serviceframework - -include(../../examples.pri) - -QT += gui declarative - -HEADERS += sfwexample.h \ - qdeclarativeservice.h -SOURCES += sfwexample.cpp \ - qdeclarativeservice.cpp \ - main.cpp - -CONFIG += mobility -MOBILITY = serviceframework - -RESOURCES += resource.qrc - -symbian { - TARGET.CAPABILITY = ALL -TCB -} diff --git a/examples/declarative-sfw-dialer/voipdialer/voipdialer.cpp b/examples/declarative-sfw-dialer/voipdialer/voipdialer.cpp index bf7c712c88..06d97a7f6f 100644 --- a/examples/declarative-sfw-dialer/voipdialer/voipdialer.cpp +++ b/examples/declarative-sfw-dialer/voipdialer/voipdialer.cpp @@ -1,39 +1,40 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 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:BSD$ -** You may use this file under the terms of the BSD license as follows: +** $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. +** +** +** +** +** +** ** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. ** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/examples/declarative-sfw-dialer/voipdialer/voipdialer.h b/examples/declarative-sfw-dialer/voipdialer/voipdialer.h index 1c0df7d650..d46f67b114 100644 --- a/examples/declarative-sfw-dialer/voipdialer/voipdialer.h +++ b/examples/declarative-sfw-dialer/voipdialer/voipdialer.h @@ -1,39 +1,40 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 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:BSD$ -** You may use this file under the terms of the BSD license as follows: +** $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. +** +** +** +** +** +** ** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. ** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/examples/declarative-sfw-dialer/voipdialer/voipdialer.pro b/examples/declarative-sfw-dialer/voipdialer/voipdialer.pro index 1866178555..d38353771a 100644 --- a/examples/declarative-sfw-dialer/voipdialer/voipdialer.pro +++ b/examples/declarative-sfw-dialer/voipdialer/voipdialer.pro @@ -1,6 +1,8 @@ TEMPLATE = lib CONFIG += plugin INCLUDEPATH += ../../../src/serviceframework +PLUGIN_TYPE = serviceframework + HEADERS += voipdialer.h \ voipdialerplugin.h SOURCES += voipdialer.cpp \ @@ -17,8 +19,6 @@ symbian { TARGET.CAPABILITY = ALL -TCB } -xml.path = $$DESTDIR/xmldata +xml.path = $$QT_MOBILITY_PREFIX/bin/xmldata xml.files = voipdialerservice.xml -xml.CONFIG = no_link no_dependencies explicit_dependencies no_build combine ignore_no_exist no_clean INSTALLS += xml -build_pass:ALL_DEPS+=install_xml diff --git a/examples/declarative-sfw-dialer/voipdialer/voipdialerplugin.cpp b/examples/declarative-sfw-dialer/voipdialer/voipdialerplugin.cpp index b19df3d0f2..d18a83f373 100644 --- a/examples/declarative-sfw-dialer/voipdialer/voipdialerplugin.cpp +++ b/examples/declarative-sfw-dialer/voipdialer/voipdialerplugin.cpp @@ -1,39 +1,40 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 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:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $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$ ** ****************************************************************************/ diff --git a/examples/declarative-sfw-dialer/voipdialer/voipdialerplugin.h b/examples/declarative-sfw-dialer/voipdialer/voipdialerplugin.h index 680ce196c3..311a2f34e5 100644 --- a/examples/declarative-sfw-dialer/voipdialer/voipdialerplugin.h +++ b/examples/declarative-sfw-dialer/voipdialer/voipdialerplugin.h @@ -1,39 +1,40 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 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:BSD$ -** You may use this file under the terms of the BSD license as follows: +** $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. +** +** +** +** +** +** ** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. ** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/examples/declarative-sfw-dialer/voipdialer/xmldata/voipdialerservice.xml b/examples/declarative-sfw-dialer/voipdialer/xmldata/voipdialerservice.xml new file mode 100644 index 0000000000..2645ace8e0 --- /dev/null +++ b/examples/declarative-sfw-dialer/voipdialer/xmldata/voipdialerservice.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8" ?> +<service> + <name>VoipDialer</name> + <filepath>serviceframework_voipdialerservice</filepath> + <description>Voip Dialer</description> + <interface> + <name>com.nokia.qt.examples.Dialer</name> + <version>1.0</version> + <description>VoIP based implementation Dialer</description> + </interface> +</service> diff --git a/examples/declarative-sfw-notes/README b/examples/declarative-sfw-notes/README new file mode 100644 index 0000000000..21c16840b0 --- /dev/null +++ b/examples/declarative-sfw-notes/README @@ -0,0 +1,8 @@ +This example requires the example Notes Manager service to be registered in order +for the application to obtain the default interface. This can be done by using the +service framework command line tool to add the corresponding service XML file: + +./servicefw add notesmanagerservice.xml + +The XML files for all example services can be found in the QtMobility build directory +under install/bin/xmldata diff --git a/examples/declarative-sfw-notes/declarative-sfw-notes.pro b/examples/declarative-sfw-notes/declarative-sfw-notes.pro deleted file mode 100644 index d2a4f10df5..0000000000 --- a/examples/declarative-sfw-notes/declarative-sfw-notes.pro +++ /dev/null @@ -1,20 +0,0 @@ -TEMPLATE = app -TARGET = declarative-sfw-notes -INCLUDEPATH += ../../src/serviceframework - -include(../examples.pri) - -QT += declarative - -HEADERS += sfwnotes.h \ - qdeclarativeservice.h -SOURCES += sfwnotes.cpp \ - qdeclarativeservice.cpp \ - main.cpp - -CONFIG += mobility -MOBILITY = serviceframework - -RESOURCES += sfwnotes.qrc - -OTHER_FILES = declarative-sfw-notes.qml diff --git a/examples/declarative-sfw-notes/declarative-sfw-notes.qml b/examples/declarative-sfw-notes/declarative-sfw-notes.qml index bc9db138f1..3877541579 100644 --- a/examples/declarative-sfw-notes/declarative-sfw-notes.qml +++ b/examples/declarative-sfw-notes/declarative-sfw-notes.qml @@ -11,7 +11,7 @@ Rectangle { property bool validService: false // ![1] - property var notesManager: notesService.serviceObject + property variant notesManager: notesService.serviceObject // ![1] id: mainWindow diff --git a/examples/declarative-sfw-notes/qdeclarativeservice.cpp b/examples/declarative-sfw-notes/qdeclarativeservice.cpp deleted file mode 100644 index 8d2e0481cc..0000000000 --- a/examples/declarative-sfw-notes/qdeclarativeservice.cpp +++ /dev/null @@ -1,165 +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:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "qdeclarativeservice.h" - -QServiceWrapper::QServiceWrapper() -: serviceInstance(0) -{ - serviceManager = new QServiceManager(); -} - -QServiceWrapper::~QServiceWrapper() -{ - delete serviceInstance; -} - -bool QServiceWrapper::isValid() const -{ - return m_descriptor.isValid(); -} - -void QServiceWrapper::setInterfaceDesc(const QServiceInterfaceDescriptor &desc) -{ - if (desc == m_descriptor) - return; - - m_descriptor = desc; - - if (serviceInstance) - delete serviceInstance; - - serviceInstance = 0; -} - -QServiceInterfaceDescriptor QServiceWrapper::interfaceDesc() const -{ - return m_descriptor; -} - -void QServiceWrapper::setInterfaceName(const QString &interface) -{ - m_descriptor = serviceManager->interfaceDefault(interface); - - if (!isValid()) - qWarning() << "WARNING: No default service found for interface name: " << interface; -} - -QString QServiceWrapper::interfaceName() const -{ - if (isValid()) - return m_descriptor.interfaceName(); - else - return "No Interface"; -} - -QString QServiceWrapper::serviceName() const -{ - if (isValid()) - return m_descriptor.serviceName(); - else - return "No Service"; -} - -QString QServiceWrapper::versionNumber() const -{ - if (isValid()) - return (QString::number(m_descriptor.majorVersion())+"."+QString::number(m_descriptor.minorVersion())); - else - return "0.0"; -} - -QObject* QServiceWrapper::serviceObject() -{ - if (serviceInstance) { - return serviceInstance; - } - - if (isValid()) { - QServiceManager manager; - serviceInstance = manager.loadInterface(m_descriptor); - return serviceInstance; - } else { - return 0; - } -} - -QServiceListWrapper::QServiceListWrapper() -{ - serviceManager = new QServiceManager(); -} - -QServiceListWrapper::~QServiceListWrapper() -{ -} - -void QServiceListWrapper::setInterfaceName(const QString &interface) -{ - m_interface = interface; - - QServiceWrapper *service; - QServiceFilter filter(m_interface, m_version); - QList<QServiceInterfaceDescriptor> list = serviceManager->findInterfaces(filter); - for (int i = 0; i < list.size(); i++) { - service = new QServiceWrapper(); - service->setInterfaceDesc(list.at(i)); - m_services.append(service); - } -} - -QString QServiceListWrapper::interfaceName() const -{ - return m_interface; -} - -void QServiceListWrapper::setMinVersion(const QString &version) -{ - m_version = version; -} - -QString QServiceListWrapper::minVersion() const -{ - return m_version; -} - -QDeclarativeListProperty<QServiceWrapper> QServiceListWrapper::services() -{ - return QDeclarativeListProperty<QServiceWrapper>(this, m_services); -} diff --git a/examples/declarative-sfw-notes/sfwnotes.cpp b/examples/declarative-sfw-notes/sfwnotes.cpp deleted file mode 100644 index 13cff510de..0000000000 --- a/examples/declarative-sfw-notes/sfwnotes.cpp +++ /dev/null @@ -1,69 +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:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "sfwnotes.h" - -ToDoTool::ToDoTool() -{ - serviceManager = new QServiceManager(); - - registerExampleServices(); -} - -ToDoTool::~ToDoTool() -{ - unregisterExampleServices(); -} - -void ToDoTool::registerExampleServices() -{ - QStringList exampleXmlFiles; - exampleXmlFiles << "notesmanagerservice.xml"; - foreach (const QString &fileName, exampleXmlFiles) { - QString path = QCoreApplication::applicationDirPath() + "/xmldata/" + fileName; - serviceManager->addService(path); - } -} - -void ToDoTool::unregisterExampleServices() -{ - serviceManager->removeService("NotesManagerService"); -} - diff --git a/examples/declarative-sfw-notes/sfwnotes.qrc b/examples/declarative-sfw-notes/sfwnotes.qrc deleted file mode 100644 index 2c8153ce52..0000000000 --- a/examples/declarative-sfw-notes/sfwnotes.qrc +++ /dev/null @@ -1,13 +0,0 @@ -<RCC> - <qresource prefix="/" > - <file>declarative-sfw-notes.qml</file> - <file>content/Button.qml</file> - <file>content/Dialog.qml</file> - <file>content/InputDialog.qml</file> - <file>content/icons/addIcon.png</file> - <file>content/icons/deleteIcon.png</file> - <file>content/icons/searchIcon.png</file> - <file>content/icons/nextIcon.png</file> - <file>content/icons/prevIcon.png</file> - </qresource> -</RCC> diff --git a/examples/examples.pri b/examples/examples.pri index 9b96aa0d8a..3402160e4f 100644 --- a/examples/examples.pri +++ b/examples/examples.pri @@ -20,7 +20,6 @@ CONFIG(debug, debug|release) { } OUTPUT_DIR = $$QT_MOBILITY_BUILD_TREE -DESTDIR = $$OUTPUT_DIR/bin/examples MOC_DIR = $$OUTPUT_DIR/build/$$SUBDIRPART/$$TARGET/moc RCC_DIR = $$OUTPUT_DIR/build/$$SUBDIRPART/$$TARGET/rcc UI_DIR = $$OUTPUT_DIR/build/$$SUBDIRPART/$$TARGET/ui @@ -30,6 +29,13 @@ LIBS+= -L$$OUTPUT_DIR/lib QMAKE_RPATHDIR+=$$OUTPUT_DIR/lib INCLUDEPATH+= $$QT_MOBILITY_SOURCE_TREE/src/global +!plugin { + target.path=$$QT_MOBILITY_PREFIX/bin +} else { + target.path = $${QT_MOBILITY_PLUGINS}/$${PLUGIN_TYPE} +} +INSTALLS += target + maemo6 { DEFINES+= Q_WS_MAEMO_6 DEFINES+= QTM_EXAMPLES_SMALL_SCREEN diff --git a/examples/examples.pro b/examples/examples.pro index fe859b3a56..27cfbff061 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -12,11 +12,16 @@ contains(mobility_modules,serviceframework) { !symbian:SUBDIRS+= sfw-notes contains(QT_CONFIG, declarative) { - SUBDIRS += declarative-sfw-notes \ - declarative-sfw-dialer + SUBDIRS += declarative-sfw-dialer + + sources.files += declarative-sfw-notes \ + declarative-sfw-dialer/declarative-sfw-dialer } } +sources.path = $$QT_MOBILITY_PREFIX/bin +INSTALLS += sources + #BearerManagement examples contains(mobility_modules,bearer) { SUBDIRS += bearermonitor bearercloud diff --git a/examples/fetchgooglemaps/fetchgooglemaps.pro b/examples/fetchgooglemaps/fetchgooglemaps.pro index bef7c6cab7..8537c7c7af 100644 --- a/examples/fetchgooglemaps/fetchgooglemaps.pro +++ b/examples/fetchgooglemaps/fetchgooglemaps.pro @@ -16,19 +16,22 @@ SOURCES = mapwindow.cpp \ include(../examples.pri) CONFIG += mobility -MOBILITY = location -!maemo5:MOBILITY += bearer +MOBILITY = location bearer -symbian: { - addFiles.sources = nmealog.txt - DEPLOYMENT += addFiles - - TARGET.CAPABILITY = Location NetworkServices +symbian|wince* { + symbian { + addFiles.sources = nmealog.txt + DEPLOYMENT += addFiles + TARGET.CAPABILITY += Location \ + NetworkServices + } + wince* { + addFiles.sources = ./nmealog.txt + addFiles.path = . + DEPLOYMENT += addFiles + } } else { - logfile.path = $$DESTDIR + logfile.path = $$QT_MOBILITY_PREFIX/bin 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/fetchgooglemaps/main.cpp b/examples/fetchgooglemaps/main.cpp index 0f2ed48aed..b225886bc7 100644 --- a/examples/fetchgooglemaps/main.cpp +++ b/examples/fetchgooglemaps/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/fetchgooglemaps/mapwindow.cpp b/examples/fetchgooglemaps/mapwindow.cpp index 24592373bc..fa4ed816a0 100644 --- a/examples/fetchgooglemaps/mapwindow.cpp +++ b/examples/fetchgooglemaps/mapwindow.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -44,10 +44,8 @@ #include <qgeopositioninfosource.h> #include <qnmeapositioninfosource.h> #include <qgeosatelliteinfosource.h> -#ifndef Q_WS_MAEMO_5 #include <qnetworksession.h> #include <qnetworkconfigmanager.h> -#endif #include "satellitedialog.h" @@ -136,9 +134,7 @@ MapWindow::MapWindow(QWidget *parent, Qt::WFlags flags) MapWindow::~MapWindow() { location->stopUpdates(); -#ifndef Q_WS_MAEMO_5 session->close(); -#endif } void MapWindow::delayedInit() @@ -151,7 +147,6 @@ void MapWindow::delayedInit() location->stopUpdates(); } -#ifndef Q_WS_MAEMO_5 // Set Internet Access Point QNetworkConfigurationManager manager; const bool canStartIAP = (manager.capabilities() @@ -167,7 +162,6 @@ void MapWindow::delayedInit() session = new QTM_PREPEND_NAMESPACE(QNetworkSession)(cfg, this); session->open(); session->waitForOpened(-1); -#endif connect(location, SIGNAL(updateTimeout()), this, SLOT(waitForFix())); location->startUpdates(); diff --git a/examples/fetchgooglemaps/mapwindow.h b/examples/fetchgooglemaps/mapwindow.h index 89cffd3ffd..3a4bb2ba74 100644 --- a/examples/fetchgooglemaps/mapwindow.h +++ b/examples/fetchgooglemaps/mapwindow.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -53,9 +53,7 @@ QT_END_NAMESPACE QTM_BEGIN_NAMESPACE class QGeoPositionInfo; class QGeoPositionInfoSource; -#ifndef Q_WS_MAEMO_5 class QNetworkSession; -#endif QTM_END_NAMESPACE QTM_USE_NAMESPACE @@ -81,9 +79,7 @@ private: QLabel *headingAndSpeedLabel; QLabel *dateTimeLabel; bool loading; -#ifndef Q_WS_MAEMO_5 QTM_PREPEND_NAMESPACE(QNetworkSession) *session; -#endif bool usingLogFile; QGeoPositionInfoSource *location; bool waitingForFix; diff --git a/examples/filemanagerplugin/filemanagerplugin.cpp b/examples/filemanagerplugin/filemanagerplugin.cpp index c3da8d1965..c57a390599 100644 --- a/examples/filemanagerplugin/filemanagerplugin.cpp +++ b/examples/filemanagerplugin/filemanagerplugin.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/filemanagerplugin/filemanagerplugin.h b/examples/filemanagerplugin/filemanagerplugin.h index 23ea022ded..4dc29db328 100644 --- a/examples/filemanagerplugin/filemanagerplugin.h +++ b/examples/filemanagerplugin/filemanagerplugin.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/filemanagerplugin/filemanagerplugin.pro b/examples/filemanagerplugin/filemanagerplugin.pro index ca7a66e16a..c3a6226183 100644 --- a/examples/filemanagerplugin/filemanagerplugin.pro +++ b/examples/filemanagerplugin/filemanagerplugin.pro @@ -1,5 +1,6 @@ TEMPLATE = lib CONFIG += plugin +PLUGIN_TYPE=serviceframework INCLUDEPATH += ../../src/serviceframework HEADERS += filemanagerplugin.h \ filemanagerstorage.h \ @@ -24,8 +25,6 @@ symbian { TARGET.CAPABILITY = LocalServices Location NetworkServices ReadUserData WriteUserData UserEnvironment } -xml.path = $$DESTDIR/xmldata +xml.path = $$QT_MOBILITY_PREFIX/bin/xmldata xml.files = filemanagerservice.xml -xml.CONFIG = no_link no_dependencies explicit_dependencies no_build combine ignore_no_exist no_clean INSTALLS += xml -build_pass:ALL_DEPS+=install_xml diff --git a/examples/filemanagerplugin/filemanagerstorage.cpp b/examples/filemanagerplugin/filemanagerstorage.cpp index 15d155df04..86e92ec78b 100644 --- a/examples/filemanagerplugin/filemanagerstorage.cpp +++ b/examples/filemanagerplugin/filemanagerstorage.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/filemanagerplugin/filemanagerstorage.h b/examples/filemanagerplugin/filemanagerstorage.h index 0e70d221f2..4701e0741f 100644 --- a/examples/filemanagerplugin/filemanagerstorage.h +++ b/examples/filemanagerplugin/filemanagerstorage.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/filemanagerplugin/filemanagertransfer.cpp b/examples/filemanagerplugin/filemanagertransfer.cpp index a4408f91e6..147a086737 100644 --- a/examples/filemanagerplugin/filemanagertransfer.cpp +++ b/examples/filemanagerplugin/filemanagertransfer.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/filemanagerplugin/filemanagertransfer.h b/examples/filemanagerplugin/filemanagertransfer.h index 05965a1bf6..19709f1bcc 100644 --- a/examples/filemanagerplugin/filemanagertransfer.h +++ b/examples/filemanagerplugin/filemanagertransfer.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/flickrdemo/connectivityhelper.cpp b/examples/flickrdemo/connectivityhelper.cpp index bd538911ee..49c0bb496d 100644 --- a/examples/flickrdemo/connectivityhelper.cpp +++ b/examples/flickrdemo/connectivityhelper.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/flickrdemo/connectivityhelper.h b/examples/flickrdemo/connectivityhelper.h index 3d66edb29f..b96004f4c5 100644 --- a/examples/flickrdemo/connectivityhelper.h +++ b/examples/flickrdemo/connectivityhelper.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/flickrdemo/flickrdemo.cpp b/examples/flickrdemo/flickrdemo.cpp index 0e9e2ca8d8..fb2c6aa29a 100644 --- a/examples/flickrdemo/flickrdemo.cpp +++ b/examples/flickrdemo/flickrdemo.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/flickrdemo/flickrdemo.h b/examples/flickrdemo/flickrdemo.h index 378400dbe1..7a06df7dd7 100644 --- a/examples/flickrdemo/flickrdemo.h +++ b/examples/flickrdemo/flickrdemo.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/flickrdemo/flickrdemo.pro b/examples/flickrdemo/flickrdemo.pro index eb7a2e8853..509f3626e4 100644 --- a/examples/flickrdemo/flickrdemo.pro +++ b/examples/flickrdemo/flickrdemo.pro @@ -24,19 +24,24 @@ MOBILITY = location bearer ICON = flickr_icon.svg -symbian:TARGET.CAPABILITY += Location \ - NetworkServices \ - ReadUserData -symbian: { - addFiles.sources = nmealog.txt - DEPLOYMENT += addFiles +symbian|wince* { + symbian { + addFiles.sources = nmealog.txt + DEPLOYMENT += addFiles + TARGET.CAPABILITY += Location \ + NetworkServices \ + ReadUserData + } + wince* { + addFiles.sources = ./nmealog.txt + addFiles.path = . + DEPLOYMENT += addFiles + } } else { - logfile.path = $$DESTDIR + logfile.path = $$QT_MOBILITY_PREFIX/bin 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 } wince*: { diff --git a/examples/flickrdemo/main.cpp b/examples/flickrdemo/main.cpp index 404f4d6bbb..9dc3621c02 100644 --- a/examples/flickrdemo/main.cpp +++ b/examples/flickrdemo/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/flickrdemo/xqlistwidget.cpp b/examples/flickrdemo/xqlistwidget.cpp index a7fc33e7d7..42c2bddc9b 100644 --- a/examples/flickrdemo/xqlistwidget.cpp +++ b/examples/flickrdemo/xqlistwidget.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/flickrdemo/xqlistwidget.h b/examples/flickrdemo/xqlistwidget.h index 22a356cdb9..247b8a31f3 100644 --- a/examples/flickrdemo/xqlistwidget.h +++ b/examples/flickrdemo/xqlistwidget.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/keepintouch/addressfinder.cpp b/examples/keepintouch/addressfinder.cpp index dfa4f55e17..f28aebbaef 100644 --- a/examples/keepintouch/addressfinder.cpp +++ b/examples/keepintouch/addressfinder.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/keepintouch/addressfinder.h b/examples/keepintouch/addressfinder.h index 047c63702a..6abe9b5d56 100644 --- a/examples/keepintouch/addressfinder.h +++ b/examples/keepintouch/addressfinder.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/keepintouch/main.cpp b/examples/keepintouch/main.cpp index f52ba54d63..c242d0f142 100644 --- a/examples/keepintouch/main.cpp +++ b/examples/keepintouch/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/lightmaps/lightmaps.cpp b/examples/lightmaps/lightmaps.cpp index 5f8984ab49..5887478392 100644 --- a/examples/lightmaps/lightmaps.cpp +++ b/examples/lightmaps/lightmaps.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/lightmaps/lightmaps.pro b/examples/lightmaps/lightmaps.pro index 88beab5dd8..40c46897ec 100644 --- a/examples/lightmaps/lightmaps.pro +++ b/examples/lightmaps/lightmaps.pro @@ -17,21 +17,23 @@ INCLUDEPATH += ../../src/global \ include(../examples.pri) -symbian { - TARGET.CAPABILITY = NetworkServices Location ReadUserData - TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 -} - CONFIG += mobility MOBILITY = location bearer -symbian: { - addFiles.sources = nmealog.txt - DEPLOYMENT += addFiles +symbian|wince* { + symbian { + addFiles.sources = nmealog.txt + DEPLOYMENT += addFiles + TARGET.CAPABILITY = NetworkServices Location ReadUserData + TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 + } + wince*: { + addFiles.sources = ./nmealog.txt + addFiles.path = . + DEPLOYMENT += addFiles + } } else { - logfile.path = $$DESTDIR + logfile.path = $$QT_MOBILITY_PREFIX/bin 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/logfilepositionsource/clientapplication.cpp b/examples/logfilepositionsource/clientapplication.cpp index 1070356347..59c7ef7a0a 100644 --- a/examples/logfilepositionsource/clientapplication.cpp +++ b/examples/logfilepositionsource/clientapplication.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/logfilepositionsource/clientapplication.h b/examples/logfilepositionsource/clientapplication.h index ee02224708..cf84af83f4 100644 --- a/examples/logfilepositionsource/clientapplication.h +++ b/examples/logfilepositionsource/clientapplication.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/logfilepositionsource/logfilepositionsource.cpp b/examples/logfilepositionsource/logfilepositionsource.cpp index 5c444d0dba..91a4625b43 100644 --- a/examples/logfilepositionsource/logfilepositionsource.cpp +++ b/examples/logfilepositionsource/logfilepositionsource.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/logfilepositionsource/logfilepositionsource.h b/examples/logfilepositionsource/logfilepositionsource.h index 28d2167079..dbdc634a6e 100644 --- a/examples/logfilepositionsource/logfilepositionsource.h +++ b/examples/logfilepositionsource/logfilepositionsource.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/logfilepositionsource/logfilepositionsource.pro b/examples/logfilepositionsource/logfilepositionsource.pro index 1a72fe8d36..74b8da5f49 100644 --- a/examples/logfilepositionsource/logfilepositionsource.pro +++ b/examples/logfilepositionsource/logfilepositionsource.pro @@ -14,23 +14,21 @@ include(../examples.pri) CONFIG += mobility MOBILITY = location -symbian|wince*: { - symbian: { +symbian|wince* { + symbian { addFiles.sources = simplelog.txt DEPLOYMENT += addFiles TARGET.CAPABILITY = Location } - wince*: { + wince* { addFiles.sources = ./simplelog.txt addFiles.path = . DEPLOYMENT += addFiles } } else { - logfileexample.path = $$DESTDIR + logfileexample.path = $$QT_MOBILITY_PREFIX/bin 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 54a47eefcf..77f3395b29 100644 --- a/examples/logfilepositionsource/main.cpp +++ b/examples/logfilepositionsource/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/notesmanagerplugin/note.h b/examples/notesmanagerplugin/note.h index 193e645038..7e2bf488f3 100644 --- a/examples/notesmanagerplugin/note.h +++ b/examples/notesmanagerplugin/note.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/notesmanagerplugin/notesmanager.cpp b/examples/notesmanagerplugin/notesmanager.cpp index 325740e243..ea99157915 100644 --- a/examples/notesmanagerplugin/notesmanager.cpp +++ b/examples/notesmanagerplugin/notesmanager.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/notesmanagerplugin/notesmanager.h b/examples/notesmanagerplugin/notesmanager.h index 231beee7e5..a23724a47c 100644 --- a/examples/notesmanagerplugin/notesmanager.h +++ b/examples/notesmanagerplugin/notesmanager.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/notesmanagerplugin/notesmanagerplugin.cpp b/examples/notesmanagerplugin/notesmanagerplugin.cpp index 91d0f229ea..54034d223e 100644 --- a/examples/notesmanagerplugin/notesmanagerplugin.cpp +++ b/examples/notesmanagerplugin/notesmanagerplugin.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/notesmanagerplugin/notesmanagerplugin.h b/examples/notesmanagerplugin/notesmanagerplugin.h index b12985f78c..2037d11cbc 100644 --- a/examples/notesmanagerplugin/notesmanagerplugin.h +++ b/examples/notesmanagerplugin/notesmanagerplugin.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/notesmanagerplugin/notesmanagerplugin.pro b/examples/notesmanagerplugin/notesmanagerplugin.pro index 7f0d462444..6b8f3c2346 100644 --- a/examples/notesmanagerplugin/notesmanagerplugin.pro +++ b/examples/notesmanagerplugin/notesmanagerplugin.pro @@ -1,6 +1,7 @@ TEMPLATE = lib CONFIG += plugin INCLUDEPATH += ../../src/serviceframework +PLUGIN_TYPE = serviceframework HEADERS += note.h \ notesmanagerplugin.h \ notesmanager.h @@ -8,7 +9,6 @@ SOURCES += notesmanagerplugin.cpp \ notesmanager.cpp QT += sql TARGET = serviceframework_notesmanagerplugin -DESTDIR = . contains(QT_CONFIG, declarative):DEFINES += DECLARATIVE @@ -26,8 +26,6 @@ symbian { TARGET.CAPABILITY = ALL -TCB } -xml.path = $$DESTDIR/xmldata +xml.path = $$QT_MOBILITY_PREFIX/bin/xmldata xml.files = notesmanagerservice.xml -xml.CONFIG = no_link no_dependencies explicit_dependencies no_build combine ignore_no_exist no_clean INSTALLS += xml -build_pass:ALL_DEPS+=install_xml diff --git a/examples/player/main.cpp b/examples/player/main.cpp index 391c23ba10..8d5abe9335 100644 --- a/examples/player/main.cpp +++ b/examples/player/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/player/mediakeysobserver.cpp b/examples/player/mediakeysobserver.cpp index cddd80a54c..398c438ae1 100644 --- a/examples/player/mediakeysobserver.cpp +++ b/examples/player/mediakeysobserver.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/player/mediakeysobserver.h b/examples/player/mediakeysobserver.h index 413eed0bdc..40451085f8 100644 --- a/examples/player/mediakeysobserver.h +++ b/examples/player/mediakeysobserver.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/player/player.cpp b/examples/player/player.cpp index 5f030de689..4043c5c230 100644 --- a/examples/player/player.cpp +++ b/examples/player/player.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/player/player.h b/examples/player/player.h index 15b28c6d1a..f32794f8a2 100644 --- a/examples/player/player.h +++ b/examples/player/player.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/player/playercontrols.cpp b/examples/player/playercontrols.cpp index aa427a9cca..58177e7bb6 100644 --- a/examples/player/playercontrols.cpp +++ b/examples/player/playercontrols.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/player/playercontrols.h b/examples/player/playercontrols.h index 8e16d83c7d..5d70147b68 100644 --- a/examples/player/playercontrols.h +++ b/examples/player/playercontrols.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/player/playlistmodel.cpp b/examples/player/playlistmodel.cpp index d1974b56a7..21bc4ccf45 100644 --- a/examples/player/playlistmodel.cpp +++ b/examples/player/playlistmodel.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/player/playlistmodel.h b/examples/player/playlistmodel.h index 4cf63e0f82..cf580d8f52 100644 --- a/examples/player/playlistmodel.h +++ b/examples/player/playlistmodel.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/player/videowidget.cpp b/examples/player/videowidget.cpp index 94a3f130b0..46f1b33ff9 100644 --- a/examples/player/videowidget.cpp +++ b/examples/player/videowidget.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/player/videowidget.h b/examples/player/videowidget.h index 6c0af6cb7f..5d382f9813 100644 --- a/examples/player/videowidget.h +++ b/examples/player/videowidget.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/publish-subscribe/main.cpp b/examples/publish-subscribe/main.cpp index cbac20d909..9e37b8b1d5 100644 --- a/examples/publish-subscribe/main.cpp +++ b/examples/publish-subscribe/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/publish-subscribe/publisherdialog.cpp b/examples/publish-subscribe/publisherdialog.cpp index 1bab51e168..1aaeddf0db 100644 --- a/examples/publish-subscribe/publisherdialog.cpp +++ b/examples/publish-subscribe/publisherdialog.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/publish-subscribe/publisherdialog.h b/examples/publish-subscribe/publisherdialog.h index 6919c0e5da..b6467fefad 100644 --- a/examples/publish-subscribe/publisherdialog.h +++ b/examples/publish-subscribe/publisherdialog.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/publish-subscribe/subscriberdialog.cpp b/examples/publish-subscribe/subscriberdialog.cpp index 7b2968262b..dab147420a 100644 --- a/examples/publish-subscribe/subscriberdialog.cpp +++ b/examples/publish-subscribe/subscriberdialog.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/publish-subscribe/subscriberdialog.h b/examples/publish-subscribe/subscriberdialog.h index 6684fcc81c..e3deb2c1e5 100644 --- a/examples/publish-subscribe/subscriberdialog.h +++ b/examples/publish-subscribe/subscriberdialog.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/qmlcontacts/main.cpp b/examples/qmlcontacts/main.cpp index ded7dd4475..1bb6bd5de0 100644 --- a/examples/qmlcontacts/main.cpp +++ b/examples/qmlcontacts/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/qmlcontacts/qmlcontact.cpp b/examples/qmlcontacts/qmlcontact.cpp index 765225f499..0b53485ae2 100644 --- a/examples/qmlcontacts/qmlcontact.cpp +++ b/examples/qmlcontacts/qmlcontact.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/qmlcontacts/qmlcontact.h b/examples/qmlcontacts/qmlcontact.h index 302480753b..a40b24bbcb 100644 --- a/examples/qmlcontacts/qmlcontact.h +++ b/examples/qmlcontacts/qmlcontact.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/qmlcontacts/qmlcontacts.cpp b/examples/qmlcontacts/qmlcontacts.cpp index 46d13f0681..2c02daeada 100644 --- a/examples/qmlcontacts/qmlcontacts.cpp +++ b/examples/qmlcontacts/qmlcontacts.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/qmlcontacts/qmlcontactsa.h b/examples/qmlcontacts/qmlcontactsa.h index 6b9cd0ac91..4c4ac7c6a8 100644 --- a/examples/qmlcontacts/qmlcontactsa.h +++ b/examples/qmlcontacts/qmlcontactsa.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/querymessages/main.cpp b/examples/querymessages/main.cpp index 5c8e64a0a3..f65b2b239d 100644 --- a/examples/querymessages/main.cpp +++ b/examples/querymessages/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/quickstart/main.cpp b/examples/quickstart/main.cpp index 47d3e0b720..b31eaf6157 100644 --- a/examples/quickstart/main.cpp +++ b/examples/quickstart/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -42,11 +42,7 @@ #include <QApplication> #include <QLabel> -#ifdef Q_OS_SYMBIAN -#include <qsysteminfo.h> -#else #include <QSystemInfo> //(1) -#endif QTM_USE_NAMESPACE //(2) diff --git a/examples/radio/main.cpp b/examples/radio/main.cpp index 0dff845753..f0571fcb0a 100644 --- a/examples/radio/main.cpp +++ b/examples/radio/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/radio/radio.cpp b/examples/radio/radio.cpp index 7f1bda3f61..4bb954d81c 100644 --- a/examples/radio/radio.cpp +++ b/examples/radio/radio.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/radio/radio.h b/examples/radio/radio.h index f5da595454..4f22b93b85 100644 --- a/examples/radio/radio.h +++ b/examples/radio/radio.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/samplephonebook/contacteditor.cpp b/examples/samplephonebook/contacteditor.cpp index 39d3d267d8..fb220b08c2 100644 --- a/examples/samplephonebook/contacteditor.cpp +++ b/examples/samplephonebook/contacteditor.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/samplephonebook/contacteditor.h b/examples/samplephonebook/contacteditor.h index 7aea16d347..8b99098672 100644 --- a/examples/samplephonebook/contacteditor.h +++ b/examples/samplephonebook/contacteditor.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/samplephonebook/contactlistpage.cpp b/examples/samplephonebook/contactlistpage.cpp index ca327ce438..8ea3ac2564 100644 --- a/examples/samplephonebook/contactlistpage.cpp +++ b/examples/samplephonebook/contactlistpage.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/samplephonebook/contactlistpage.h b/examples/samplephonebook/contactlistpage.h index 93bfcb2a5f..b381489d6b 100644 --- a/examples/samplephonebook/contactlistpage.h +++ b/examples/samplephonebook/contactlistpage.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/samplephonebook/filterpage.cpp b/examples/samplephonebook/filterpage.cpp index b14a80be5a..8a4ab8fa2f 100644 --- a/examples/samplephonebook/filterpage.cpp +++ b/examples/samplephonebook/filterpage.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/samplephonebook/filterpage.h b/examples/samplephonebook/filterpage.h index 4a567a1259..083b8ec8f3 100644 --- a/examples/samplephonebook/filterpage.h +++ b/examples/samplephonebook/filterpage.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/samplephonebook/main.cpp b/examples/samplephonebook/main.cpp index a3c06c6ff6..c0a009012a 100644 --- a/examples/samplephonebook/main.cpp +++ b/examples/samplephonebook/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/samplephonebook/phonebook.cpp b/examples/samplephonebook/phonebook.cpp index 91675fd1d0..219ce2a1bd 100644 --- a/examples/samplephonebook/phonebook.cpp +++ b/examples/samplephonebook/phonebook.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/samplephonebook/phonebook.h b/examples/samplephonebook/phonebook.h index d3deaa2fa8..0e4ed10ace 100644 --- a/examples/samplephonebook/phonebook.h +++ b/examples/samplephonebook/phonebook.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/satellitedialog/main.cpp b/examples/satellitedialog/main.cpp index 7c7151906b..ab517da72b 100644 --- a/examples/satellitedialog/main.cpp +++ b/examples/satellitedialog/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/satellitedialog/satellitedialog.cpp b/examples/satellitedialog/satellitedialog.cpp index d1d6ccb9af..8cd0e30d72 100644 --- a/examples/satellitedialog/satellitedialog.cpp +++ b/examples/satellitedialog/satellitedialog.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/satellitedialog/satellitedialog.h b/examples/satellitedialog/satellitedialog.h index b8c428496c..86840b1805 100644 --- a/examples/satellitedialog/satellitedialog.h +++ b/examples/satellitedialog/satellitedialog.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/sensors/accel/main.cpp b/examples/sensors/accel/main.cpp index 60751286ff..38a52be4e8 100644 --- a/examples/sensors/accel/main.cpp +++ b/examples/sensors/accel/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/sensors/arrowkeys/arrowkeys.pro b/examples/sensors/arrowkeys/arrowkeys.pro new file mode 100644 index 0000000000..6ffd444aa6 --- /dev/null +++ b/examples/sensors/arrowkeys/arrowkeys.pro @@ -0,0 +1,3 @@ +include(../sensors.pri) +SOURCES=main.cpp +TARGET=arrowkeys diff --git a/examples/declarative-sfw-dialer/sfwexample/main.cpp b/examples/sensors/arrowkeys/main.cpp index 31a8444a3c..537406f8c4 100644 --- a/examples/declarative-sfw-dialer/sfwexample/main.cpp +++ b/examples/sensors/arrowkeys/main.cpp @@ -1,6 +1,6 @@ -/*************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -38,36 +38,61 @@ ** ****************************************************************************/ -#include <QApplication> -#include <QUrl> #include <QtCore> +#include <qaccelerometer.h> -//! [0] -//Includes for using the declarative viewer -#include <QDeclarativeView> +QTM_USE_NAMESPACE -//Includes for using the service framework wrapper -#include "qdeclarativeservice.h" -//! [0] - -#include "sfwexample.h" +namespace arrows{ + static const QString ARROW_UP="^", ARROW_DOWN="v", ARROW_LEFT="<",ARROW_RIGHT=">", ARROW_TO=".", ARROW_FROM="x"; +} -int main(int argc, char* argv[]) +class AccelerometerFilter : public QAccelerometerFilter { - //! [1] - qmlRegisterType<QServiceWrapper>("QtMobility.serviceframework", 1, 0, "Service"); - qmlRegisterType<QServiceListWrapper>("QtMobility.serviceframework", 1, 0, "ServiceList"); - //! [1] +public: + + bool filter(QAccelerometerReading *reading) + { + QString arrow = getArrowKey(reading->x(), reading->y(), reading->z()); + if (arrow!=exArrow){ + qDebug() << "direction:" << arrow; + exArrow = arrow; + } + return false; // don't store the reading in the sensor + } + +private: + QString exArrow; + static const qreal THRESHOLD; + + QString getArrowKey(qreal x, qreal y, qreal z){ - QApplication app(argc, argv); + // axis_z: TO or FROM + if (abs(y)<THRESHOLD && abs(x)<THRESHOLD) return z>0?(arrows::ARROW_FROM):(arrows::ARROW_TO); - DialerServices *ds = new DialerServices(); + // axis_x: LEFT or RIGHT + if (abs(x)>abs(y)) return x>0?(arrows::ARROW_LEFT):(arrows::ARROW_RIGHT); - //! [2] - QDeclarativeView canvas; - canvas.setSource(QUrl("qrc:/sfwexample.qml")); - canvas.show(); - //! [2] + // axis_y: UP or DOWN + return y>0?(arrows::ARROW_DOWN):(arrows::ARROW_UP); + } + + static qreal abs(qreal value) {return value<0?-value:value;} +}; + +const qreal AccelerometerFilter::THRESHOLD = 0.3; + +int main(int argc, char **argv) +{ + QCoreApplication app(argc, argv); + QAccelerometer sensor; + if (!sensor.connectToBackend()) { + qWarning("No Accelerometer available!"); + return 1; + } + AccelerometerFilter filter; + sensor.addFilter(&filter); + sensor.start(); return app.exec(); } diff --git a/examples/sensors/grueapp/main.cpp b/examples/sensors/grueapp/main.cpp index f20b361b5f..f2e139239e 100644 --- a/examples/sensors/grueapp/main.cpp +++ b/examples/sensors/grueapp/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/sensors/grueplugin/grueplugin.pro b/examples/sensors/grueplugin/grueplugin.pro index f284153bbb..18192ddd38 100644 --- a/examples/sensors/grueplugin/grueplugin.pro +++ b/examples/sensors/grueplugin/grueplugin.pro @@ -1,14 +1,15 @@ +TEMPLATE = lib +CONFIG += plugin +TARGET = $$qtLibraryTarget(qtsensors_grueplugin) +PLUGIN_TYPE = sensors + INCLUDEPATH+=../../../src/sensors include(version.pri) include(grueplugin.pri) -include(../../../common.pri) +include(../../examples.pri) -PLUGIN_TYPE = sensors -TEMPLATE = lib -CONFIG += plugin -TARGET = $$qtLibraryTarget(sensors_grueplugin) symbian:TARGET.EPOCALLOWDLLDATA = 1 QT=core @@ -16,7 +17,3 @@ CONFIG+=mobility MOBILITY+=sensors CONFIG+=strict_flags - -target.path = $${QT_MOBILITY_PREFIX}/plugins/$${PLUGIN_TYPE} -maemo6:target.path=$$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE} -INSTALLS += target diff --git a/examples/sensors/grueplugin/gruesensor.cpp b/examples/sensors/grueplugin/gruesensor.cpp index fa9c0945f4..d740d88481 100644 --- a/examples/sensors/grueplugin/gruesensor.cpp +++ b/examples/sensors/grueplugin/gruesensor.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/sensors/grueplugin/gruesensor.h b/examples/sensors/grueplugin/gruesensor.h index bd4cc83bf4..8a1a88eaf3 100644 --- a/examples/sensors/grueplugin/gruesensor.h +++ b/examples/sensors/grueplugin/gruesensor.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/sensors/grueplugin/gruesensor_p.h b/examples/sensors/grueplugin/gruesensor_p.h index a5d612b7e4..cccb5c4121 100644 --- a/examples/sensors/grueplugin/gruesensor_p.h +++ b/examples/sensors/grueplugin/gruesensor_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/sensors/grueplugin/gruesensorimpl.cpp b/examples/sensors/grueplugin/gruesensorimpl.cpp index 1d7ef359c9..f70894c3fa 100644 --- a/examples/sensors/grueplugin/gruesensorimpl.cpp +++ b/examples/sensors/grueplugin/gruesensorimpl.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/sensors/grueplugin/gruesensorimpl.h b/examples/sensors/grueplugin/gruesensorimpl.h index be727a7b3a..96bf77dbbb 100644 --- a/examples/sensors/grueplugin/gruesensorimpl.h +++ b/examples/sensors/grueplugin/gruesensorimpl.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/sensors/grueplugin/main.cpp b/examples/sensors/grueplugin/main.cpp index e1b74219c2..b5939286f1 100644 --- a/examples/sensors/grueplugin/main.cpp +++ b/examples/sensors/grueplugin/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/sensors/metadata/main.cpp b/examples/sensors/metadata/main.cpp new file mode 100644 index 0000000000..c81669c694 --- /dev/null +++ b/examples/sensors/metadata/main.cpp @@ -0,0 +1,145 @@ +/**************************************************************************** +** +** Copyright (C) 2010 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:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include <QtCore> +#include <qaccelerometer.h> +#include <qambientlightsensor.h> +#include <qcompass.h> +#include <qmagnetometer.h> +#include <qorientationsensor.h> +#include <qproximitysensor.h> +#include <qrotationsensor.h> +#include <qtapsensor.h> + +QTM_USE_NAMESPACE + +bool checkSensor( QSensor *sensor ) +{ + QTextStream out(stdout); + bool conclusion = true; + out << endl << "--- Metadata ---" << endl; + + // Get readings from functions + + // void addFilter ( QSensorFilter * filter ) + qrangelist sen_datarates = sensor->availableDataRates(); + // bool connectToBackend () + int sen_datarate = sensor->dataRate(); + QString sen_desc = sensor->description(); + int sen_error = sensor->error(); + QByteArray sen_ident = sensor->identifier(); + bool sen_active = sensor->isActive(); + bool sen_busy = sensor->isBusy(); + bool sen_isConn = sensor->isConnectedToBackend(); + int sen_outRange = sensor->outputRange(); + qoutputrangelist sen_outRList = sensor->outputRanges(); + QSensorReading *sen_reading = sensor->reading(); + // void removeFilter ( QSensorFilter * filter ) + // void setDataRate ( int rate ) + // void setIdentifier ( const QByteArray & identifier ) + // void setOutputRange ( int index ) + QByteArray sen_type = sensor->type(); + + // Print findings + + out << "Identifier: " << sen_ident + << " Type: " << sen_type << endl; + out << "Description: " << sen_desc << endl; + out << "Active: " << sen_active + << " Busy: " << sen_busy + << " Connected: " << sen_isConn + << " Last error: " << sen_error << endl; + + out << "Using datarate: " << sen_datarate + << " Out of:"; + for( int i = 0; i < sen_datarates.size(); ++i ) + { + out << " [" << sen_datarates[i].first << "," << sen_datarates[i].second << "]"; + } + out << endl; + + out << "Using output range: " << sen_outRange + << " Out of (min,max,accuracy):"; + for( int i = 0; i < sen_outRList.size(); ++i ) + { + out << " (" << sen_outRList[i].minimum << "," << sen_outRList[i].maximum << "," << sen_outRList[i].accuracy << ")"; + } + out << endl; + + //out << sen_reading << endl; //QSensorReading * + + return conclusion; +} + +int main( int argc, char **argv ) +{ + QCoreApplication app(argc, argv); + QTextStream out(stdout); + bool result = true; + + QSensor *sensors[8]; + sensors[0] = new QAccelerometer; + sensors[1] = new QAmbientLightSensor; + sensors[2] = new QCompass; + sensors[3] = new QMagnetometer; + sensors[4] = new QOrientationSensor; + sensors[5] = new QProximitySensor; + sensors[6] = new QRotationSensor; + sensors[7] = new QTapSensor; + + for( int i = 0; i < 8; ++i ) + { + if( ! sensors[i] ) + { + out << "sensor number " << i << " unavailable" << endl; + continue; + } + if( ! sensors[i]->connectToBackend() ) + { + out << "connectToBackend failed" << endl; + result = false; + } else { + if( ! checkSensor( sensors[i] ) ) + result = false; + } + } + + return result; +} diff --git a/examples/sensors/metadata/metadata.pro b/examples/sensors/metadata/metadata.pro new file mode 100644 index 0000000000..49ff88d4fd --- /dev/null +++ b/examples/sensors/metadata/metadata.pro @@ -0,0 +1,3 @@ +include(../sensors.pri) +SOURCES=main.cpp +TARGET=metadata diff --git a/examples/sensors/orientation/main.cpp b/examples/sensors/orientation/main.cpp index fff2c74114..2c5bd6537a 100644 --- a/examples/sensors/orientation/main.cpp +++ b/examples/sensors/orientation/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/sensors/orientation/orientation.qml b/examples/sensors/orientation/orientation.qml index 2ea07d04c1..54faca3765 100644 --- a/examples/sensors/orientation/orientation.qml +++ b/examples/sensors/orientation/orientation.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/sensors/panorama/accelerometercontroller.cpp b/examples/sensors/panorama/accelerometercontroller.cpp new file mode 100644 index 0000000000..09386e7762 --- /dev/null +++ b/examples/sensors/panorama/accelerometercontroller.cpp @@ -0,0 +1,34 @@ + + +#include "inputcontroller.h" +#include "accelerometercontroller.h" + +AccelerometerController::AccelerometerController(): InputController(){ + m_accelerometer.connectToBackend(); + m_accelerometer.start(); + connect(&m_accelerometer, SIGNAL(readingChanged()), this, SLOT(update())); +} + +AccelerometerController::~AccelerometerController(){ + m_accelerometer.stop(); + disconnect(&m_accelerometer); +} + + +void AccelerometerController::update() +{ + qreal accX = m_accelerometer.reading()->x(); + qreal accY= m_accelerometer.reading()->y(); + m_dx = accX*3; + m_dy= -accY*3; + updateCoordinates(); + +} + + +void AccelerometerController::updateCoordinates(){ + m_x +=m_dx; + m_y +=m_dy; + +} + diff --git a/examples/sensors/panorama/accelerometercontroller.h b/examples/sensors/panorama/accelerometercontroller.h new file mode 100644 index 0000000000..ad6bc2f0e5 --- /dev/null +++ b/examples/sensors/panorama/accelerometercontroller.h @@ -0,0 +1,32 @@ +#ifndef ACCELEROMETERCONTROLLER_H +#define ACCELEROMETERCONTROLLER_H + +#include "timedcontroller.h" +#include <qaccelerometer.h> +#include <QTimer> +#include <QTime> +#include <QDebug> + + + +QTM_USE_NAMESPACE + +class AccelerometerController : public InputController +{ + Q_OBJECT + +public: + AccelerometerController(); + virtual ~AccelerometerController(); + virtual void updateCoordinates(); + +public slots: + void update(); + +private: + QAccelerometer m_accelerometer; + int m_dx, m_dy; + +}; + +#endif // ACCELEROMETERCONTROLLER_H diff --git a/examples/sensors/panorama/compasscontroller.cpp b/examples/sensors/panorama/compasscontroller.cpp new file mode 100644 index 0000000000..8f142c90df --- /dev/null +++ b/examples/sensors/panorama/compasscontroller.cpp @@ -0,0 +1,27 @@ + + +#include "inputcontroller.h" +#include "compasscontroller.h" +#include "view.h" + +CompassController::CompassController(): m_width(View::m_imageWidth){ + m_compass.connectToBackend(); + m_compass.start(); + connect(&m_compass, SIGNAL(readingChanged()), this, SLOT(update())); +} + +CompassController::~CompassController(){ + m_compass.stop(); + disconnect(&m_compass); +} + + + +void CompassController::update() +{ + qreal azimuth = m_compass.reading()->azimuth(); + m_x = (int)(azimuth * m_width/360); +} + + + diff --git a/examples/sensors/panorama/compasscontroller.h b/examples/sensors/panorama/compasscontroller.h new file mode 100644 index 0000000000..d172284c6c --- /dev/null +++ b/examples/sensors/panorama/compasscontroller.h @@ -0,0 +1,28 @@ +#ifndef COMPASSCONTROLLER_H +#define COMPASSCONTROLLER_H + +#include "inputcontroller.h" +#include <qcompass.h> + +QTM_USE_NAMESPACE + +class CompassController : public InputController +{ + Q_OBJECT + +public: + CompassController(); + virtual ~CompassController(); + +private slots: + void update(); + +private: + QCompass m_compass; + int m_width; + +}; + + + +#endif // COMPASSCONTROLLER_H diff --git a/examples/sensors/panorama/images/foreshore_final.jpg b/examples/sensors/panorama/images/foreshore_final.jpg Binary files differnew file mode 100644 index 0000000000..4d95b048dd --- /dev/null +++ b/examples/sensors/panorama/images/foreshore_final.jpg diff --git a/examples/sensors/panorama/images/koskipuisto_pieni.jpg b/examples/sensors/panorama/images/koskipuisto_pieni.jpg Binary files differnew file mode 100644 index 0000000000..0489b88ee3 --- /dev/null +++ b/examples/sensors/panorama/images/koskipuisto_pieni.jpg diff --git a/examples/sensors/panorama/inputcontroller.cpp b/examples/sensors/panorama/inputcontroller.cpp new file mode 100644 index 0000000000..d22b008b30 --- /dev/null +++ b/examples/sensors/panorama/inputcontroller.cpp @@ -0,0 +1,28 @@ +
+#include "inputcontroller.h"
+#include "view.h"
+
+const QString InputController::QACCELEROMETER="QAccelerometer";
+const QString InputController::QORIENTATIONSENSOR = "QOrientationSensor";
+const QString InputController::QMAGNETOMETER = "QMagnetometer";
+const QString InputController::QROTATIONSENSOR = "QRotationSensor";
+const QString InputController::QTAPSENSOR = "QTapSensor";
+const QString InputController::QCOMPASS = "QCompass";
+const QString InputController::QKEYS = "Keys";
+
+int InputController::m_x =0;
+int InputController::m_y =0;
+
+InputController::InputController() {}
+
+void InputController::keyPressEvent(QKeyEvent*){}
+
+int InputController::getX(){return m_x;}
+
+int InputController::getY() {return m_y;}
+
+void InputController::setX(int x){m_x = x;}
+
+void InputController::setY(int y){m_y = y;}
+
+void InputController::updateCoordinates(){}
diff --git a/examples/sensors/panorama/inputcontroller.h b/examples/sensors/panorama/inputcontroller.h new file mode 100644 index 0000000000..e6fac6cd4c --- /dev/null +++ b/examples/sensors/panorama/inputcontroller.h @@ -0,0 +1,37 @@ +#ifndef INPUTCONTROLLER_H
+#define INPUTCONTROLLER_H
+
+#include <QString>
+#include <QWidget>
+
+
+class InputController : public QObject
+{
+// Q_OBJECT
+public:
+
+ InputController();
+ virtual ~InputController(){};
+ virtual void updateCoordinates();
+
+ static int getX(), getY();
+ static void setX(int x), setY(int y);
+
+ virtual void keyPressEvent(QKeyEvent *e);
+
+ static const QString QACCELEROMETER,
+ QORIENTATIONSENSOR, QROTATIONSENSOR,
+ QMAGNETOMETER, QTAPSENSOR, QCOMPASS, QKEYS;
+
+
+protected:
+ //current coordinates
+ static int m_x,m_y;
+
+
+
+
+};
+
+
+#endif // INPUTCONTROLLER_H
diff --git a/examples/sensors/panorama/keycontroller.cpp b/examples/sensors/panorama/keycontroller.cpp new file mode 100644 index 0000000000..86824ca55e --- /dev/null +++ b/examples/sensors/panorama/keycontroller.cpp @@ -0,0 +1,42 @@ +
+#include "keycontroller.h"
+#include "view.h"
+
+KeyController::KeyController(): TimedController(), m_step(5){}
+
+KeyController::~KeyController(){}
+
+
+void KeyController::keyPressEvent(QKeyEvent *e)
+{
+ int code = e->key();
+ handleKeyPress(code);
+ m_step = m_exCode==code && m_exCode > 0? m_step+2 : 5;
+}
+
+
+void KeyController::updateCoordinates() { handleKeyPress(m_exCode);}
+
+
+void KeyController::handleKeyPress(int code){
+ switch (code){
+ case Qt::Key_Right:
+ m_x+=m_step;
+ break;
+ case Qt::Key_Left:
+ m_x-=m_step;
+ break;
+ case Qt::Key_Up:
+ m_y-=m_step;
+ break;
+ case Qt::Key_Down:
+ m_y+=m_step;
+ break;
+ default:
+ m_exCode = 0;
+ return;
+ }
+ m_exCode = code;
+}
+
+
diff --git a/examples/sensors/panorama/keycontroller.h b/examples/sensors/panorama/keycontroller.h new file mode 100644 index 0000000000..b8e1c3898d --- /dev/null +++ b/examples/sensors/panorama/keycontroller.h @@ -0,0 +1,27 @@ +#ifndef KEYCONTROLLER_H
+#define KEYCONTROLLER_H
+
+#include "timedcontroller.h"
+#include <QKeyEvent>
+#include <QDebug>
+#include <QTimer>
+
+class KeyController : public TimedController
+{
+ Q_OBJECT
+
+public:
+ KeyController();
+ virtual ~KeyController();
+ void handleKeyPress(int code);
+ virtual void updateCoordinates();
+
+protected:
+ virtual void keyPressEvent(QKeyEvent *e);
+ int m_exCode;
+ int m_step;
+
+};
+
+
+#endif // KEYCONTROLLER_H
diff --git a/examples/sensors/panorama/magnetometercontroller.cpp b/examples/sensors/panorama/magnetometercontroller.cpp new file mode 100644 index 0000000000..a5eee6c7d4 --- /dev/null +++ b/examples/sensors/panorama/magnetometercontroller.cpp @@ -0,0 +1,34 @@ + + +#include "inputcontroller.h" +#include "magnetometercontroller.h" +#include "view.h" +#include <qmagnetometer.h> + +MagnetometerController::MagnetometerController(): m_width(View::m_imageWidth){ + m_magnetometer.setProperty("returnGeoValues", true); + m_magnetometer.connectToBackend(); + m_magnetometer.start(); + connect(&m_magnetometer, SIGNAL(readingChanged()), this, SLOT(update())); +} + + +MagnetometerController::~MagnetometerController(){ + m_magnetometer.stop(); + disconnect(&m_magnetometer); +} + + +void MagnetometerController::update() +{ + qreal azimuth = -m_magnetometer.reading()->z(); + azimuth = azimuth<0?360+azimuth:azimuth; + m_x = (int)(-azimuth * m_width/360); + + + //TODO: consider provide y values based on x and y +} + + + + diff --git a/examples/sensors/panorama/magnetometercontroller.h b/examples/sensors/panorama/magnetometercontroller.h new file mode 100644 index 0000000000..87655d452f --- /dev/null +++ b/examples/sensors/panorama/magnetometercontroller.h @@ -0,0 +1,29 @@ +#ifndef MAGNETOMETERCONTROLLER_H +#define MAGNETOMETERCONTROLLER_H + +#include "inputcontroller.h" +#include <qmagnetometer.h> + + + +class MagnetometerController : public InputController +{ + Q_OBJECT + +public: + MagnetometerController(); + virtual ~MagnetometerController(); + +private slots: + void update(); + +private: + QTM_NAMESPACE::QMagnetometer m_magnetometer; + int m_width; + int m_height; + +}; + + + +#endif // MAGNETOMETERCONTROLLER_H diff --git a/examples/sensors/panorama/main.cpp b/examples/sensors/panorama/main.cpp new file mode 100644 index 0000000000..6cc42c496f --- /dev/null +++ b/examples/sensors/panorama/main.cpp @@ -0,0 +1,79 @@ +/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtCore module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** 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.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "view.h"
+#include <QtGui>
+#include <QtCore/qstate.h>
+
+class Pixmap : public QObject, public QGraphicsPixmapItem
+{
+ Q_OBJECT
+ Q_PROPERTY(QPointF pos READ pos WRITE setPos)
+public:
+ Pixmap(const QPixmap &pix)
+ : QObject(), QGraphicsPixmapItem(pix)
+ {
+ setCacheMode(DeviceCoordinateCache);
+ }
+};
+
+
+int main(int argc, char **argv)
+{
+
+ QApplication app(argc, argv);
+ Q_INIT_RESOURCE(panorama);
+ QGraphicsScene scene(0, 0, 700, 700);
+ View *view = new View(&scene);
+ view->show();
+
+
+#ifdef QT_KEYPAD_NAVIGATION
+ QApplication::setNavigationMode(Qt::NavigationModeCursorAuto);
+#endif
+
+ return app.exec();
+}
+
+
+
+
+#include "main.moc"
diff --git a/examples/sensors/panorama/orientationcontroller.cpp b/examples/sensors/panorama/orientationcontroller.cpp new file mode 100644 index 0000000000..f9ffe8b778 --- /dev/null +++ b/examples/sensors/panorama/orientationcontroller.cpp @@ -0,0 +1,52 @@ + + +#include "keycontroller.h" +#include "orientationcontroller.h" +#include "view.h" + + +OrientationController::OrientationController(): KeyController(){ + m_delay=10; + m_step=10; + m_orientationSensor.connectToBackend(); + m_orientationSensor.start(); + connect(&m_orientationSensor, SIGNAL(readingChanged()), this, SLOT(update())); + +} + +OrientationController::~OrientationController(){ + m_orientationSensor.stop(); + disconnect(&m_orientationSensor); +} + +void OrientationController::updateCoordinates(){ + handleKeyPress(m_exCode); + m_step = m_exCode!=0 ? m_step+5 : 10; +} + + +void OrientationController::update() +{ + switch (m_orientationSensor.reading()->orientation()){ + case QTM_NAMESPACE::QOrientationReading::TopUp: + m_exCode = Qt::Key_Up; + break; + case QTM_NAMESPACE::QOrientationReading::TopDown: + m_exCode = Qt::Key_Down; + break; + case QTM_NAMESPACE::QOrientationReading::LeftUp: + m_exCode = Qt::Key_Left; + break; + case QTM_NAMESPACE::QOrientationReading::RightUp: + m_exCode = Qt::Key_Right; + break; + default: + m_exCode = 0; + return; + } + handleKeyPress(m_exCode); +} + + + + diff --git a/examples/sensors/panorama/orientationcontroller.h b/examples/sensors/panorama/orientationcontroller.h new file mode 100644 index 0000000000..f15315500b --- /dev/null +++ b/examples/sensors/panorama/orientationcontroller.h @@ -0,0 +1,32 @@ +#ifndef ORIENTATIONCONTROLLER_H +#define ORIENTATIONCONTROLLER_H + + +#include "keycontroller.h" +#include <qorientationsensor.h> +#include <QTime> +#include <QTimer> + + +//QTM_USE_NAMESPACE + +class OrientationController : public KeyController +{ + Q_OBJECT + +public: + OrientationController(); + virtual ~OrientationController(); + virtual void updateCoordinates(); + +private slots: + void update(); + +private: + QTM_NAMESPACE::QOrientationSensor m_orientationSensor; + +}; + + + +#endif // ORIENTATIONCONTROLLER_H diff --git a/examples/sensors/panorama/panorama.pro b/examples/sensors/panorama/panorama.pro new file mode 100644 index 0000000000..6e9317c113 --- /dev/null +++ b/examples/sensors/panorama/panorama.pro @@ -0,0 +1,29 @@ +include(../sensors.pri) +QT += gui \ + core +CONFIG += mobility +CONFIG += debug +MOBILITY += sensors +HEADERS += inputcontroller.h \ + keycontroller.h \ + timedcontroller.h \ + view.h \ + accelerometercontroller.h \ + compasscontroller.h \ + magnetometercontroller.h \ + orientationcontroller.h \ + rotationcontroller.h \ + tapcontroller.h +SOURCES += main.cpp \ + inputcontroller.cpp \ + keycontroller.cpp \ + timedcontroller.cpp \ + view.cpp \ + accelerometercontroller.cpp \ + compasscontroller.cpp \ + magnetometercontroller.cpp \ + orientationcontroller.cpp \ + rotationcontroller.cpp \ + tapcontroller.cpp +RESOURCES += panorama.qrc +TARGET = panorama diff --git a/examples/sensors/panorama/panorama.qrc b/examples/sensors/panorama/panorama.qrc new file mode 100644 index 0000000000..8a90c7733d --- /dev/null +++ b/examples/sensors/panorama/panorama.qrc @@ -0,0 +1,6 @@ +<RCC> + <qresource prefix="/"> + <file>images/foreshore_final.jpg</file> + <file>images/koskipuisto_pieni.jpg</file> + </qresource> +</RCC> diff --git a/examples/sensors/panorama/rotationcontroller.cpp b/examples/sensors/panorama/rotationcontroller.cpp new file mode 100644 index 0000000000..dcb1458b70 --- /dev/null +++ b/examples/sensors/panorama/rotationcontroller.cpp @@ -0,0 +1,38 @@ +#include "inputcontroller.h" +#include "rotationcontroller.h" +#include <QTime> +#include <QDebug> +#include <math.h> + + +RotationController::RotationController(): InputController(), m_factor(0.5){ + m_rotationSensor.connectToBackend(); + m_rotationSensor.start(); + connect(&m_rotationSensor, SIGNAL(readingChanged()), this, SLOT(update())); +} + +RotationController::~RotationController(){ + m_rotationSensor.stop(); + disconnect(&m_rotationSensor); +} + + + +void RotationController::update() +{ + qreal pitch = m_rotationSensor.reading()->x(); + qreal roll= m_rotationSensor.reading()->y(); + + m_dx = - m_factor* roll; + m_dy = - m_factor * pitch; + + updateCoordinates(); +} + + +void RotationController::updateCoordinates(){ + m_x +=m_dx; + m_y +=m_dy; +} + + diff --git a/examples/sensors/panorama/rotationcontroller.h b/examples/sensors/panorama/rotationcontroller.h new file mode 100644 index 0000000000..bfe5a6bff2 --- /dev/null +++ b/examples/sensors/panorama/rotationcontroller.h @@ -0,0 +1,34 @@ +#ifndef ROTATIONCONTROLLER_H +#define ROTATIONCONTROLLER_H + + +#include "timedcontroller.h" +#include <qrotationsensor.h> +#include <QTimer> +#include <QTime> + +QTM_USE_NAMESPACE + +class RotationController : public InputController +{ + Q_OBJECT + +public: + RotationController(); + virtual ~RotationController(); + virtual void updateCoordinates(); + + +public slots: + void update(); + +private: + QTM_NAMESPACE::QRotationSensor m_rotationSensor; + int m_dx, m_dy; + qtimestamp m_exTimestamp; + qreal m_factor; + +}; + + +#endif // ROTATIONCONTROLLER_H diff --git a/examples/sensors/panorama/rotationsensorcontroller.h b/examples/sensors/panorama/rotationsensorcontroller.h new file mode 100644 index 0000000000..c9e197e6e4 --- /dev/null +++ b/examples/sensors/panorama/rotationsensorcontroller.h @@ -0,0 +1,4 @@ +#ifndef ROTATIONSENSORCONTROLLER_H +#define ROTATIONSENSORCONTROLLER_H + +#endif // ROTATIONSENSORCONTROLLER_H diff --git a/examples/sensors/panorama/tapcontroller.cpp b/examples/sensors/panorama/tapcontroller.cpp new file mode 100644 index 0000000000..b8f66746c4 --- /dev/null +++ b/examples/sensors/panorama/tapcontroller.cpp @@ -0,0 +1,132 @@ + + +#include "tapcontroller.h" +#include <QDebug> + + +const qreal TapController::m_timewindow=1000; + + +TapController::TapController(): TimedController(), m_step(20){ + m_accelerometer.connectToBackend(); + m_accelerometer.start(); + connect(&m_accelerometer, SIGNAL(readingChanged()), this, SLOT(updateAcce())); + + m_tap.connectToBackend(); + m_tap.start(); + connect(&m_tap, SIGNAL(readingChanged()), this, SLOT(update())); + +} + +TapController::~TapController(){ + m_tap.stop(); + disconnect(&m_tap); + m_accelerometer.stop(); + disconnect(&m_accelerometer); +} + + + +void TapController::update() +{ + int direction = m_tap.reading()->tapDirection(); + switch(direction){ + case QTapReading::X: + case QTapReading::X_Pos: + case QTapReading::X_Neg: + m_dy=0; + setDx(direction); + break; + case QTapReading::Y: + case QTapReading::Y_Pos: + case QTapReading::Y_Neg: + m_dx = 0; + setDy(direction); + break; + case QTapReading::Undefined: + case QTapReading::Z: + case QTapReading::Z_Pos: + case QTapReading::Z_Neg: + default: + m_dx = 0; m_dy = 0; + return; + } + +} + + +void TapController::updateAcce() +{ + qreal accX = m_accelerometer.reading()->x(); + qreal accY= m_accelerometer.reading()->y(); + m_now = m_accelerometer.reading()->timestamp(); + + checkX(accX); + checkY(accY); +} + + +void TapController::updateCoordinates(){ + + if (m_now - m_timestampX > m_timewindow){ + m_absMaxX = 0; + m_timestampX = m_now; + } + + if (m_now - m_timestampY > m_timewindow){ + m_absMaxY = 0; + m_timestampY = m_now; + } + + if (m_dx!=0) m_dx = m_dx>0? m_dx-1: m_dx+1; + if (m_dy!=0) m_dy = m_dy>0? m_dy-1: m_dy+1; + + m_x +=m_dx; + m_y +=m_dy; +} + + +void TapController::checkX(qreal accX){ + if (qAbs(accX)>qAbs(m_absMaxX)){ + m_absMaxX = accX; + m_timestampX = m_now; + } +} + + +void TapController::checkY(qreal accY){ + if (qAbs(accY)>qAbs(m_absMaxY)){ + m_absMaxY = accY; + m_timestampY = m_now; + } +} + + +void TapController::setDx(int direction){ + switch(direction){ + case QTapReading::X: + m_dx = m_absMaxX>0?m_step : -m_step; + break; + case QTapReading::X_Pos: + m_dx = m_step; + break; + case QTapReading::X_Neg: + m_dx = -m_step; + break; + } +} + +void TapController::setDy(int direction){ + switch(direction){ + case QTapReading::Y: + m_dy = m_absMaxY>0?m_step : - m_step; + break; + case QTapReading::Y_Pos: + m_dy = m_step; + break; + case QTapReading::Y_Neg: + m_dy = -m_step; + break; + } +} + diff --git a/examples/sensors/panorama/tapcontroller.h b/examples/sensors/panorama/tapcontroller.h new file mode 100644 index 0000000000..c59dad8399 --- /dev/null +++ b/examples/sensors/panorama/tapcontroller.h @@ -0,0 +1,37 @@ +#ifndef TAPCONTROLLER_H +#define TAPCONTROLLER_H +#include "timedcontroller.h" +#include <qtapsensor.h> +#include <qaccelerometer.h> + +QTM_USE_NAMESPACE + +class TapController : public TimedController +{ + Q_OBJECT + +public: + TapController(); + virtual ~TapController(); + virtual void updateCoordinates(); + +private slots: + void update(); + void updateAcce(); + +private: + void checkX(qreal); + void checkY(qreal); + void setDx(int); + void setDy(int); + QTapSensor m_tap; + QAccelerometer m_accelerometer; + qreal m_absMaxX, m_absMaxY; + qtimestamp m_timestampX, m_timestampY, m_now; + static const qreal m_timewindow; + int m_dx,m_dy; + int m_step; + +}; + +#endif // TAPCONTROLLER_H diff --git a/examples/sensors/panorama/timedcontroller.cpp b/examples/sensors/panorama/timedcontroller.cpp new file mode 100644 index 0000000000..0198e9f6f4 --- /dev/null +++ b/examples/sensors/panorama/timedcontroller.cpp @@ -0,0 +1,31 @@ + + +#include "inputcontroller.h" +#include "timedcontroller.h" +#include <QTime> +#include <QDebug> + +TimedController::TimedController(): m_delay(10), m_interval(0){ + m_exTime = QTime::currentTime(); + m_exTimestamp =QTime::currentTime(); + m_timer.setSingleShot(false); + m_timer.start(m_delay); + connect(&m_timer, SIGNAL(timeout()), this, SLOT(handleTimedUpdate())); + +} + +TimedController::~TimedController(){ + m_timer.stop(); + disconnect(&m_timer); +} + + +void TimedController::handleTimedUpdate() +{ + int timeDiff = m_exTime.msecsTo(QTime::currentTime()); + if (timeDiff< m_delay) return; + updateCoordinates(); + m_exTime = QTime::currentTime(); +} + + diff --git a/examples/sensors/panorama/timedcontroller.h b/examples/sensors/panorama/timedcontroller.h new file mode 100644 index 0000000000..4061822651 --- /dev/null +++ b/examples/sensors/panorama/timedcontroller.h @@ -0,0 +1,30 @@ +#ifndef TIMEDCONTROLLER_H +#define TIMEDCONTROLLER_H + + +#include <QTime> +#include <QTimer> +#include "inputcontroller.h" + +class TimedController : public InputController +{ + Q_OBJECT + +public: + TimedController(); + virtual ~TimedController(); + +private slots: + void handleTimedUpdate(); + +protected: + QTimer m_timer; + QTime m_exTime; + QTime m_exTimestamp; + int m_delay; + int m_interval; + +}; + + +#endif // TIMEDCONTROLLER_H diff --git a/examples/sensors/panorama/view.cpp b/examples/sensors/panorama/view.cpp new file mode 100644 index 0000000000..170e1112cb --- /dev/null +++ b/examples/sensors/panorama/view.cpp @@ -0,0 +1,402 @@ +#include "view.h"
+#include "inputcontroller.h"
+#include "keycontroller.h"
+#include "accelerometercontroller.h"
+#include "magnetometercontroller.h"
+#include "rotationcontroller.h"
+#include "orientationcontroller.h"
+#include "compasscontroller.h"
+#include "tapcontroller.h"
+
+int View::m_imageWidth;
+int View::m_imageHeight;
+QString View::m_currentSensor;
+bool View::m_isToBeZoomed;
+int View::m_lightLevel = -1;
+int View::m_scaledHeight[4];
+int View::m_index = 3;
+
+View::View(QGraphicsScene *scene) :
+ QGraphicsView(scene), m_timer(this) ,m_delay(30){
+
+ QPixmap bgPix(":/images/koskipuisto_pieni.jpg");
+ m_pix = bgPix;
+ setupWindow();
+ m_scaledHeight[0] = m_imageHeight*1.5;
+ m_scaledHeight[1] = m_imageHeight*2;
+ m_scaledHeight[2] = (int)(m_imageHeight*0.5);
+ m_scaledHeight[3] = m_imageHeight;
+
+ int h = height();
+ int y = qAbs(m_imageHeight-h)/2;
+ setSceneRect(0, y, width(), h);
+
+
+ m_sensors.append(InputController::QACCELEROMETER);
+ m_sensors.append(InputController::QORIENTATIONSENSOR);
+ m_sensors.append(InputController::QMAGNETOMETER);
+ m_sensors.append(InputController::QROTATIONSENSOR);
+ m_sensors.append(InputController::QTAPSENSOR);
+ m_sensors.append(InputController::QCOMPASS);
+ m_sensors.append(InputController::QKEYS);
+
+
+ m_menu = new QMenu(this);
+ createActions();
+ handleAction(NULL,InputController::QACCELEROMETER);
+
+ m_timer.setSingleShot(false);
+ m_timer.start(m_delay);
+ connect(&m_timer, SIGNAL(timeout()), this, SLOT(update()));
+
+
+ m_proximitySensor.connectToBackend();
+ m_proximitySensor.start();
+ connect(&m_proximitySensor, SIGNAL(readingChanged()), this, SLOT(handleProximity()));
+
+ m_ambientLightSensor.connectToBackend();
+ m_ambientLightSensor.start();
+ connect(&m_ambientLightSensor, SIGNAL(readingChanged()), this, SLOT(handleALS()));
+
+}
+
+
+View::~View(){
+ m_timer.stop();
+ if (m_controller) delete m_controller;
+ if (m_exController) delete m_exController;
+}
+
+
+void View::resizeEvent(QResizeEvent *event)
+{
+ QGraphicsView::resizeEvent(event);
+ fitInView(sceneRect(), Qt::KeepAspectRatio);
+}
+
+
+
+void View::handleAction(QString oldSensor, QString newSensor){
+
+ m_menu->setVisible(false);
+
+ if (oldSensor==newSensor) return;
+
+
+ QList<QAction*> tmpActions = m_menu->actions();
+ for (int i=0; i<tmpActions.length(); i++){
+ if (tmpActions.at(i)->text() == oldSensor){
+ tmpActions.at(i)->setEnabled(true);
+ continue;
+ }
+ if (tmpActions.at(i)->text() == newSensor){
+ tmpActions.at(i)->setEnabled(false);
+ }
+ }
+ m_currentSensor = newSensor;
+ switchController(m_currentSensor);
+
+}
+
+
+
+void View::createActions()
+{
+
+ for (int i=0; i<m_sensors.length();i++){
+ QAction* tmp = new QAction(m_sensors.at(i), this);
+
+ const QString sensor = m_sensors.at(i);
+ do{
+ if (sensor==InputController::QACCELEROMETER){
+ connect(tmp, SIGNAL(triggered()), this, SLOT(startAccelerometer()));
+ break;
+ }
+ if (sensor==InputController::QORIENTATIONSENSOR){
+ connect(tmp, SIGNAL(triggered()), this, SLOT(startOrientationSensor()));
+ break;
+ }
+ if (sensor==InputController::QROTATIONSENSOR){
+ connect(tmp, SIGNAL(triggered()), this, SLOT(startRotationSensor()));
+ break;
+ }
+ if (sensor==InputController::QMAGNETOMETER){
+ connect(tmp, SIGNAL(triggered()), this, SLOT(startMagnetometer()));
+ break;
+ }
+ if (sensor==InputController::QTAPSENSOR){
+ connect(tmp, SIGNAL(triggered()), this, SLOT(startTapSensor()));
+ break;
+ }
+ if (sensor==InputController::QCOMPASS){
+ connect(tmp, SIGNAL(triggered()), this, SLOT(startCompass()));
+ break;
+ }
+ if (sensor==InputController::QKEYS){
+ connect(tmp, SIGNAL(triggered()), this, SLOT(startKeys()));
+ break;
+ }
+ }while (true);
+ m_menu->addAction(tmp);
+ }
+
+}
+
+void View::startAccelerometer(){
+ handleAction(m_currentSensor, InputController::QACCELEROMETER);
+}
+
+void View::startOrientationSensor(){
+ handleAction(m_currentSensor, InputController::QORIENTATIONSENSOR);
+}
+
+void View::startTapSensor(){
+ handleAction(m_currentSensor, InputController::QTAPSENSOR);
+}
+
+void View::startMagnetometer(){
+ handleAction(m_currentSensor, InputController::QMAGNETOMETER);
+}
+
+void View::startRotationSensor(){
+ handleAction(m_currentSensor, InputController::QROTATIONSENSOR);
+}
+
+void View::startKeys(){
+ handleAction(m_currentSensor, InputController::QKEYS);
+}
+
+void View::startCompass(){
+ handleAction(m_currentSensor, InputController::QCOMPASS);
+}
+
+
+
+
+void View::keyPressEvent(QKeyEvent *e)
+{
+ if (m_currentSensor!=InputController::QKEYS) return;
+
+ if (m_controller) m_controller->keyPressEvent(e);
+}
+
+
+void View::switchController(QString sensor){
+
+ if (m_controller){
+ delete m_controller;
+ m_controller =0;
+ }
+
+ if (sensor==InputController::QACCELEROMETER){
+ m_controller = new AccelerometerController();
+ return;
+ }
+ if (sensor==InputController::QROTATIONSENSOR){
+ m_controller = new RotationController();
+ return;
+ }
+ if (sensor==InputController::QMAGNETOMETER){
+ m_controller = new MagnetometerController();
+ return;
+ }
+ if (sensor==InputController::QORIENTATIONSENSOR){
+ m_controller = new OrientationController();
+ return;
+ }
+ if (sensor==InputController::QTAPSENSOR){
+ m_controller = new TapController();
+ return;
+ }
+ if (sensor==InputController::QCOMPASS){
+ m_controller = new CompassController();
+ return;
+ }
+ if (sensor==InputController::QKEYS){
+ m_controller = new KeyController();
+ return;
+ }
+
+
+
+}
+
+
+int View::checkX(int x){
+ int tmpX = qAbs(x) < m_imageWidth ? x : x % m_imageWidth;
+ m_mouseMode?m_exController->setX(tmpX):m_controller->setX(tmpX);
+ return tmpX;
+
+}
+
+int View::checkY(int y){
+ int limit = m_imageHeight-height();
+ if (y<0){
+ y = limit<0?-limit/2:0;
+ }
+ else if (limit<0){
+ y=-limit/2;
+ }
+ else if (y > limit){y=limit;}
+
+ m_mouseMode?m_exController->setY(y):m_controller->setY(y);
+ return y;
+}
+
+
+
+void View::mousePressEvent ( QMouseEvent* ){
+ m_mousePressTime = QTime::currentTime();
+ m_exController = m_controller;
+ m_mouseMode = false;
+}
+
+
+void View::mouseMoveEvent(QMouseEvent* event){
+
+ // first time
+ if (!m_mouseMode){
+ m_mouseMode = true;
+ m_eventX = event->x();
+ m_eventY = event->y();
+ return;
+ }
+
+ if (m_menu->isVisible()){
+ if (m_mousePressTime.msecsTo(QTime::currentTime())>300)
+ m_menu->setVisible(false);
+ }
+
+ int cur_x = event->x();
+ int cur_y = event->y();
+
+ m_dx = m_eventX - cur_x;
+ m_dy = m_eventY - cur_y;
+
+ m_eventX = cur_x;
+ m_eventY = cur_y;
+
+ update();
+
+}
+
+
+
+void View::mouseReleaseEvent(QMouseEvent* event){
+ m_controller = m_exController;
+ m_exController = 0;
+ m_mouseMode = false;
+
+
+ if (m_menu->isVisible()){
+ m_menu->setVisible(false);
+ return;
+ }
+
+ // slow press -> move
+ if (m_mousePressTime.msecsTo(QTime::currentTime())>300) return;
+
+ // quick press -> show menu
+ int x = event->x();
+ int y = event->y();
+ m_menu->move(x, y);
+ m_menu->setVisible(true);
+
+}
+
+
+void View::update(){
+ if (!m_mouseMode)
+ m_controller->updateCoordinates();
+
+ if (m_menu->isVisible()){
+ if (m_mousePressTime.msecsTo(QTime::currentTime())>5000)
+ m_menu->setVisible(false);
+ }
+
+
+ int x = m_mouseMode?m_exController->getX():m_controller->getX();
+ int y = m_mouseMode?m_exController->getY():m_controller->getY();
+
+ x = checkX(m_mouseMode?x+m_dx:x);
+ y = checkY(m_mouseMode?y+m_dy:y);
+
+ setSceneRect(x, y, width(), height());
+}
+
+
+
+
+void View::handleProximity(){
+
+ // close - not close - close, quite fast sequence required for zoom
+ // zoom factors 0.5, 1, 2, 3 - cyclic iterations
+
+ bool isClose = m_proximitySensor.reading()->close();
+
+
+ // zoom-in, once?
+ if (isClose){
+ if (!m_isToBeZoomed){
+ m_zoomTime = QTime::currentTime();
+ m_isToBeZoomed = true;
+ }
+ else{
+ m_isToBeZoomed = false; // ready to start again
+
+ if (m_zoomTime.msecsTo(QTime::currentTime())>1000) return;
+ m_index = m_index==3?0:m_index+1;
+ qDebug()<< " m_index="<<m_index;
+ m_pix = m_pix.scaledToHeight(m_scaledHeight[m_index]);
+ }
+ }
+
+ setupWindow();
+ update();
+
+}
+
+
+void View::handleALS(){
+
+ int lightLevel = m_ambientLightSensor.reading()->lightLevel();
+ qDebug()<<"lightLevel="<<lightLevel;
+
+ switch (lightLevel){
+ case 0:
+ case 1:{
+ // if dark, make image "brighter"
+ QPainter painter;
+ painter.begin(&m_pix);
+ painter.setPen(Qt::NoPen);
+ QColor slightlyOpaqueWhite(255, 255, 255, 63);
+ painter.fillRect(m_pix.rect(), slightlyOpaqueWhite);
+ painter.end();
+ break;
+ }
+ default:{
+ if (m_lightLevel>1) break;
+ QPixmap bgPix(":/images/koskipuisto_pieni.jpg");
+ m_pix = bgPix.scaledToHeight(m_scaledHeight[m_index]);
+ break;
+ }
+ }
+ m_lightLevel = lightLevel;
+
+}
+
+
+void View::setupWindow(){
+ m_imageWidth = m_pix.width();
+ m_imageHeight = m_pix.height();
+
+ setViewportUpdateMode(QGraphicsView::BoundingRectViewportUpdate);
+ setBackgroundBrush(m_pix);
+ setCacheMode(QGraphicsView::CacheBackground);
+ setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform);
+ setWindowTitle("Panorama");
+
+}
+
+
+
diff --git a/examples/sensors/panorama/view.h b/examples/sensors/panorama/view.h new file mode 100644 index 0000000000..60c3504c6d --- /dev/null +++ b/examples/sensors/panorama/view.h @@ -0,0 +1,86 @@ +#ifndef VIEW_H
+#define VIEW_H
+
+#include <QPixmap>
+#include <QGraphicsScene>
+#include <QGraphicsView>
+#include <QResizeEvent>
+#include <QDebug>
+#include <QMenu>
+#include <QMessageBox>
+#include <QTimer>
+#include <QTime>
+#include <qproximitysensor.h>
+#include <qambientlightsensor.h>
+#include "inputcontroller.h"
+
+
+class View : public QGraphicsView
+{
+ Q_OBJECT
+
+public:
+ View(QGraphicsScene *scene);
+ virtual ~View();
+ static int m_imageWidth;
+
+
+public slots:
+ void update();
+
+
+protected:
+
+ virtual void resizeEvent(QResizeEvent *event);
+ virtual void keyPressEvent(QKeyEvent *e);
+ virtual void mousePressEvent ( QMouseEvent * event );
+ virtual void mouseMoveEvent(QMouseEvent* event);
+ virtual void mouseReleaseEvent(QMouseEvent* event);
+
+
+private slots:
+ void startAccelerometer();
+ void startTapSensor();
+ void startMagnetometer();
+ void startRotationSensor();
+ void startOrientationSensor();
+ void startCompass();
+ void startKeys();
+ void handleProximity();
+ void handleALS();
+
+private:
+ int checkX(int x);
+ int checkY(int y);
+ void switchController(QString sensor);
+ void createActions();
+ void handleAction(QString oldSensor, QString newSensor);
+ void setupWindow();
+
+ static int m_imageHeight;
+ static int m_scaledHeight[];
+ static bool m_isToBeZoomed;
+ static int m_lightLevel;
+ static int m_index;
+
+ static QString m_currentSensor;
+ QList<QString> m_sensors;
+ QTimer m_timer;
+ InputController *m_controller;
+ InputController *m_exController;
+ int m_delay;
+ QTime m_mousePressTime;
+ QMenu* m_menu;
+ bool m_mouseMode;
+ int m_eventX, m_eventY;
+ int m_dx, m_dy;
+ QTime m_zoomTime;
+ QTM_NAMESPACE::QAmbientLightSensor m_ambientLightSensor;
+ QTM_NAMESPACE::QProximitySensor m_proximitySensor;
+ QPixmap m_pix;
+
+
+};
+
+
+#endif // VIEW_H
diff --git a/examples/sensors/reading_perf/main.cpp b/examples/sensors/reading_perf/main.cpp index c0368ddc07..52fb79e293 100644 --- a/examples/sensors/reading_perf/main.cpp +++ b/examples/sensors/reading_perf/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/sensors/sensor_explorer/explorer.cpp b/examples/sensors/sensor_explorer/explorer.cpp index 8955ec4755..611978911a 100644 --- a/examples/sensors/sensor_explorer/explorer.cpp +++ b/examples/sensors/sensor_explorer/explorer.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/sensors/sensor_explorer/explorer.h b/examples/sensors/sensor_explorer/explorer.h index 2a33002c6a..ce44703ef1 100644 --- a/examples/sensors/sensor_explorer/explorer.h +++ b/examples/sensors/sensor_explorer/explorer.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/sensors/sensor_explorer/main.cpp b/examples/sensors/sensor_explorer/main.cpp index 2da6932ddb..a5502a764f 100644 --- a/examples/sensors/sensor_explorer/main.cpp +++ b/examples/sensors/sensor_explorer/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/sensors/sensors.pri b/examples/sensors/sensors.pri new file mode 100644 index 0000000000..3ac9ea2212 --- /dev/null +++ b/examples/sensors/sensors.pri @@ -0,0 +1,6 @@ +include($$PWD/../examples.pri) +CONFIG+=mobility +INCLUDEPATH += $$PWD/../../src/sensors +MOBILITY+=sensors +QT=core +TEMPLATE=app diff --git a/examples/sensors/sensors.pro b/examples/sensors/sensors.pro index 98924e6fbf..2e94f33f68 100644 --- a/examples/sensors/sensors.pro +++ b/examples/sensors/sensors.pro @@ -1,8 +1,6 @@ TEMPLATE = subdirs -include(../../common.pri) - -SUBDIRS += accel +SUBDIRS += accel arrowkeys metadata contains(QT_CONFIG, declarative) { SUBDIRS += orientation @@ -18,3 +16,4 @@ SUBDIRS += small_screen_sensors contains(QT_CONFIG,opengl):SUBDIRS += cubehouse +SUBDIRS += show_acceleration show_als show_compass show_magneticflux show_orientation show_proximity show_rotation show_tap diff --git a/examples/declarative-sfw-notes/sfwnotes.h b/examples/sensors/show_acceleration/main.cpp index 47afc70dea..ea40ac5b6c 100644 --- a/examples/declarative-sfw-notes/sfwnotes.h +++ b/examples/sensors/show_acceleration/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -36,29 +36,49 @@ ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." ** $QT_END_LICENSE$ ** -***************************************************************************/ - -#ifndef SFWNOTES_H -#define SFWNOTES_H +****************************************************************************/ #include <QtCore> -#include <qserviceinterfacedescriptor.h> -#include <qservicemanager.h> +#include <qaccelerometer.h> QTM_USE_NAMESPACE -class ToDoTool : public QObject { - Q_OBJECT - +class AccelerometerFilter : public QAccelerometerFilter +{ public: - ToDoTool(); - ~ToDoTool(); - -private: - void registerExampleServices(); - void unregisterExampleServices(); - - QServiceManager* serviceManager; + qtimestamp stamp; + bool filter(QAccelerometerReading *reading) + { + int diff = ( reading->timestamp() - stamp ); + stamp = reading->timestamp(); + QTextStream out(stdout); + out << QString("Acceleration: %1 x").arg(reading->x(), 5, 'f', 1) + << QString(" %1 y").arg(reading->y(), 5, 'f', 1) + << QString(" %1 z m/s^2").arg(reading->z(), 5, 'f', 1) + << QString(" (%1 ms since last, %2 Hz)").arg(diff / 1000, 4).arg( 1000000.0 / diff, 5, 'f', 1) << endl; + return false; // don't store the reading in the sensor + } }; -#endif +int main(int argc, char **argv) +{ + QCoreApplication app(argc, argv); + QStringList args = app.arguments(); + int rate_place = args.indexOf("-r"); + int rate_val = 0; + if (rate_place != -1) + rate_val = args.at(rate_place + 1).toInt(); + QAccelerometer sensor; + if (rate_val > 0) { + sensor.setDataRate(rate_val); + } + AccelerometerFilter filter; + sensor.addFilter(&filter); + sensor.start(); + if (!sensor.isActive()) { + qWarning("Accelerometersensor didn't start!"); + return 1; + } + + return app.exec(); +} diff --git a/examples/sensors/show_acceleration/show_acceleration.pro b/examples/sensors/show_acceleration/show_acceleration.pro new file mode 100644 index 0000000000..4075130155 --- /dev/null +++ b/examples/sensors/show_acceleration/show_acceleration.pro @@ -0,0 +1,3 @@ +include(../sensors.pri) +SOURCES = main.cpp +TARGET = show_acceleration diff --git a/examples/sensors/show_als/main.cpp b/examples/sensors/show_als/main.cpp new file mode 100644 index 0000000000..dfa16456b2 --- /dev/null +++ b/examples/sensors/show_als/main.cpp @@ -0,0 +1,92 @@ +/**************************************************************************** +** +** Copyright (C) 2010 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:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include <QtCore> +#include <qambientlightsensor.h> + +QTM_USE_NAMESPACE + +class AmbientLightFilter : public QAmbientLightFilter +{ +public: + qtimestamp stamp; + bool filter(QAmbientLightReading *reading) + { + int diff = ( reading->timestamp() - stamp ); + stamp = reading->timestamp(); + QString output; + switch (reading->lightLevel()) { + case QAmbientLightReading::Dark: output = "Dark "; break; + case QAmbientLightReading::Twilight: output = "Twilight"; break; + case QAmbientLightReading::Light: output = "Light "; break; + case QAmbientLightReading::Bright: output = "Bright "; break; + case QAmbientLightReading::Sunny: output = "Sunny "; break; + case QAmbientLightReading::Undefined: output = "Undefined"; break; + default: output = "Invalid enum value"; + } + QTextStream out(stdout); + out << "Ambient light level: " << output + << QString(" (%1 ms since last, %2 Hz)").arg(diff / 1000, 5).arg( 1000000.0 / diff, 3, 'f', 1) << endl; + return false; // don't store the reading in the sensor + } +}; + +int main(int argc, char **argv) +{ + QCoreApplication app(argc, argv); + QStringList args = app.arguments(); + int rate_place = args.indexOf("-r"); + int rate_val = 0; + if (rate_place != -1) + rate_val = args.at(rate_place + 1).toInt(); + QAmbientLightSensor sensor; + if (rate_val > 0) { + sensor.setDataRate(rate_val); + } + AmbientLightFilter filter; + sensor.addFilter(&filter); + sensor.start(); + if (!sensor.isActive()) { + qWarning("Ambientlightsensor didn't start!"); + return 1; + } + + return app.exec(); +} diff --git a/examples/sensors/show_als/show_als.pro b/examples/sensors/show_als/show_als.pro new file mode 100644 index 0000000000..8a3152fe01 --- /dev/null +++ b/examples/sensors/show_als/show_als.pro @@ -0,0 +1,3 @@ +include(../sensors.pri) +SOURCES = main.cpp +TARGET = show_als diff --git a/examples/declarative-sfw-notes/main.cpp b/examples/sensors/show_compass/main.cpp index 0911ee5d13..01aef9310b 100644 --- a/examples/declarative-sfw-notes/main.cpp +++ b/examples/sensors/show_compass/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -38,27 +38,46 @@ ** ****************************************************************************/ -#include <QApplication> -#include <QUrl> #include <QtCore> +#include <qcompass.h> -#include <QDeclarativeView> -#include <qdeclarative.h> +QTM_USE_NAMESPACE -#include "sfwnotes.h" -#include "qdeclarativeservice.h" - -int main(int argc, char* argv[]) +class CompassFilter : public QCompassFilter { - qmlRegisterType<QServiceWrapper>("QtMobility.serviceframework", 1, 0, "Service"); - - QApplication app(argc, argv); - - ToDoTool *td = new ToDoTool(); - - QDeclarativeView canvas; - canvas.setSource(QUrl("qrc:/declarative-sfw-notes.qml")); - canvas.show(); +public: + bool filter(QCompassReading *reading) + { + int diff = ( reading->timestamp() - stamp ); + stamp = reading->timestamp(); + QTextStream out(stdout); + out << QString("Compass heading: %1").arg(reading->azimuth(), 3, 'f', 0) + << QString(" calibration: %1").arg(reading->calibrationLevel(), 3, 'f', 1) + << QString(" (%1 ms since last, %2 Hz)").arg(diff / 1000, 4).arg( 1000000.0 / diff, 4, 'f', 1) << endl; + return true; + } +private: + qtimestamp stamp; +}; +int main(int argc, char **argv) +{ + QCoreApplication app(argc, argv); + QStringList args = app.arguments(); + int rate_place = args.indexOf("-r"); + int rate_val = 0; + if (rate_place != -1) + rate_val = args.at(rate_place + 1).toInt(); + QCompass sensor; + if (rate_val > 0) { + sensor.setDataRate(rate_val); + } + CompassFilter filter; + sensor.addFilter(&filter); + sensor.start(); + if (!sensor.isActive()) { + qWarning("Compasssensor didn't start!"); + return 1; + } return app.exec(); } diff --git a/examples/sensors/show_compass/show_compass.pro b/examples/sensors/show_compass/show_compass.pro new file mode 100644 index 0000000000..c9e67ad65f --- /dev/null +++ b/examples/sensors/show_compass/show_compass.pro @@ -0,0 +1,3 @@ +include(../sensors.pri) +SOURCES = main.cpp +TARGET = show_compass diff --git a/examples/sensors/show_magneticflux/main.cpp b/examples/sensors/show_magneticflux/main.cpp new file mode 100644 index 0000000000..e538b543f2 --- /dev/null +++ b/examples/sensors/show_magneticflux/main.cpp @@ -0,0 +1,119 @@ +/**************************************************************************** +** +** Copyright (C) 2010 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:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include <QtCore> +#include <qmagnetometer.h> + +QTM_USE_NAMESPACE + +class MagGeoFilter : public QMagnetometerFilter +{ +public: + qtimestamp stamp; + bool filter(QMagnetometerReading *reading) + { + int diff = ( reading->timestamp() - stamp ); + stamp = reading->timestamp(); + QTextStream out(stdout); + out << QString("Geomagnetic flux density: %1 x").arg(reading->x() * 1000000, 6, 'f', 1) + << QString(" %1 y").arg(reading->y() * 1000000, 6, 'f', 1) + << QString(" %1 z uT").arg(reading->z() * 1000000, 6, 'f', 1) + << QString(" calibration: %1").arg(reading->calibrationLevel(), 3, 'f', 1) + << QString(" (%1 ms since last, %2 Hz)").arg(diff / 1000, 4).arg( 1000000.0 / diff, 4, 'f', 1) << endl; + return false; + } +}; + +class MagRawFilter : public QMagnetometerFilter +{ +public: + qtimestamp stamp; + bool filter(QMagnetometerReading *reading) + { + int diff = ( reading->timestamp() - stamp ); + stamp = reading->timestamp(); + QTextStream out(stdout); + out << QString("Raw magnetic flux density: %1 x").arg(reading->x() * 1000000, 6, 'f', 1) + << QString(" %1 y").arg(reading->y() * 1000000, 6, 'f', 1) + << QString(" %1 z uT").arg(reading->z() * 1000000, 6, 'f', 1) + << QString(" calibration: %1").arg(reading->calibrationLevel(), 3, 'f', 1) + << QString(" (%1 ms since last, %2 Hz)").arg(diff / 1000, 4).arg( 1000000.0 / diff, 4, 'f', 1) << endl; + return false; + } +}; + +int main(int argc, char **argv) +{ + QCoreApplication app(argc, argv); + QStringList args = app.arguments(); + int rate_place = args.indexOf("-r"); + int rate_val = 0; + if (rate_place != -1) + rate_val = args.at(rate_place + 1).toInt(); + + QMagnetometer geosensor; + if (rate_val > 0) { + geosensor.setDataRate(rate_val); + } + MagGeoFilter geofilter; + geosensor.setProperty("returnGeoValues", true); + geosensor.addFilter(&geofilter); + qDebug() << geosensor.availableDataRates().size(); + geosensor.start(); + if (!geosensor.isActive()) { + qWarning("Magnetometersensor (geo) didn't start!"); + return 1; + } + + QMagnetometer rawsensor; + if (rate_val > 0) { + rawsensor.setDataRate(rate_val); + } + MagRawFilter rawfilter; + rawsensor.addFilter(&rawfilter); + qDebug() << rawsensor.availableDataRates().size(); + rawsensor.start(); + if (!rawsensor.isActive()) { + qWarning("Magnetometersensor (raw) didn't start!"); + return 1; + } + + return app.exec(); +} diff --git a/examples/sensors/show_magneticflux/show_magneticflux.pro b/examples/sensors/show_magneticflux/show_magneticflux.pro new file mode 100644 index 0000000000..dec8b0022b --- /dev/null +++ b/examples/sensors/show_magneticflux/show_magneticflux.pro @@ -0,0 +1,3 @@ +include(../sensors.pri) +SOURCES = main.cpp +TARGET = show_magneticflux diff --git a/examples/sensors/show_orientation/main.cpp b/examples/sensors/show_orientation/main.cpp new file mode 100644 index 0000000000..89b58c4b78 --- /dev/null +++ b/examples/sensors/show_orientation/main.cpp @@ -0,0 +1,93 @@ +/**************************************************************************** +** +** Copyright (C) 2010 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:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include <QtCore> +#include <qorientationsensor.h> + +QTM_USE_NAMESPACE + +class OrientationSensorFilter : public QOrientationFilter +{ +public: + qtimestamp stamp; + bool filter(QOrientationReading *reading) + { + int diff = ( reading->timestamp() - stamp ); + stamp = reading->timestamp(); + QString output; + switch (reading->orientation()) { + case QOrientationReading::TopUp: output = "Top up "; break; + case QOrientationReading::TopDown: output = "Top down "; break; + case QOrientationReading::LeftUp: output = "Left up "; break; + case QOrientationReading::RightUp: output = "Right up "; break; + case QOrientationReading::FaceUp: output = "Face up "; break; + case QOrientationReading::FaceDown: output = "Face down"; break; + case QOrientationReading::Undefined: output = "Undefined"; break; + default: output = "Invalid enum value"; + } + QTextStream out(stdout); + out << "Orientation: " << output + << QString(" (%1 ms since last, %2 Hz)").arg(diff / 1000, 5).arg( 1000000.0 / diff, 4, 'f', 1) << endl; + return false; // don't store the reading in the sensor + } +}; + +int main(int argc, char **argv) +{ + QCoreApplication app(argc, argv); + QStringList args = app.arguments(); + int rate_place = args.indexOf("-r"); + int rate_val = 0; + if (rate_place != -1) + rate_val = args.at(rate_place + 1).toInt(); + QOrientationSensor sensor; + if (rate_val > 0) { + sensor.setDataRate(rate_val); + } + OrientationSensorFilter filter; + sensor.addFilter(&filter); + sensor.start(); + if (!sensor.isActive()) { + qWarning("Orientationsensor didn't start!"); + return 1; + } + + return app.exec(); +} diff --git a/examples/sensors/show_orientation/show_orientation.pro b/examples/sensors/show_orientation/show_orientation.pro new file mode 100644 index 0000000000..05464d85f0 --- /dev/null +++ b/examples/sensors/show_orientation/show_orientation.pro @@ -0,0 +1,3 @@ +include(../sensors.pri) +SOURCES = main.cpp +TARGET = show_orientation diff --git a/examples/declarative-sfw-dialer/sfwexample/sfwexample.h b/examples/sensors/show_proximity/main.cpp index 0bdc499db5..9e2d453661 100644 --- a/examples/declarative-sfw-dialer/sfwexample/sfwexample.h +++ b/examples/sensors/show_proximity/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -36,30 +36,51 @@ ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." ** $QT_END_LICENSE$ ** -***************************************************************************/ - -#ifndef SFWEXAMPLE_H -#define SFWEXAMPLE_H +****************************************************************************/ #include <QtCore> -#include <qserviceinterfacedescriptor.h> -#include <qservicemanager.h> +#include <qproximitysensor.h> QTM_USE_NAMESPACE -class DialerServices : public QObject { - Q_OBJECT - +class ProximitySensorFilter : public QProximityFilter +{ public: - DialerServices(); - ~DialerServices(); - -private: - void registerExampleServices(); - void unregisterExampleServices(); - - QServiceManager* serviceManager; + qtimestamp stamp; + bool filter(QProximityReading *reading) + { + int diff = ( reading->timestamp() - stamp ); + stamp = reading->timestamp(); + QTextStream out(stdout); + out << "Proximity: "; + if (reading->close()) + out << "Close "; + else + out << "Not close"; + out << QString(" (%1 ms since last, %2 Hz)").arg(diff / 1000, 5).arg( 1000000.0 / diff, 3, 'f', 1) << endl; + return false; // don't store the reading in the sensor + } }; -#endif +int main(int argc, char **argv) +{ + QCoreApplication app(argc, argv); + QStringList args = app.arguments(); + int rate_place = args.indexOf("-r"); + int rate_val = 0; + if (rate_place != -1) + rate_val = args.at(rate_place + 1).toInt(); + QProximitySensor sensor; + if (rate_val > 0) { + sensor.setDataRate(rate_val); + } + ProximitySensorFilter filter; + sensor.addFilter(&filter); + sensor.start(); + if (!sensor.isActive()) { + qWarning("Proximitysensor didn't start!"); + return 1; + } + return app.exec(); +} diff --git a/examples/sensors/show_proximity/show_proximity.pro b/examples/sensors/show_proximity/show_proximity.pro new file mode 100644 index 0000000000..662b640e9f --- /dev/null +++ b/examples/sensors/show_proximity/show_proximity.pro @@ -0,0 +1,3 @@ +include(../sensors.pri) +SOURCES = main.cpp +TARGET = show_proximity diff --git a/examples/sensors/show_rotation/main.cpp b/examples/sensors/show_rotation/main.cpp new file mode 100644 index 0000000000..77d04b5ef0 --- /dev/null +++ b/examples/sensors/show_rotation/main.cpp @@ -0,0 +1,92 @@ +/**************************************************************************** +** +** Copyright (C) 2010 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:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include <QtCore> +#include <qrotationsensor.h> + +QTM_USE_NAMESPACE + +class RotationFilter : public QRotationFilter +{ +public: + bool filter(QRotationReading *reading) + { + int diff = ( reading->timestamp() - stamp ); + stamp = reading->timestamp(); + QTextStream out(stdout); + out << QString("Rotation: %1 x").arg(reading->x(), 4, 'f', 0) + << QString(" %1 y").arg(reading->y(), 4, 'f', 0) + << QString(" %1 z").arg(reading->z(), 4, 'f', 0) + << QString(" (%1 ms since last, %2 Hz)").arg(diff / 1000, 4).arg( 1000000.0 / diff, 4, 'f', 1) << endl; + return true; + } +private: + qtimestamp stamp; +}; + +int main(int argc, char **argv) +{ + QCoreApplication app(argc, argv); + QStringList args = app.arguments(); + int rate_place = args.indexOf("-r"); + int rate_val = 0; + if (rate_place != -1) + rate_val = args.at(rate_place + 1).toInt(); + QRotationSensor sensor; + if (rate_val > 0) { + sensor.setDataRate(rate_val); + } + RotationFilter filter; + sensor.addFilter(&filter); + sensor.start(); + if (!sensor.isActive()) { + qWarning("Rotationsensor didn't start!"); + return 1; + } + if (sensor.property("hasZ").isValid()) { + if (sensor.property("hasZ").toBool()) + qDebug() << "Sensor hasZ is set"; + else + qDebug() << "Sensor hasZ is NOT set"; + } else { + qDebug() << "Sensor hasZ error: no value"; + } + return app.exec(); +} diff --git a/examples/sensors/show_rotation/show_rotation.pro b/examples/sensors/show_rotation/show_rotation.pro new file mode 100644 index 0000000000..2aea11b9bf --- /dev/null +++ b/examples/sensors/show_rotation/show_rotation.pro @@ -0,0 +1,3 @@ +include(../sensors.pri) +SOURCES = main.cpp +TARGET = show_rotation diff --git a/examples/sensors/show_tap/main.cpp b/examples/sensors/show_tap/main.cpp new file mode 100644 index 0000000000..a63657a5c4 --- /dev/null +++ b/examples/sensors/show_tap/main.cpp @@ -0,0 +1,112 @@ +/**************************************************************************** +** +** Copyright (C) 2010 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:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include <QtCore> +#include <qtapsensor.h> + +QTM_USE_NAMESPACE + +class TapSensorFilter : public QTapFilter +{ +public: + qtimestamp stamp; + bool filter(QTapReading *reading) + { + int diff = ( reading->timestamp() - stamp ); + stamp = reading->timestamp(); + QString output; + switch (reading->tapDirection()) { + case QTapReading::X: output = "X"; break; + case QTapReading::Y: output = "Y"; break; + case QTapReading::Z: output = "Z"; break; + case QTapReading::X_Pos: output = "X pos"; break; + case QTapReading::Y_Pos: output = "Y pos"; break; + case QTapReading::Z_Pos: output = "Z pos"; break; + case QTapReading::X_Neg: output = "X neg"; break; + case QTapReading::Y_Neg: output = "Y neg"; break; + case QTapReading::Z_Neg: output = "Z neg"; break; + case QTapReading::Undefined: output = "Undefined"; break; + default: output = "Invalid enum value"; + } + QTextStream out(stdout); + out << "Tap: "; + if(reading->isDoubleTap()) + out << "Double "; + else + out << "Single "; + out << QString(" (%1 ms since last, %2 Hz)").arg(diff / 1000, 5).arg( 1000000.0 / diff, 3, 'f', 1) << endl; + return false; // don't store the reading in the sensor + } +}; + +int main(int argc, char **argv) +{ + QCoreApplication app(argc, argv); + QStringList args = app.arguments(); + int rate_place = args.indexOf("-r"); + int rate_val = 0; + if (rate_place != -1) + rate_val = args.at(rate_place + 1).toInt(); + + QTapSensor doublesensor; + if (rate_val > 0) { + doublesensor.setDataRate(rate_val); + } + TapSensorFilter filter; + doublesensor.addFilter(&filter); + doublesensor.start(); + if (!doublesensor.isActive()) { + qWarning("Tapsensor (double) didn't start!"); + return 1; + } + + QTapSensor singlesensor; + if (rate_val > 0) { + singlesensor.setDataRate(rate_val); + } + singlesensor.addFilter(&filter); + singlesensor.start(); + if (!singlesensor.isActive()) { + qWarning("Tapsensor (single) didn't start!"); + return 1; + } + + return app.exec(); +} diff --git a/examples/sensors/show_tap/show_tap.pro b/examples/sensors/show_tap/show_tap.pro new file mode 100644 index 0000000000..9db48cfef4 --- /dev/null +++ b/examples/sensors/show_tap/show_tap.pro @@ -0,0 +1,3 @@ +include(../sensors.pri) +SOURCES = main.cpp +TARGET = show_tap diff --git a/examples/sensors/small_screen_sensors/accelerationform.cpp b/examples/sensors/small_screen_sensors/accelerationform.cpp index b22331ff5e..2c24410276 100644 --- a/examples/sensors/small_screen_sensors/accelerationform.cpp +++ b/examples/sensors/small_screen_sensors/accelerationform.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/sensors/small_screen_sensors/accelerationform.h b/examples/sensors/small_screen_sensors/accelerationform.h index 2f5e21eeac..f6e8df5332 100644 --- a/examples/sensors/small_screen_sensors/accelerationform.h +++ b/examples/sensors/small_screen_sensors/accelerationform.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/sensors/small_screen_sensors/freefallform.cpp b/examples/sensors/small_screen_sensors/freefallform.cpp index b21f847533..ee792ebb68 100644 --- a/examples/sensors/small_screen_sensors/freefallform.cpp +++ b/examples/sensors/small_screen_sensors/freefallform.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/sensors/small_screen_sensors/freefallform.h b/examples/sensors/small_screen_sensors/freefallform.h index d8d86f3863..5bd6d42837 100644 --- a/examples/sensors/small_screen_sensors/freefallform.h +++ b/examples/sensors/small_screen_sensors/freefallform.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/sensors/small_screen_sensors/main.cpp b/examples/sensors/small_screen_sensors/main.cpp index 7f4f88d220..536ca66478 100644 --- a/examples/sensors/small_screen_sensors/main.cpp +++ b/examples/sensors/small_screen_sensors/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/sensors/small_screen_sensors/orientationform.cpp b/examples/sensors/small_screen_sensors/orientationform.cpp index 208e4498c4..6779d14c06 100644 --- a/examples/sensors/small_screen_sensors/orientationform.cpp +++ b/examples/sensors/small_screen_sensors/orientationform.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/sensors/small_screen_sensors/orientationform.h b/examples/sensors/small_screen_sensors/orientationform.h index 70af9a3308..2a2128561d 100644 --- a/examples/sensors/small_screen_sensors/orientationform.h +++ b/examples/sensors/small_screen_sensors/orientationform.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/sensors/small_screen_sensors/sensorswindow.cpp b/examples/sensors/small_screen_sensors/sensorswindow.cpp index 5595df3a25..8208827b0b 100644 --- a/examples/sensors/small_screen_sensors/sensorswindow.cpp +++ b/examples/sensors/small_screen_sensors/sensorswindow.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/sensors/small_screen_sensors/sensorswindow.h b/examples/sensors/small_screen_sensors/sensorswindow.h index 10f56126e8..58f98dcd7d 100644 --- a/examples/sensors/small_screen_sensors/sensorswindow.h +++ b/examples/sensors/small_screen_sensors/sensorswindow.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/serviceactions/attachmentlistwidget.cpp b/examples/serviceactions/attachmentlistwidget.cpp index d413e660b5..f2e974852c 100644 --- a/examples/serviceactions/attachmentlistwidget.cpp +++ b/examples/serviceactions/attachmentlistwidget.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/serviceactions/attachmentlistwidget.h b/examples/serviceactions/attachmentlistwidget.h index 707566a1c5..e292b6c1f3 100644 --- a/examples/serviceactions/attachmentlistwidget.h +++ b/examples/serviceactions/attachmentlistwidget.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/serviceactions/main.cpp b/examples/serviceactions/main.cpp index 73aef3818f..d2140d03a2 100644 --- a/examples/serviceactions/main.cpp +++ b/examples/serviceactions/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/serviceactions/mainwindow.cpp b/examples/serviceactions/mainwindow.cpp index 4fc6c8c181..21c665d9e8 100644 --- a/examples/serviceactions/mainwindow.cpp +++ b/examples/serviceactions/mainwindow.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/serviceactions/mainwindow.h b/examples/serviceactions/mainwindow.h index 5092f0ea16..9cc0e8c558 100644 --- a/examples/serviceactions/mainwindow.h +++ b/examples/serviceactions/mainwindow.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/servicebrowser/main.cpp b/examples/servicebrowser/main.cpp index 4ac5bab6df..b9a292fdfa 100644 --- a/examples/servicebrowser/main.cpp +++ b/examples/servicebrowser/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/servicebrowser/servicebrowser.cpp b/examples/servicebrowser/servicebrowser.cpp index ece299e011..a8836c7c62 100644 --- a/examples/servicebrowser/servicebrowser.cpp +++ b/examples/servicebrowser/servicebrowser.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/servicebrowser/servicebrowser.h b/examples/servicebrowser/servicebrowser.h index f4fbc98b53..6ce0fe1fdb 100644 --- a/examples/servicebrowser/servicebrowser.h +++ b/examples/servicebrowser/servicebrowser.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/serviceinstaller_sfw_symbian/exampleinstaller/exampleinstaller.cpp b/examples/serviceinstaller_sfw_symbian/exampleinstaller/exampleinstaller.cpp index ac277415c8..18c558870b 100644 --- a/examples/serviceinstaller_sfw_symbian/exampleinstaller/exampleinstaller.cpp +++ b/examples/serviceinstaller_sfw_symbian/exampleinstaller/exampleinstaller.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/sfw-notes/main.cpp b/examples/sfw-notes/main.cpp index a36ca1936e..3e57693bd4 100644 --- a/examples/sfw-notes/main.cpp +++ b/examples/sfw-notes/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/sfw-notes/sfwnotes.cpp b/examples/sfw-notes/sfwnotes.cpp index 13a20905ce..1bd4c0edf0 100644 --- a/examples/sfw-notes/sfwnotes.cpp +++ b/examples/sfw-notes/sfwnotes.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/sfw-notes/sfwnotes.h b/examples/sfw-notes/sfwnotes.h index c1a0baf505..54ce644183 100644 --- a/examples/sfw-notes/sfwnotes.h +++ b/examples/sfw-notes/sfwnotes.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/slideshow/main.cpp b/examples/slideshow/main.cpp index 11f6c5b973..5918c513e2 100644 --- a/examples/slideshow/main.cpp +++ b/examples/slideshow/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/slideshow/slideshow.cpp b/examples/slideshow/slideshow.cpp index 87bfdbf3a6..f7bc47c52d 100644 --- a/examples/slideshow/slideshow.cpp +++ b/examples/slideshow/slideshow.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/slideshow/slideshow.h b/examples/slideshow/slideshow.h index 038d03d498..d86a064ba9 100644 --- a/examples/slideshow/slideshow.h +++ b/examples/slideshow/slideshow.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/sysinfo/dialog.cpp b/examples/sysinfo/dialog.cpp index 3d8723273a..1f85cef348 100644 --- a/examples/sysinfo/dialog.cpp +++ b/examples/sysinfo/dialog.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/sysinfo/dialog.h b/examples/sysinfo/dialog.h index dced6706dc..345c13a764 100644 --- a/examples/sysinfo/dialog.h +++ b/examples/sysinfo/dialog.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/sysinfo/main.cpp b/examples/sysinfo/main.cpp index 45ab7491b1..466bdca344 100644 --- a/examples/sysinfo/main.cpp +++ b/examples/sysinfo/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/weatherinfo/weatherinfo.cpp b/examples/weatherinfo/weatherinfo.cpp index 25f7fcae06..e26f246ffc 100644 --- a/examples/weatherinfo/weatherinfo.cpp +++ b/examples/weatherinfo/weatherinfo.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/weatherinfo/weatherinfo.pro b/examples/weatherinfo/weatherinfo.pro index 06899b2a81..1a0c4292a1 100644 --- a/examples/weatherinfo/weatherinfo.pro +++ b/examples/weatherinfo/weatherinfo.pro @@ -22,16 +22,20 @@ INCLUDEPATH += ../../src/global \ ../flickrdemo symbian { - TARGET.CAPABILITY = NetworkServices Location ReadUserData -} - -symbian: { - addFiles.sources = nmealog.txt - DEPLOYMENT += addFiles + symbian { + addFiles.sources = nmealog.txt + DEPLOYMENT += addFiles + TARGET.CAPABILITY += Location \ + NetworkServices \ + ReadUserData + } + wince* { + addFiles.sources = ./nmealog.txt + addFiles.path = . + DEPLOYMENT += addFiles + } } else { - logfile.path = $$DESTDIR + logfile.path = $$QT_MOBILITY_PREFIX/bin 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/writemessage/main.cpp b/examples/writemessage/main.cpp index 07ba2665d5..3d1cf201f3 100644 --- a/examples/writemessage/main.cpp +++ b/examples/writemessage/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/writemessage/messagesender.cpp b/examples/writemessage/messagesender.cpp index 01686483c4..ddb1f35b75 100644 --- a/examples/writemessage/messagesender.cpp +++ b/examples/writemessage/messagesender.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/writemessage/messagesender.h b/examples/writemessage/messagesender.h index b4535ba2d7..668de0126a 100644 --- a/examples/writemessage/messagesender.h +++ b/examples/writemessage/messagesender.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/features/mobility.prf.template b/features/mobility.prf.template index 1baa642615..b8748f8b71 100644 --- a/features/mobility.prf.template +++ b/features/mobility.prf.template @@ -18,6 +18,10 @@ QMAKE_RPATHDIR+=$${MOBILITY_LIB} contains(MOBILITY, bearer) { DEFINES += QT_MOBILITY_BEARER qtAddLibrary(QtBearer) + !equals(QT_MAJOR_VERSION,4)|!equals(QT_MINOR_VERSION, 6) { + message(Qt Mobility Bearer API is deprecated when using Qt 4.7 or higher.) + message(Please use source compatible replacement Bearer API in QtNetwork.) + } } contains(MOBILITY, publishsubscribe) { @@ -70,7 +74,7 @@ contains(MOBILITY, sensors) { symbian:contains(CONFIG, mobility):!contains(TARGET.UID3, 0x2002AC89):!contains(TARGET.UID3, 0xE002AC89) { mobility_default_deployment.pkg_prerules += \ "; Default dependency to QtMobility libraries" \ - "(0x2002AC89), 1, 0, 0, {\"QtMobility\"}" + "(0x2002AC89), 1, 1, 0, {\"QtMobility\"}" DEPLOYMENT += mobility_default_deployment } diff --git a/plugins/contacts/maemo5/maemo5.pro b/plugins/contacts/maemo5/maemo5.pro index 17ec7e96c8..d2e7d1da6e 100644 --- a/plugins/contacts/maemo5/maemo5.pro +++ b/plugins/contacts/maemo5/maemo5.pro @@ -15,10 +15,6 @@ SOURCES += \ qcontactmaemo5backend.cpp \ INCLUDEPATH += $$SOURCE_DIR/src/contacts $$SOURCE_DIR/src/contacts/details $$SOURCE_DIR/src/contacts/filters $$SOURCE_DIR/src/contacts/requests - -target.path=$${QT_MOBILITY_PREFIX}/plugins/$${PLUGIN_TYPE} -maemo6:target.path=$$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE} -INSTALLS += target CONFIG += mobility link_pkgconfig MOBILITY = contacts PKGCONFIG += libosso-abook-1.0 diff --git a/plugins/contacts/maemo5/qcontactabook.cpp b/plugins/contacts/maemo5/qcontactabook.cpp index 89e6a1431e..29a0130293 100644 --- a/plugins/contacts/maemo5/qcontactabook.cpp +++ b/plugins/contacts/maemo5/qcontactabook.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/maemo5/qcontactabook_p.h b/plugins/contacts/maemo5/qcontactabook_p.h index a4b8e4b9d5..a9f60de402 100644 --- a/plugins/contacts/maemo5/qcontactabook_p.h +++ b/plugins/contacts/maemo5/qcontactabook_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/maemo5/qcontactidshash.h b/plugins/contacts/maemo5/qcontactidshash.h index 435c829b5f..12fc3c93ef 100644 --- a/plugins/contacts/maemo5/qcontactidshash.h +++ b/plugins/contacts/maemo5/qcontactidshash.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/maemo5/qcontactmaemo5backend.cpp b/plugins/contacts/maemo5/qcontactmaemo5backend.cpp index 22f68b3bd7..ea575b3548 100644 --- a/plugins/contacts/maemo5/qcontactmaemo5backend.cpp +++ b/plugins/contacts/maemo5/qcontactmaemo5backend.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/maemo5/qcontactmaemo5backend_p.h b/plugins/contacts/maemo5/qcontactmaemo5backend_p.h index a32d8b6202..6f02c22a99 100644 --- a/plugins/contacts/maemo5/qcontactmaemo5backend_p.h +++ b/plugins/contacts/maemo5/qcontactmaemo5backend_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/maemo5/qcontactmaemo5debug_p.h b/plugins/contacts/maemo5/qcontactmaemo5debug_p.h index 2072aa6fa8..c4a874904d 100644 --- a/plugins/contacts/maemo5/qcontactmaemo5debug_p.h +++ b/plugins/contacts/maemo5/qcontactmaemo5debug_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/qtcontacts-tracker/qcontacttrackerbackend.cpp b/plugins/contacts/qtcontacts-tracker/qcontacttrackerbackend.cpp index 69059f5862..3b64148481 100644 --- a/plugins/contacts/qtcontacts-tracker/qcontacttrackerbackend.cpp +++ b/plugins/contacts/qtcontacts-tracker/qcontacttrackerbackend.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/qtcontacts-tracker/qcontacttrackerbackend_p.h b/plugins/contacts/qtcontacts-tracker/qcontacttrackerbackend_p.h index bfb8e300d6..586e6c1b15 100644 --- a/plugins/contacts/qtcontacts-tracker/qcontacttrackerbackend_p.h +++ b/plugins/contacts/qtcontacts-tracker/qcontacttrackerbackend_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/qtcontacts-tracker/qtcontacts-tracker.pro b/plugins/contacts/qtcontacts-tracker/qtcontacts-tracker.pro index dec81e1857..1b68b81d25 100644 --- a/plugins/contacts/qtcontacts-tracker/qtcontacts-tracker.pro +++ b/plugins/contacts/qtcontacts-tracker/qtcontacts-tracker.pro @@ -42,7 +42,3 @@ SOURCES += qcontacttrackerbackend.cpp \ qtrackerrelationshipsaverequest.cpp \ qtrackercontactidfetchrequest.cpp \ trackerchangelistener.cpp - -target.path=$${QT_MOBILITY_PREFIX}/plugins/$${PLUGIN_TYPE} -maemo6:target.path=$$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE} -INSTALLS+=target diff --git a/plugins/contacts/qtcontacts-tracker/qtrackercontactasyncrequest.h b/plugins/contacts/qtcontacts-tracker/qtrackercontactasyncrequest.h index a536603a05..e0a462fd29 100644 --- a/plugins/contacts/qtcontacts-tracker/qtrackercontactasyncrequest.h +++ b/plugins/contacts/qtcontacts-tracker/qtrackercontactasyncrequest.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/qtcontacts-tracker/qtrackercontactfetchrequest.cpp b/plugins/contacts/qtcontacts-tracker/qtrackercontactfetchrequest.cpp index d03a2fc0eb..9bdabaf5fd 100644 --- a/plugins/contacts/qtcontacts-tracker/qtrackercontactfetchrequest.cpp +++ b/plugins/contacts/qtcontacts-tracker/qtrackercontactfetchrequest.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/qtcontacts-tracker/qtrackercontactfetchrequest.h b/plugins/contacts/qtcontacts-tracker/qtrackercontactfetchrequest.h index fe56a5ec64..dd3275c03c 100644 --- a/plugins/contacts/qtcontacts-tracker/qtrackercontactfetchrequest.h +++ b/plugins/contacts/qtcontacts-tracker/qtrackercontactfetchrequest.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/qtcontacts-tracker/qtrackercontactidfetchrequest.cpp b/plugins/contacts/qtcontacts-tracker/qtrackercontactidfetchrequest.cpp index 1580248fc7..9b4e15264f 100644 --- a/plugins/contacts/qtcontacts-tracker/qtrackercontactidfetchrequest.cpp +++ b/plugins/contacts/qtcontacts-tracker/qtrackercontactidfetchrequest.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/qtcontacts-tracker/qtrackercontactidfetchrequest.h b/plugins/contacts/qtcontacts-tracker/qtrackercontactidfetchrequest.h index 9e583acdc8..599037e116 100644 --- a/plugins/contacts/qtcontacts-tracker/qtrackercontactidfetchrequest.h +++ b/plugins/contacts/qtcontacts-tracker/qtrackercontactidfetchrequest.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/qtcontacts-tracker/qtrackercontactsaverequest.cpp b/plugins/contacts/qtcontacts-tracker/qtrackercontactsaverequest.cpp index 1a582615a6..a09a9fe215 100644 --- a/plugins/contacts/qtcontacts-tracker/qtrackercontactsaverequest.cpp +++ b/plugins/contacts/qtcontacts-tracker/qtrackercontactsaverequest.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/qtcontacts-tracker/qtrackercontactsaverequest.h b/plugins/contacts/qtcontacts-tracker/qtrackercontactsaverequest.h index 10077ef0c9..b93bf35fcd 100644 --- a/plugins/contacts/qtcontacts-tracker/qtrackercontactsaverequest.h +++ b/plugins/contacts/qtcontacts-tracker/qtrackercontactsaverequest.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/qtcontacts-tracker/qtrackercontactslive.cpp b/plugins/contacts/qtcontacts-tracker/qtrackercontactslive.cpp index 2082c5e929..6cd9699ed6 100644 --- a/plugins/contacts/qtcontacts-tracker/qtrackercontactslive.cpp +++ b/plugins/contacts/qtcontacts-tracker/qtrackercontactslive.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/qtcontacts-tracker/qtrackercontactslive.h b/plugins/contacts/qtcontacts-tracker/qtrackercontactslive.h index d14417de16..ca028315b2 100644 --- a/plugins/contacts/qtcontacts-tracker/qtrackercontactslive.h +++ b/plugins/contacts/qtcontacts-tracker/qtrackercontactslive.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/qtcontacts-tracker/qtrackerrelationshipfetchrequest.cpp b/plugins/contacts/qtcontacts-tracker/qtrackerrelationshipfetchrequest.cpp index b08373f690..3efd9e1242 100644 --- a/plugins/contacts/qtcontacts-tracker/qtrackerrelationshipfetchrequest.cpp +++ b/plugins/contacts/qtcontacts-tracker/qtrackerrelationshipfetchrequest.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/qtcontacts-tracker/qtrackerrelationshipfetchrequest.h b/plugins/contacts/qtcontacts-tracker/qtrackerrelationshipfetchrequest.h index 5adbb221c8..075401fdb4 100644 --- a/plugins/contacts/qtcontacts-tracker/qtrackerrelationshipfetchrequest.h +++ b/plugins/contacts/qtcontacts-tracker/qtrackerrelationshipfetchrequest.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/qtcontacts-tracker/qtrackerrelationshipsaverequest.cpp b/plugins/contacts/qtcontacts-tracker/qtrackerrelationshipsaverequest.cpp index 3a9b4292df..8a3e9515af 100644 --- a/plugins/contacts/qtcontacts-tracker/qtrackerrelationshipsaverequest.cpp +++ b/plugins/contacts/qtcontacts-tracker/qtrackerrelationshipsaverequest.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/qtcontacts-tracker/qtrackerrelationshipsaverequest.h b/plugins/contacts/qtcontacts-tracker/qtrackerrelationshipsaverequest.h index e154f8b817..11d76b67a3 100644 --- a/plugins/contacts/qtcontacts-tracker/qtrackerrelationshipsaverequest.h +++ b/plugins/contacts/qtcontacts-tracker/qtrackerrelationshipsaverequest.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_add_async/ut_qtcontacts_add_async.cpp b/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_add_async/ut_qtcontacts_add_async.cpp index a13a60269d..0fd67efd1a 100644 --- a/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_add_async/ut_qtcontacts_add_async.cpp +++ b/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_add_async/ut_qtcontacts_add_async.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_add_async/ut_qtcontacts_add_async.h b/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_add_async/ut_qtcontacts_add_async.h index 6a2144becc..aa08c33dea 100644 --- a/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_add_async/ut_qtcontacts_add_async.h +++ b/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_add_async/ut_qtcontacts_add_async.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_common/ut_qtcontacts_common.h b/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_common/ut_qtcontacts_common.h index e549a4883f..958df366dc 100644 --- a/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_common/ut_qtcontacts_common.h +++ b/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_common/ut_qtcontacts_common.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_fetch/ut_qtcontacts_fetch.cpp b/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_fetch/ut_qtcontacts_fetch.cpp index a170b3499d..9683d0623d 100644 --- a/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_fetch/ut_qtcontacts_fetch.cpp +++ b/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_fetch/ut_qtcontacts_fetch.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_fetch/ut_qtcontacts_fetch.h b/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_fetch/ut_qtcontacts_fetch.h index f43e91cd96..ff594bbfb0 100644 --- a/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_fetch/ut_qtcontacts_fetch.h +++ b/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_fetch/ut_qtcontacts_fetch.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_sparql/ut_qtcontacts_sparql.cpp b/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_sparql/ut_qtcontacts_sparql.cpp index 69da2d8040..bcf65baef5 100644 --- a/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_sparql/ut_qtcontacts_sparql.cpp +++ b/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_sparql/ut_qtcontacts_sparql.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_sparql/ut_qtcontacts_sparql.h b/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_sparql/ut_qtcontacts_sparql.h index 079617cd27..7b7d3779c2 100644 --- a/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_sparql/ut_qtcontacts_sparql.h +++ b/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_sparql/ut_qtcontacts_sparql.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_trackerplugin/contactmanager.cpp b/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_trackerplugin/contactmanager.cpp index 2c28171c3a..16ef4bc0f7 100644 --- a/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_trackerplugin/contactmanager.cpp +++ b/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_trackerplugin/contactmanager.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_trackerplugin/contactmanager.h b/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_trackerplugin/contactmanager.h index 00072be884..19856dc20c 100644 --- a/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_trackerplugin/contactmanager.h +++ b/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_trackerplugin/contactmanager.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_trackerplugin/ut_qtcontacts_trackerplugin.cpp b/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_trackerplugin/ut_qtcontacts_trackerplugin.cpp index f548655445..483e3e3e5e 100644 --- a/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_trackerplugin/ut_qtcontacts_trackerplugin.cpp +++ b/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_trackerplugin/ut_qtcontacts_trackerplugin.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_trackerplugin/ut_qtcontacts_trackerplugin.h b/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_trackerplugin/ut_qtcontacts_trackerplugin.h index d7589a7778..12c8e826f6 100644 --- a/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_trackerplugin/ut_qtcontacts_trackerplugin.h +++ b/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_trackerplugin/ut_qtcontacts_trackerplugin.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_trackerplugin_definitions/ut_qtcontacts_trackerplugin_definitions.cpp b/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_trackerplugin_definitions/ut_qtcontacts_trackerplugin_definitions.cpp index 1155b8bda6..ff635f2231 100644 --- a/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_trackerplugin_definitions/ut_qtcontacts_trackerplugin_definitions.cpp +++ b/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_trackerplugin_definitions/ut_qtcontacts_trackerplugin_definitions.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_trackerplugin_definitions/ut_qtcontacts_trackerplugin_definitions.h b/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_trackerplugin_definitions/ut_qtcontacts_trackerplugin_definitions.h index 088cf47901..aba108011e 100644 --- a/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_trackerplugin_definitions/ut_qtcontacts_trackerplugin_definitions.h +++ b/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_trackerplugin_definitions/ut_qtcontacts_trackerplugin_definitions.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/qtcontacts-tracker/trackerchangelistener.cpp b/plugins/contacts/qtcontacts-tracker/trackerchangelistener.cpp index d4ecdc92be..ee2cb4652e 100644 --- a/plugins/contacts/qtcontacts-tracker/trackerchangelistener.cpp +++ b/plugins/contacts/qtcontacts-tracker/trackerchangelistener.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/qtcontacts-tracker/trackerchangelistener.h b/plugins/contacts/qtcontacts-tracker/trackerchangelistener.h index 890e977b97..49f2dad446 100644 --- a/plugins/contacts/qtcontacts-tracker/trackerchangelistener.h +++ b/plugins/contacts/qtcontacts-tracker/trackerchangelistener.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/inc/cntabstractrelationship.h b/plugins/contacts/symbian/inc/cntabstractrelationship.h index 61e7376083..9156107df6 100644 --- a/plugins/contacts/symbian/inc/cntabstractrelationship.h +++ b/plugins/contacts/symbian/inc/cntabstractrelationship.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/inc/cntdisplaylabel.h b/plugins/contacts/symbian/inc/cntdisplaylabel.h index 4d981b34cc..09c8964389 100644 --- a/plugins/contacts/symbian/inc/cntdisplaylabel.h +++ b/plugins/contacts/symbian/inc/cntdisplaylabel.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/inc/cntrelationship.h b/plugins/contacts/symbian/inc/cntrelationship.h index c9b2e51d42..a3e727c4e6 100644 --- a/plugins/contacts/symbian/inc/cntrelationship.h +++ b/plugins/contacts/symbian/inc/cntrelationship.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/inc/cntrelationshipgroup.h b/plugins/contacts/symbian/inc/cntrelationshipgroup.h index 5e7d41fe7d..3efd870c8b 100644 --- a/plugins/contacts/symbian/inc/cntrelationshipgroup.h +++ b/plugins/contacts/symbian/inc/cntrelationshipgroup.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/inc/cntsymbiandatabase.h b/plugins/contacts/symbian/inc/cntsymbiandatabase.h index 69944de777..64fde3c2d9 100644 --- a/plugins/contacts/symbian/inc/cntsymbiandatabase.h +++ b/plugins/contacts/symbian/inc/cntsymbiandatabase.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/inc/cntsymbianengine.h b/plugins/contacts/symbian/inc/cntsymbianengine.h index 8d2721ee82..55b9414afe 100644 --- a/plugins/contacts/symbian/inc/cntsymbianengine.h +++ b/plugins/contacts/symbian/inc/cntsymbianengine.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/inc/cntsymbiantransformerror.h b/plugins/contacts/symbian/inc/cntsymbiantransformerror.h index c66aa95d0a..15a3e226d7 100644 --- a/plugins/contacts/symbian/inc/cntsymbiantransformerror.h +++ b/plugins/contacts/symbian/inc/cntsymbiantransformerror.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/inc/filtering/cntabstractcontactfilter.h b/plugins/contacts/symbian/inc/filtering/cntabstractcontactfilter.h index c04048d61b..6e9fe7db23 100644 --- a/plugins/contacts/symbian/inc/filtering/cntabstractcontactfilter.h +++ b/plugins/contacts/symbian/inc/filtering/cntabstractcontactfilter.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/inc/filtering/cntabstractcontactsorter.h b/plugins/contacts/symbian/inc/filtering/cntabstractcontactsorter.h index 18edd7ef84..c8b88c28ec 100644 --- a/plugins/contacts/symbian/inc/filtering/cntabstractcontactsorter.h +++ b/plugins/contacts/symbian/inc/filtering/cntabstractcontactsorter.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/inc/filtering/cntdbinfo.h b/plugins/contacts/symbian/inc/filtering/cntdbinfo.h index 61b9492981..3bc6cbdd24 100644 --- a/plugins/contacts/symbian/inc/filtering/cntdbinfo.h +++ b/plugins/contacts/symbian/inc/filtering/cntdbinfo.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/inc/filtering/cntdisplaylabelsqlfilter.h b/plugins/contacts/symbian/inc/filtering/cntdisplaylabelsqlfilter.h index b8d676e858..8cd42015c2 100644 --- a/plugins/contacts/symbian/inc/filtering/cntdisplaylabelsqlfilter.h +++ b/plugins/contacts/symbian/inc/filtering/cntdisplaylabelsqlfilter.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/inc/filtering/cntfilterabstract.h b/plugins/contacts/symbian/inc/filtering/cntfilterabstract.h index 46d07a1cd3..7a8c1e1666 100644 --- a/plugins/contacts/symbian/inc/filtering/cntfilterabstract.h +++ b/plugins/contacts/symbian/inc/filtering/cntfilterabstract.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/inc/filtering/cntfilterchangelog.h b/plugins/contacts/symbian/inc/filtering/cntfilterchangelog.h index 8587dcb2e9..5b11b80b3b 100644 --- a/plugins/contacts/symbian/inc/filtering/cntfilterchangelog.h +++ b/plugins/contacts/symbian/inc/filtering/cntfilterchangelog.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/inc/filtering/cntfilterdefault.h b/plugins/contacts/symbian/inc/filtering/cntfilterdefault.h index 19c259eb9e..2f53ce77f3 100644 --- a/plugins/contacts/symbian/inc/filtering/cntfilterdefault.h +++ b/plugins/contacts/symbian/inc/filtering/cntfilterdefault.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/inc/filtering/cntfilterdetail.h b/plugins/contacts/symbian/inc/filtering/cntfilterdetail.h index 9170834d7b..1fc37434e6 100644 --- a/plugins/contacts/symbian/inc/filtering/cntfilterdetail.h +++ b/plugins/contacts/symbian/inc/filtering/cntfilterdetail.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/inc/filtering/cntfilterdetaildisplaylabel.h b/plugins/contacts/symbian/inc/filtering/cntfilterdetaildisplaylabel.h index 11cd8c8056..b60aadb91f 100644 --- a/plugins/contacts/symbian/inc/filtering/cntfilterdetaildisplaylabel.h +++ b/plugins/contacts/symbian/inc/filtering/cntfilterdetaildisplaylabel.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/inc/filtering/cntfilterdetailrange.h b/plugins/contacts/symbian/inc/filtering/cntfilterdetailrange.h index 5c4a42b802..4ba3e8fbd8 100644 --- a/plugins/contacts/symbian/inc/filtering/cntfilterdetailrange.h +++ b/plugins/contacts/symbian/inc/filtering/cntfilterdetailrange.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/inc/filtering/cntfilterintersection.h b/plugins/contacts/symbian/inc/filtering/cntfilterintersection.h index a07397b9a0..c7b9262aa5 100644 --- a/plugins/contacts/symbian/inc/filtering/cntfilterintersection.h +++ b/plugins/contacts/symbian/inc/filtering/cntfilterintersection.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/inc/filtering/cntfilterinvalid.h b/plugins/contacts/symbian/inc/filtering/cntfilterinvalid.h index 33de1c336f..262c9ebb36 100644 --- a/plugins/contacts/symbian/inc/filtering/cntfilterinvalid.h +++ b/plugins/contacts/symbian/inc/filtering/cntfilterinvalid.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/inc/filtering/cntfilterlocalid.h b/plugins/contacts/symbian/inc/filtering/cntfilterlocalid.h index 63fd1cb8a7..f39e0d527e 100644 --- a/plugins/contacts/symbian/inc/filtering/cntfilterlocalid.h +++ b/plugins/contacts/symbian/inc/filtering/cntfilterlocalid.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/inc/filtering/cntfilterrelationship.h b/plugins/contacts/symbian/inc/filtering/cntfilterrelationship.h index 13fa6dd4d2..9df8735651 100644 --- a/plugins/contacts/symbian/inc/filtering/cntfilterrelationship.h +++ b/plugins/contacts/symbian/inc/filtering/cntfilterrelationship.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/inc/filtering/cntfilterunion.h b/plugins/contacts/symbian/inc/filtering/cntfilterunion.h index 839d8d16ba..7eaa1cc01c 100644 --- a/plugins/contacts/symbian/inc/filtering/cntfilterunion.h +++ b/plugins/contacts/symbian/inc/filtering/cntfilterunion.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/inc/filtering/cntsqlsearch.h b/plugins/contacts/symbian/inc/filtering/cntsqlsearch.h index dbc41e3e34..b283dff7f3 100644 --- a/plugins/contacts/symbian/inc/filtering/cntsqlsearch.h +++ b/plugins/contacts/symbian/inc/filtering/cntsqlsearch.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/inc/filtering/cntsymbianfilterdbms.h b/plugins/contacts/symbian/inc/filtering/cntsymbianfilterdbms.h index bf2f817423..8230f7e942 100644 --- a/plugins/contacts/symbian/inc/filtering/cntsymbianfilterdbms.h +++ b/plugins/contacts/symbian/inc/filtering/cntsymbianfilterdbms.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/inc/filtering/cntsymbianfiltersql.h b/plugins/contacts/symbian/inc/filtering/cntsymbianfiltersql.h index 2f6b43478d..7ba6aab86d 100644 --- a/plugins/contacts/symbian/inc/filtering/cntsymbianfiltersql.h +++ b/plugins/contacts/symbian/inc/filtering/cntsymbianfiltersql.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/inc/filtering/cntsymbiansorterdbms.h b/plugins/contacts/symbian/inc/filtering/cntsymbiansorterdbms.h index 711ed777a8..0d04c8ce76 100644 --- a/plugins/contacts/symbian/inc/filtering/cntsymbiansorterdbms.h +++ b/plugins/contacts/symbian/inc/filtering/cntsymbiansorterdbms.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/inc/filtering/cntsymbiansrvconnection.h b/plugins/contacts/symbian/inc/filtering/cntsymbiansrvconnection.h index 11cc8423bb..b0246b51d9 100644 --- a/plugins/contacts/symbian/inc/filtering/cntsymbiansrvconnection.h +++ b/plugins/contacts/symbian/inc/filtering/cntsymbiansrvconnection.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/inc/transform/cntthumbnailcreator.h b/plugins/contacts/symbian/inc/transform/cntthumbnailcreator.h index 9f74c5131a..8a13d54451 100644 --- a/plugins/contacts/symbian/inc/transform/cntthumbnailcreator.h +++ b/plugins/contacts/symbian/inc/transform/cntthumbnailcreator.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/inc/transform/cnttransformaddress.h b/plugins/contacts/symbian/inc/transform/cnttransformaddress.h index 78f9c8d8c1..cc75db48ab 100644 --- a/plugins/contacts/symbian/inc/transform/cnttransformaddress.h +++ b/plugins/contacts/symbian/inc/transform/cnttransformaddress.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/inc/transform/cnttransformanniversary.h b/plugins/contacts/symbian/inc/transform/cnttransformanniversary.h index 7b3d70f67c..c4d7164e86 100644 --- a/plugins/contacts/symbian/inc/transform/cnttransformanniversary.h +++ b/plugins/contacts/symbian/inc/transform/cnttransformanniversary.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/inc/transform/cnttransformanniversarysimple.h b/plugins/contacts/symbian/inc/transform/cnttransformanniversarysimple.h index ea218ea210..079c1497c1 100644 --- a/plugins/contacts/symbian/inc/transform/cnttransformanniversarysimple.h +++ b/plugins/contacts/symbian/inc/transform/cnttransformanniversarysimple.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/inc/transform/cnttransformavatar.h b/plugins/contacts/symbian/inc/transform/cnttransformavatar.h index bc99416c0e..41807ef6e5 100644 --- a/plugins/contacts/symbian/inc/transform/cnttransformavatar.h +++ b/plugins/contacts/symbian/inc/transform/cnttransformavatar.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/inc/transform/cnttransformbirthday.h b/plugins/contacts/symbian/inc/transform/cnttransformbirthday.h index c2927ad132..eb17ee4984 100644 --- a/plugins/contacts/symbian/inc/transform/cnttransformbirthday.h +++ b/plugins/contacts/symbian/inc/transform/cnttransformbirthday.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/inc/transform/cnttransformcontact.h b/plugins/contacts/symbian/inc/transform/cnttransformcontact.h index 2d886e0b20..c8b6502a99 100644 --- a/plugins/contacts/symbian/inc/transform/cnttransformcontact.h +++ b/plugins/contacts/symbian/inc/transform/cnttransformcontact.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/inc/transform/cnttransformcontactdata.h b/plugins/contacts/symbian/inc/transform/cnttransformcontactdata.h index 524dd04329..63b57784db 100644 --- a/plugins/contacts/symbian/inc/transform/cnttransformcontactdata.h +++ b/plugins/contacts/symbian/inc/transform/cnttransformcontactdata.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/inc/transform/cnttransformemail.h b/plugins/contacts/symbian/inc/transform/cnttransformemail.h index 0c1260d0f3..590dee9ed1 100644 --- a/plugins/contacts/symbian/inc/transform/cnttransformemail.h +++ b/plugins/contacts/symbian/inc/transform/cnttransformemail.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/inc/transform/cnttransformempty.h b/plugins/contacts/symbian/inc/transform/cnttransformempty.h index 8d0eaefe1b..ec8619a3a2 100644 --- a/plugins/contacts/symbian/inc/transform/cnttransformempty.h +++ b/plugins/contacts/symbian/inc/transform/cnttransformempty.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/inc/transform/cnttransformfamily.h b/plugins/contacts/symbian/inc/transform/cnttransformfamily.h index 27db57d470..328e4ea5f8 100644 --- a/plugins/contacts/symbian/inc/transform/cnttransformfamily.h +++ b/plugins/contacts/symbian/inc/transform/cnttransformfamily.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/inc/transform/cnttransformgender.h b/plugins/contacts/symbian/inc/transform/cnttransformgender.h index 8104c25346..ee9b74a03f 100644 --- a/plugins/contacts/symbian/inc/transform/cnttransformgender.h +++ b/plugins/contacts/symbian/inc/transform/cnttransformgender.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/inc/transform/cnttransformgeolocation.h b/plugins/contacts/symbian/inc/transform/cnttransformgeolocation.h index c729778a6a..cda87daabe 100644 --- a/plugins/contacts/symbian/inc/transform/cnttransformgeolocation.h +++ b/plugins/contacts/symbian/inc/transform/cnttransformgeolocation.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/inc/transform/cnttransformname.h b/plugins/contacts/symbian/inc/transform/cnttransformname.h index cdea0420f7..fa62375983 100644 --- a/plugins/contacts/symbian/inc/transform/cnttransformname.h +++ b/plugins/contacts/symbian/inc/transform/cnttransformname.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/inc/transform/cnttransformnickname.h b/plugins/contacts/symbian/inc/transform/cnttransformnickname.h index 0121445e8f..2309e6ac48 100644 --- a/plugins/contacts/symbian/inc/transform/cnttransformnickname.h +++ b/plugins/contacts/symbian/inc/transform/cnttransformnickname.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/inc/transform/cnttransformnote.h b/plugins/contacts/symbian/inc/transform/cnttransformnote.h index e98c8843a4..39f124b6f7 100644 --- a/plugins/contacts/symbian/inc/transform/cnttransformnote.h +++ b/plugins/contacts/symbian/inc/transform/cnttransformnote.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/inc/transform/cnttransformonlineaccount.h b/plugins/contacts/symbian/inc/transform/cnttransformonlineaccount.h index 1413a7879d..78db255724 100644 --- a/plugins/contacts/symbian/inc/transform/cnttransformonlineaccount.h +++ b/plugins/contacts/symbian/inc/transform/cnttransformonlineaccount.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/inc/transform/cnttransformorganisation.h b/plugins/contacts/symbian/inc/transform/cnttransformorganisation.h index 0ac0bb6ec5..3d237c5dac 100644 --- a/plugins/contacts/symbian/inc/transform/cnttransformorganisation.h +++ b/plugins/contacts/symbian/inc/transform/cnttransformorganisation.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/inc/transform/cnttransformphonenumber.h b/plugins/contacts/symbian/inc/transform/cnttransformphonenumber.h index 5b28511b73..f65bba30bb 100644 --- a/plugins/contacts/symbian/inc/transform/cnttransformphonenumber.h +++ b/plugins/contacts/symbian/inc/transform/cnttransformphonenumber.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/inc/transform/cnttransformringtone.h b/plugins/contacts/symbian/inc/transform/cnttransformringtone.h index a77ad37114..08e7e4acbb 100644 --- a/plugins/contacts/symbian/inc/transform/cnttransformringtone.h +++ b/plugins/contacts/symbian/inc/transform/cnttransformringtone.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/inc/transform/cnttransformsynctarget.h b/plugins/contacts/symbian/inc/transform/cnttransformsynctarget.h index b0199685e0..cdd24a032c 100644 --- a/plugins/contacts/symbian/inc/transform/cnttransformsynctarget.h +++ b/plugins/contacts/symbian/inc/transform/cnttransformsynctarget.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/inc/transform/cnttransformthumbnail.h b/plugins/contacts/symbian/inc/transform/cnttransformthumbnail.h index edd55696d8..4a3ee8f4ea 100644 --- a/plugins/contacts/symbian/inc/transform/cnttransformthumbnail.h +++ b/plugins/contacts/symbian/inc/transform/cnttransformthumbnail.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/inc/transform/cnttransformurl.h b/plugins/contacts/symbian/inc/transform/cnttransformurl.h index 67877423f9..e1eed29be9 100644 --- a/plugins/contacts/symbian/inc/transform/cnttransformurl.h +++ b/plugins/contacts/symbian/inc/transform/cnttransformurl.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/rss/cntmodel.rss b/plugins/contacts/symbian/rss/cntmodel.rss index 29d3a18c5d..648978c011 100644 --- a/plugins/contacts/symbian/rss/cntmodel.rss +++ b/plugins/contacts/symbian/rss/cntmodel.rss @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/rss/cntmodelextuids.h b/plugins/contacts/symbian/rss/cntmodelextuids.h index fa7c1c8f34..9cdadaad47 100644 --- a/plugins/contacts/symbian/rss/cntmodelextuids.h +++ b/plugins/contacts/symbian/rss/cntmodelextuids.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/rss/cntmodelextuids.hrh b/plugins/contacts/symbian/rss/cntmodelextuids.hrh index f5e6d2ae45..5980bad741 100644 --- a/plugins/contacts/symbian/rss/cntmodelextuids.hrh +++ b/plugins/contacts/symbian/rss/cntmodelextuids.hrh @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/rss/fieldnames.loc b/plugins/contacts/symbian/rss/fieldnames.loc index dcd0049956..8257b25236 100644 --- a/plugins/contacts/symbian/rss/fieldnames.loc +++ b/plugins/contacts/symbian/rss/fieldnames.loc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/src/cntabstractrelationship.cpp b/plugins/contacts/symbian/src/cntabstractrelationship.cpp index ea9de6650e..e94349451b 100644 --- a/plugins/contacts/symbian/src/cntabstractrelationship.cpp +++ b/plugins/contacts/symbian/src/cntabstractrelationship.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/src/cntdisplaylabel.cpp b/plugins/contacts/symbian/src/cntdisplaylabel.cpp index f77cb053fd..8c934bea96 100644 --- a/plugins/contacts/symbian/src/cntdisplaylabel.cpp +++ b/plugins/contacts/symbian/src/cntdisplaylabel.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/src/cntrelationship.cpp b/plugins/contacts/symbian/src/cntrelationship.cpp index fdd64117ee..1d216d3749 100644 --- a/plugins/contacts/symbian/src/cntrelationship.cpp +++ b/plugins/contacts/symbian/src/cntrelationship.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/src/cntrelationshipgroup.cpp b/plugins/contacts/symbian/src/cntrelationshipgroup.cpp index d059815711..df822ecc1a 100644 --- a/plugins/contacts/symbian/src/cntrelationshipgroup.cpp +++ b/plugins/contacts/symbian/src/cntrelationshipgroup.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/src/cntsymbiandatabase.cpp b/plugins/contacts/symbian/src/cntsymbiandatabase.cpp index 54d788979f..cb712f8bbc 100644 --- a/plugins/contacts/symbian/src/cntsymbiandatabase.cpp +++ b/plugins/contacts/symbian/src/cntsymbiandatabase.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/src/cntsymbianengine.cpp b/plugins/contacts/symbian/src/cntsymbianengine.cpp index 585fe8fc4b..c7e146076a 100644 --- a/plugins/contacts/symbian/src/cntsymbianengine.cpp +++ b/plugins/contacts/symbian/src/cntsymbianengine.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/src/cntsymbiantransformerror.cpp b/plugins/contacts/symbian/src/cntsymbiantransformerror.cpp index c8566c277c..c44e683e67 100644 --- a/plugins/contacts/symbian/src/cntsymbiantransformerror.cpp +++ b/plugins/contacts/symbian/src/cntsymbiantransformerror.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/src/filtering/cntdbinfo.cpp b/plugins/contacts/symbian/src/filtering/cntdbinfo.cpp index 7eccae8493..0c84e87837 100644 --- a/plugins/contacts/symbian/src/filtering/cntdbinfo.cpp +++ b/plugins/contacts/symbian/src/filtering/cntdbinfo.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/src/filtering/cntdisplaylabelsqlfilter.cpp b/plugins/contacts/symbian/src/filtering/cntdisplaylabelsqlfilter.cpp index 209991c958..8828335b43 100644 --- a/plugins/contacts/symbian/src/filtering/cntdisplaylabelsqlfilter.cpp +++ b/plugins/contacts/symbian/src/filtering/cntdisplaylabelsqlfilter.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/src/filtering/cntfilterchangelog.cpp b/plugins/contacts/symbian/src/filtering/cntfilterchangelog.cpp index 783d32386f..81843c069a 100644 --- a/plugins/contacts/symbian/src/filtering/cntfilterchangelog.cpp +++ b/plugins/contacts/symbian/src/filtering/cntfilterchangelog.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/src/filtering/cntfilterdefault.cpp b/plugins/contacts/symbian/src/filtering/cntfilterdefault.cpp index 151846d873..dbe65465fc 100644 --- a/plugins/contacts/symbian/src/filtering/cntfilterdefault.cpp +++ b/plugins/contacts/symbian/src/filtering/cntfilterdefault.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/src/filtering/cntfilterdetail.cpp b/plugins/contacts/symbian/src/filtering/cntfilterdetail.cpp index d1f60463c1..c6e71df3b7 100644 --- a/plugins/contacts/symbian/src/filtering/cntfilterdetail.cpp +++ b/plugins/contacts/symbian/src/filtering/cntfilterdetail.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/src/filtering/cntfilterdetaildisplaylabel.cpp b/plugins/contacts/symbian/src/filtering/cntfilterdetaildisplaylabel.cpp index 45d6c77973..e636b340ea 100644 --- a/plugins/contacts/symbian/src/filtering/cntfilterdetaildisplaylabel.cpp +++ b/plugins/contacts/symbian/src/filtering/cntfilterdetaildisplaylabel.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/src/filtering/cntfilterdetailrange.cpp b/plugins/contacts/symbian/src/filtering/cntfilterdetailrange.cpp index 7cf14477dc..b776632f95 100644 --- a/plugins/contacts/symbian/src/filtering/cntfilterdetailrange.cpp +++ b/plugins/contacts/symbian/src/filtering/cntfilterdetailrange.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/src/filtering/cntfilterintersection.cpp b/plugins/contacts/symbian/src/filtering/cntfilterintersection.cpp index 507bfd634a..d27f1be13e 100644 --- a/plugins/contacts/symbian/src/filtering/cntfilterintersection.cpp +++ b/plugins/contacts/symbian/src/filtering/cntfilterintersection.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/src/filtering/cntfilterinvalid.cpp b/plugins/contacts/symbian/src/filtering/cntfilterinvalid.cpp index 117b68450b..7dec0190e0 100644 --- a/plugins/contacts/symbian/src/filtering/cntfilterinvalid.cpp +++ b/plugins/contacts/symbian/src/filtering/cntfilterinvalid.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/src/filtering/cntfilterlocalid.cpp b/plugins/contacts/symbian/src/filtering/cntfilterlocalid.cpp index 8f8e9ac8a5..1fb7cefb9a 100644 --- a/plugins/contacts/symbian/src/filtering/cntfilterlocalid.cpp +++ b/plugins/contacts/symbian/src/filtering/cntfilterlocalid.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/src/filtering/cntfilterrelationship.cpp b/plugins/contacts/symbian/src/filtering/cntfilterrelationship.cpp index 138614da08..3bb493de1e 100644 --- a/plugins/contacts/symbian/src/filtering/cntfilterrelationship.cpp +++ b/plugins/contacts/symbian/src/filtering/cntfilterrelationship.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/src/filtering/cntfilterunion.cpp b/plugins/contacts/symbian/src/filtering/cntfilterunion.cpp index 06b274cb96..5bc43a1ae8 100644 --- a/plugins/contacts/symbian/src/filtering/cntfilterunion.cpp +++ b/plugins/contacts/symbian/src/filtering/cntfilterunion.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/src/filtering/cntsqlsearch.cpp b/plugins/contacts/symbian/src/filtering/cntsqlsearch.cpp index c04914383a..1b0711f46a 100644 --- a/plugins/contacts/symbian/src/filtering/cntsqlsearch.cpp +++ b/plugins/contacts/symbian/src/filtering/cntsqlsearch.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/src/filtering/cntsymbianfilterdbms.cpp b/plugins/contacts/symbian/src/filtering/cntsymbianfilterdbms.cpp index 5c2a169abc..d5f3f6cb10 100644 --- a/plugins/contacts/symbian/src/filtering/cntsymbianfilterdbms.cpp +++ b/plugins/contacts/symbian/src/filtering/cntsymbianfilterdbms.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/src/filtering/cntsymbianfiltersql.cpp b/plugins/contacts/symbian/src/filtering/cntsymbianfiltersql.cpp index f8450536bd..63ad1ccfd1 100644 --- a/plugins/contacts/symbian/src/filtering/cntsymbianfiltersql.cpp +++ b/plugins/contacts/symbian/src/filtering/cntsymbianfiltersql.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/src/filtering/cntsymbiansorterdbms.cpp b/plugins/contacts/symbian/src/filtering/cntsymbiansorterdbms.cpp index 7075174ad4..539799635c 100644 --- a/plugins/contacts/symbian/src/filtering/cntsymbiansorterdbms.cpp +++ b/plugins/contacts/symbian/src/filtering/cntsymbiansorterdbms.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/src/filtering/cntsymbiansrvconnection.cpp b/plugins/contacts/symbian/src/filtering/cntsymbiansrvconnection.cpp index f994bb54a7..654cdebafb 100644 --- a/plugins/contacts/symbian/src/filtering/cntsymbiansrvconnection.cpp +++ b/plugins/contacts/symbian/src/filtering/cntsymbiansrvconnection.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/src/transform/cntthumbnailcreator.cpp b/plugins/contacts/symbian/src/transform/cntthumbnailcreator.cpp index 418ad1dd53..be73a5f206 100644 --- a/plugins/contacts/symbian/src/transform/cntthumbnailcreator.cpp +++ b/plugins/contacts/symbian/src/transform/cntthumbnailcreator.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/src/transform/cnttransformaddress.cpp b/plugins/contacts/symbian/src/transform/cnttransformaddress.cpp index 026a78bc1f..f485f15248 100644 --- a/plugins/contacts/symbian/src/transform/cnttransformaddress.cpp +++ b/plugins/contacts/symbian/src/transform/cnttransformaddress.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/src/transform/cnttransformanniversary.cpp b/plugins/contacts/symbian/src/transform/cnttransformanniversary.cpp index 47944da796..31a4891ba3 100644 --- a/plugins/contacts/symbian/src/transform/cnttransformanniversary.cpp +++ b/plugins/contacts/symbian/src/transform/cnttransformanniversary.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/src/transform/cnttransformanniversarysimple.cpp b/plugins/contacts/symbian/src/transform/cnttransformanniversarysimple.cpp index f37df3df5b..a4f7b7a603 100644 --- a/plugins/contacts/symbian/src/transform/cnttransformanniversarysimple.cpp +++ b/plugins/contacts/symbian/src/transform/cnttransformanniversarysimple.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/src/transform/cnttransformavatar.cpp b/plugins/contacts/symbian/src/transform/cnttransformavatar.cpp index b6e9b70a00..93eec4366f 100644 --- a/plugins/contacts/symbian/src/transform/cnttransformavatar.cpp +++ b/plugins/contacts/symbian/src/transform/cnttransformavatar.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/src/transform/cnttransformbirthday.cpp b/plugins/contacts/symbian/src/transform/cnttransformbirthday.cpp index 538bf16c64..624eee3b75 100644 --- a/plugins/contacts/symbian/src/transform/cnttransformbirthday.cpp +++ b/plugins/contacts/symbian/src/transform/cnttransformbirthday.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/src/transform/cnttransformcontact.cpp b/plugins/contacts/symbian/src/transform/cnttransformcontact.cpp index 202b8b3255..cbcdaac878 100644 --- a/plugins/contacts/symbian/src/transform/cnttransformcontact.cpp +++ b/plugins/contacts/symbian/src/transform/cnttransformcontact.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/src/transform/cnttransformcontactdata.cpp b/plugins/contacts/symbian/src/transform/cnttransformcontactdata.cpp index 9f991f5bd1..6f849c8205 100644 --- a/plugins/contacts/symbian/src/transform/cnttransformcontactdata.cpp +++ b/plugins/contacts/symbian/src/transform/cnttransformcontactdata.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/src/transform/cnttransformemail.cpp b/plugins/contacts/symbian/src/transform/cnttransformemail.cpp index 6cbe5ab648..b53d790cef 100644 --- a/plugins/contacts/symbian/src/transform/cnttransformemail.cpp +++ b/plugins/contacts/symbian/src/transform/cnttransformemail.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/src/transform/cnttransformempty.cpp b/plugins/contacts/symbian/src/transform/cnttransformempty.cpp index 4c9e2153a5..2c0250c5bb 100644 --- a/plugins/contacts/symbian/src/transform/cnttransformempty.cpp +++ b/plugins/contacts/symbian/src/transform/cnttransformempty.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/src/transform/cnttransformfamily.cpp b/plugins/contacts/symbian/src/transform/cnttransformfamily.cpp index a4b13f0e79..4f050c001f 100644 --- a/plugins/contacts/symbian/src/transform/cnttransformfamily.cpp +++ b/plugins/contacts/symbian/src/transform/cnttransformfamily.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/src/transform/cnttransformgender.cpp b/plugins/contacts/symbian/src/transform/cnttransformgender.cpp index 667977ec2a..b14ddab580 100644 --- a/plugins/contacts/symbian/src/transform/cnttransformgender.cpp +++ b/plugins/contacts/symbian/src/transform/cnttransformgender.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/src/transform/cnttransformgeolocation.cpp b/plugins/contacts/symbian/src/transform/cnttransformgeolocation.cpp index 2be2df098c..175b6bb18a 100644 --- a/plugins/contacts/symbian/src/transform/cnttransformgeolocation.cpp +++ b/plugins/contacts/symbian/src/transform/cnttransformgeolocation.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/src/transform/cnttransformname.cpp b/plugins/contacts/symbian/src/transform/cnttransformname.cpp index 5fc8fc5f19..2d5c228037 100644 --- a/plugins/contacts/symbian/src/transform/cnttransformname.cpp +++ b/plugins/contacts/symbian/src/transform/cnttransformname.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/src/transform/cnttransformnickname.cpp b/plugins/contacts/symbian/src/transform/cnttransformnickname.cpp index befb59b133..7a3adaa500 100644 --- a/plugins/contacts/symbian/src/transform/cnttransformnickname.cpp +++ b/plugins/contacts/symbian/src/transform/cnttransformnickname.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/src/transform/cnttransformnote.cpp b/plugins/contacts/symbian/src/transform/cnttransformnote.cpp index 37ce20fbad..552b183134 100644 --- a/plugins/contacts/symbian/src/transform/cnttransformnote.cpp +++ b/plugins/contacts/symbian/src/transform/cnttransformnote.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/src/transform/cnttransformonlineaccount.cpp b/plugins/contacts/symbian/src/transform/cnttransformonlineaccount.cpp index fbbbf79eee..d4ef7c5a37 100644 --- a/plugins/contacts/symbian/src/transform/cnttransformonlineaccount.cpp +++ b/plugins/contacts/symbian/src/transform/cnttransformonlineaccount.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/src/transform/cnttransformorganisation.cpp b/plugins/contacts/symbian/src/transform/cnttransformorganisation.cpp index 408148b2e2..fb36d9a052 100644 --- a/plugins/contacts/symbian/src/transform/cnttransformorganisation.cpp +++ b/plugins/contacts/symbian/src/transform/cnttransformorganisation.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/src/transform/cnttransformphonenumber.cpp b/plugins/contacts/symbian/src/transform/cnttransformphonenumber.cpp index db912b96ae..71739230f6 100644 --- a/plugins/contacts/symbian/src/transform/cnttransformphonenumber.cpp +++ b/plugins/contacts/symbian/src/transform/cnttransformphonenumber.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/src/transform/cnttransformringtone.cpp b/plugins/contacts/symbian/src/transform/cnttransformringtone.cpp index 7604ee38a2..228db0010e 100644 --- a/plugins/contacts/symbian/src/transform/cnttransformringtone.cpp +++ b/plugins/contacts/symbian/src/transform/cnttransformringtone.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/src/transform/cnttransformsynctarget.cpp b/plugins/contacts/symbian/src/transform/cnttransformsynctarget.cpp index 90f77b2f67..7d6967b406 100644 --- a/plugins/contacts/symbian/src/transform/cnttransformsynctarget.cpp +++ b/plugins/contacts/symbian/src/transform/cnttransformsynctarget.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/src/transform/cnttransformthumbnail.cpp b/plugins/contacts/symbian/src/transform/cnttransformthumbnail.cpp index 9a9792b89d..aa3d18b5a6 100644 --- a/plugins/contacts/symbian/src/transform/cnttransformthumbnail.cpp +++ b/plugins/contacts/symbian/src/transform/cnttransformthumbnail.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/src/transform/cnttransformurl.cpp b/plugins/contacts/symbian/src/transform/cnttransformurl.cpp index 9a2cf23be5..e8088c670b 100644 --- a/plugins/contacts/symbian/src/transform/cnttransformurl.cpp +++ b/plugins/contacts/symbian/src/transform/cnttransformurl.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/symbian.pro b/plugins/contacts/symbian/symbian.pro index b80c565922..86943deaf3 100644 --- a/plugins/contacts/symbian/symbian.pro +++ b/plugins/contacts/symbian/symbian.pro @@ -152,7 +152,3 @@ symbian: { symbianplugin.path = $${QT_PLUGINS_BASE_DIR}/$${PLUGIN_TYPE} DEPLOYMENT += symbianplugin } - -target.path=$${QT_MOBILITY_PREFIX}/plugins/$${PLUGIN_TYPE} -maemo6:target.path=$$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE} -INSTALLS+=target diff --git a/plugins/contacts/symbian/tsrc/performance/performance.cpp b/plugins/contacts/symbian/tsrc/performance/performance.cpp index afe3f87f68..2dd77e9b54 100644 --- a/plugins/contacts/symbian/tsrc/performance/performance.cpp +++ b/plugins/contacts/symbian/tsrc/performance/performance.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/tsrc/performance/performance.h b/plugins/contacts/symbian/tsrc/performance/performance.h index e298e47947..15a717ed29 100644 --- a/plugins/contacts/symbian/tsrc/performance/performance.h +++ b/plugins/contacts/symbian/tsrc/performance/performance.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/tsrc/tst_cntfilteringdbms/tst_cntfilteringdbms.cpp b/plugins/contacts/symbian/tsrc/tst_cntfilteringdbms/tst_cntfilteringdbms.cpp index 0eaa0fe6a8..b3503fe163 100644 --- a/plugins/contacts/symbian/tsrc/tst_cntfilteringdbms/tst_cntfilteringdbms.cpp +++ b/plugins/contacts/symbian/tsrc/tst_cntfilteringdbms/tst_cntfilteringdbms.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/tsrc/tst_qcontactmanagersymbian/tst_qcontactmanagersymbian.cpp b/plugins/contacts/symbian/tsrc/tst_qcontactmanagersymbian/tst_qcontactmanagersymbian.cpp index f177d4ff70..d566dd75b6 100644 --- a/plugins/contacts/symbian/tsrc/tst_qcontactmanagersymbian/tst_qcontactmanagersymbian.cpp +++ b/plugins/contacts/symbian/tsrc/tst_qcontactmanagersymbian/tst_qcontactmanagersymbian.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/tsrc/ut_symbian/main.cpp b/plugins/contacts/symbian/tsrc/ut_symbian/main.cpp index 7da4e4db04..b2da94129a 100644 --- a/plugins/contacts/symbian/tsrc/ut_symbian/main.cpp +++ b/plugins/contacts/symbian/tsrc/ut_symbian/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/tsrc/ut_symbian/mock_cntdb.cpp b/plugins/contacts/symbian/tsrc/ut_symbian/mock_cntdb.cpp index 2cb173183c..077c9cd5c8 100644 --- a/plugins/contacts/symbian/tsrc/ut_symbian/mock_cntdb.cpp +++ b/plugins/contacts/symbian/tsrc/ut_symbian/mock_cntdb.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/tsrc/ut_symbian/mock_cntdb.h b/plugins/contacts/symbian/tsrc/ut_symbian/mock_cntdb.h index 3627eadee2..a51a5965db 100644 --- a/plugins/contacts/symbian/tsrc/ut_symbian/mock_cntdb.h +++ b/plugins/contacts/symbian/tsrc/ut_symbian/mock_cntdb.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/tsrc/ut_symbian/testrunner.cpp b/plugins/contacts/symbian/tsrc/ut_symbian/testrunner.cpp index a31493b2d2..d171a83d62 100644 --- a/plugins/contacts/symbian/tsrc/ut_symbian/testrunner.cpp +++ b/plugins/contacts/symbian/tsrc/ut_symbian/testrunner.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/tsrc/ut_symbian/testrunner.h b/plugins/contacts/symbian/tsrc/ut_symbian/testrunner.h index 890b98e75e..978a8d73b7 100644 --- a/plugins/contacts/symbian/tsrc/ut_symbian/testrunner.h +++ b/plugins/contacts/symbian/tsrc/ut_symbian/testrunner.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/tsrc/ut_symbian/ut_cntfiltering.cpp b/plugins/contacts/symbian/tsrc/ut_symbian/ut_cntfiltering.cpp index a8c5206cdb..eba99966ea 100644 --- a/plugins/contacts/symbian/tsrc/ut_symbian/ut_cntfiltering.cpp +++ b/plugins/contacts/symbian/tsrc/ut_symbian/ut_cntfiltering.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/tsrc/ut_symbian/ut_cntfiltering.h b/plugins/contacts/symbian/tsrc/ut_symbian/ut_cntfiltering.h index b4786b7420..8434d61de0 100644 --- a/plugins/contacts/symbian/tsrc/ut_symbian/ut_cntfiltering.h +++ b/plugins/contacts/symbian/tsrc/ut_symbian/ut_cntfiltering.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/tsrc/ut_symbian/ut_cntrelationship.cpp b/plugins/contacts/symbian/tsrc/ut_symbian/ut_cntrelationship.cpp index 3709d195f3..776c264433 100644 --- a/plugins/contacts/symbian/tsrc/ut_symbian/ut_cntrelationship.cpp +++ b/plugins/contacts/symbian/tsrc/ut_symbian/ut_cntrelationship.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/tsrc/ut_symbian/ut_cntrelationship.h b/plugins/contacts/symbian/tsrc/ut_symbian/ut_cntrelationship.h index fceb991983..cbd7305376 100644 --- a/plugins/contacts/symbian/tsrc/ut_symbian/ut_cntrelationship.h +++ b/plugins/contacts/symbian/tsrc/ut_symbian/ut_cntrelationship.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/tsrc/ut_symbian/ut_cntsqlsearch.cpp b/plugins/contacts/symbian/tsrc/ut_symbian/ut_cntsqlsearch.cpp index bd55eb5169..d6503212eb 100644 --- a/plugins/contacts/symbian/tsrc/ut_symbian/ut_cntsqlsearch.cpp +++ b/plugins/contacts/symbian/tsrc/ut_symbian/ut_cntsqlsearch.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/tsrc/ut_symbian/ut_cntsqlsearch.h b/plugins/contacts/symbian/tsrc/ut_symbian/ut_cntsqlsearch.h index fb3c7f48eb..efce21cc51 100644 --- a/plugins/contacts/symbian/tsrc/ut_symbian/ut_cntsqlsearch.h +++ b/plugins/contacts/symbian/tsrc/ut_symbian/ut_cntsqlsearch.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/tsrc/ut_symbian/ut_cntsymbiandatabase.cpp b/plugins/contacts/symbian/tsrc/ut_symbian/ut_cntsymbiandatabase.cpp index a8686adb15..bbb7badf98 100644 --- a/plugins/contacts/symbian/tsrc/ut_symbian/ut_cntsymbiandatabase.cpp +++ b/plugins/contacts/symbian/tsrc/ut_symbian/ut_cntsymbiandatabase.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/tsrc/ut_symbian/ut_cntsymbiandatabase.h b/plugins/contacts/symbian/tsrc/ut_symbian/ut_cntsymbiandatabase.h index f9dad0e128..96cf46fbae 100644 --- a/plugins/contacts/symbian/tsrc/ut_symbian/ut_cntsymbiandatabase.h +++ b/plugins/contacts/symbian/tsrc/ut_symbian/ut_cntsymbiandatabase.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/tsrc/ut_symbian/ut_cntsymbianengine.cpp b/plugins/contacts/symbian/tsrc/ut_symbian/ut_cntsymbianengine.cpp index 2f97d3c696..2e10b3a4aa 100644 --- a/plugins/contacts/symbian/tsrc/ut_symbian/ut_cntsymbianengine.cpp +++ b/plugins/contacts/symbian/tsrc/ut_symbian/ut_cntsymbianengine.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/tsrc/ut_symbian/ut_cntsymbianengine.h b/plugins/contacts/symbian/tsrc/ut_symbian/ut_cntsymbianengine.h index ceeb59774c..a78899ed4b 100644 --- a/plugins/contacts/symbian/tsrc/ut_symbian/ut_cntsymbianengine.h +++ b/plugins/contacts/symbian/tsrc/ut_symbian/ut_cntsymbianengine.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/tsrc/ut_symbian/ut_transformcontactdata.cpp b/plugins/contacts/symbian/tsrc/ut_symbian/ut_transformcontactdata.cpp index 52117ccb56..8ecc3e824e 100644 --- a/plugins/contacts/symbian/tsrc/ut_symbian/ut_transformcontactdata.cpp +++ b/plugins/contacts/symbian/tsrc/ut_symbian/ut_transformcontactdata.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbian/tsrc/ut_symbian/ut_transformcontactdata.h b/plugins/contacts/symbian/tsrc/ut_symbian/ut_transformcontactdata.h index 759017c3df..fc65b1808f 100644 --- a/plugins/contacts/symbian/tsrc/ut_symbian/ut_transformcontactdata.h +++ b/plugins/contacts/symbian/tsrc/ut_symbian/ut_transformcontactdata.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbiansim/tsrc/tst_simcm/tst_simcm.cpp b/plugins/contacts/symbiansim/tsrc/tst_simcm/tst_simcm.cpp index 208a35fe9f..da10483059 100644 --- a/plugins/contacts/symbiansim/tsrc/tst_simcm/tst_simcm.cpp +++ b/plugins/contacts/symbiansim/tsrc/tst_simcm/tst_simcm.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/symbiansim/tsrc/tst_simcmasync/tst_simcmasync.cpp b/plugins/contacts/symbiansim/tsrc/tst_simcmasync/tst_simcmasync.cpp index 8bf13079e7..e366b44b1a 100644 --- a/plugins/contacts/symbiansim/tsrc/tst_simcmasync/tst_simcmasync.cpp +++ b/plugins/contacts/symbiansim/tsrc/tst_simcmasync/tst_simcmasync.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/wince/contactconversions.cpp b/plugins/contacts/wince/contactconversions.cpp index b69735480c..91f3d28aee 100644 --- a/plugins/contacts/wince/contactconversions.cpp +++ b/plugins/contacts/wince/contactconversions.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/wince/qcontactrequestworker.cpp b/plugins/contacts/wince/qcontactrequestworker.cpp index 9cec9bbce5..5e717adf47 100644 --- a/plugins/contacts/wince/qcontactrequestworker.cpp +++ b/plugins/contacts/wince/qcontactrequestworker.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/wince/qcontactrequestworker.h b/plugins/contacts/wince/qcontactrequestworker.h index 593ea83c21..3787eb1568 100644 --- a/plugins/contacts/wince/qcontactrequestworker.h +++ b/plugins/contacts/wince/qcontactrequestworker.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/wince/qcontactrequestworker_p.h b/plugins/contacts/wince/qcontactrequestworker_p.h index 8bfff35661..934504452b 100644 --- a/plugins/contacts/wince/qcontactrequestworker_p.h +++ b/plugins/contacts/wince/qcontactrequestworker_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/wince/qcontactwincebackend.cpp b/plugins/contacts/wince/qcontactwincebackend.cpp index 4655246b5f..471f87c581 100644 --- a/plugins/contacts/wince/qcontactwincebackend.cpp +++ b/plugins/contacts/wince/qcontactwincebackend.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/wince/qcontactwincebackend_p.h b/plugins/contacts/wince/qcontactwincebackend_p.h index 5e9afd23b9..23ec9efb13 100644 --- a/plugins/contacts/wince/qcontactwincebackend_p.h +++ b/plugins/contacts/wince/qcontactwincebackend_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/contacts/wince/wince.pro b/plugins/contacts/wince/wince.pro index bead7b69ab..d89a624bb7 100644 --- a/plugins/contacts/wince/wince.pro +++ b/plugins/contacts/wince/wince.pro @@ -15,10 +15,6 @@ SOURCES += \ qcontactrequestworker.cpp INCLUDEPATH += $$SOURCE_DIR/src/contacts $$SOURCE_DIR/src/contacts/details $$SOURCE_DIR/src/contacts/filters $$SOURCE_DIR/src/contacts/requests - -target.path=$${QT_MOBILITY_PREFIX}/plugins/$${PLUGIN_TYPE} -maemo6:target.path=$$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE} -INSTALLS+=target LIBS += pimstore.lib -lole32 CONFIG += mobility MOBILITY = contacts diff --git a/plugins/declarative/declarative.pro b/plugins/declarative/declarative.pro new file mode 100644 index 0000000000..4d27b0531d --- /dev/null +++ b/plugins/declarative/declarative.pro @@ -0,0 +1,5 @@ +include(../../staticconfig.pri) + +TEMPLATE = subdirs + +contains(mobility_modules,serviceframework): SUBDIRS += serviceframework diff --git a/examples/declarative-sfw-dialer/sfwexample/qdeclarativeservice.cpp b/plugins/declarative/serviceframework/qdeclarativeservice.cpp index 49615c0a9f..f593447a20 100644 --- a/examples/declarative-sfw-dialer/sfwexample/qdeclarativeservice.cpp +++ b/plugins/declarative/serviceframework/qdeclarativeservice.cpp @@ -1,39 +1,40 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 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:BSD$ -** You may use this file under the terms of the BSD license as follows: +** $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. +** +** +** +** +** +** ** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. ** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -115,6 +116,7 @@ QObject* QServiceWrapper::serviceObject() if (isValid()) { QServiceManager manager; serviceInstance = manager.loadInterface(m_descriptor); + return serviceInstance; } else { return 0; diff --git a/examples/declarative-sfw-notes/qdeclarativeservice.h b/plugins/declarative/serviceframework/qdeclarativeservice.h index be3516f819..2e9c76686a 100644 --- a/examples/declarative-sfw-notes/qdeclarativeservice.h +++ b/plugins/declarative/serviceframework/qdeclarativeservice.h @@ -1,39 +1,40 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 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:BSD$ -** You may use this file under the terms of the BSD license as follows: +** $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. +** +** +** +** +** +** ** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. ** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." ** $QT_END_LICENSE$ ** ***************************************************************************/ @@ -85,7 +86,7 @@ private: QObject* serviceInstance; }; -QML_DECLARE_TYPE(QServiceWrapper); +QML_DECLARE_TYPE(QServiceWrapper) class QServiceListWrapper : public QObject { Q_OBJECT diff --git a/plugins/declarative/serviceframework/qmldir b/plugins/declarative/serviceframework/qmldir new file mode 100644 index 0000000000..0c9da2dd9e --- /dev/null +++ b/plugins/declarative/serviceframework/qmldir @@ -0,0 +1 @@ +plugin declarative_serviceframework diff --git a/tests/networkmanager/startdlg.h b/plugins/declarative/serviceframework/serviceframework.cpp index a9f1e7c6af..bc0369acba 100644 --- a/tests/networkmanager/startdlg.h +++ b/plugins/declarative/serviceframework/serviceframework.cpp @@ -1,10 +1,10 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 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. +** This file is part of the plugins of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage @@ -38,21 +38,30 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include <QDialog> -#include <QtDBus> -#include <QtGui> -class StartDialog : public QDialog +#include <QtDeclarative/qdeclarativeextensionplugin.h> +#include <QtDeclarative/qdeclarative.h> + +#include "qdeclarativeservice.h" + +QT_BEGIN_NAMESPACE + +class QServiceDeclarativeModule : public QDeclarativeExtensionPlugin { Q_OBJECT public: - StartDialog(QWidget* parent = 0); - - QString device() const; + virtual void registerTypes(const char *uri) + { + Q_ASSERT(QLatin1String(uri) == QLatin1String("QtMobility.serviceframework")); -public slots: - void accept(); -private: - QString dev; - QComboBox* box; + qmlRegisterType<QServiceWrapper>(uri, 1, 0, "Service"); + qmlRegisterType<QServiceListWrapper>(uri, 1, 0, "ServiceList"); + } }; + +QT_END_NAMESPACE + +#include "serviceframework.moc" + +Q_EXPORT_PLUGIN2(qservicedeclarativemodule, QT_PREPEND_NAMESPACE(QServiceDeclarativeModule)); + diff --git a/plugins/declarative/serviceframework/serviceframework.pro b/plugins/declarative/serviceframework/serviceframework.pro new file mode 100644 index 0000000000..2d4f181563 --- /dev/null +++ b/plugins/declarative/serviceframework/serviceframework.pro @@ -0,0 +1,26 @@ +INCLUDEPATH += ../../../src/serviceframework +INCLUDEPATH += ../../../src/global + +TARGET = declarative_serviceframework +TARGETPATH = QtMobility/serviceframework +include(../../qimportbase.pri) +include(../../../common.pri) + +QT += declarative + +HEADERS += qdeclarativeservice.h + +SOURCES += qdeclarativeservice.cpp \ + serviceframework.cpp \ + +CONFIG += mobility +MOBILITY += serviceframework + +DESTDIR = $$[QT_INSTALL_PREFIX]/imports/$$TARGETPATH +target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH + +qmldir.files += $$PWD/qmldir +qmldir.path += $$[QT_INSTALL_IMPORTS]/$$TARGETPATH + +INSTALLS += target qmldir + diff --git a/plugins/multimedia/audiocapture/audiocapture.pro b/plugins/multimedia/audiocapture/audiocapture.pro index de4f317a57..63f81886e5 100644 --- a/plugins/multimedia/audiocapture/audiocapture.pro +++ b/plugins/multimedia/audiocapture/audiocapture.pro @@ -29,7 +29,3 @@ SOURCES += audioencodercontrol.cpp \ audiocaptureservice.cpp \ audiocaptureserviceplugin.cpp \ audiocapturesession.cpp - -target.path=$${QT_MOBILITY_PREFIX}/plugins/$${PLUGIN_TYPE} -maemo6:target.path=$$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE} -INSTALLS+=target diff --git a/plugins/multimedia/audiocapture/audiocaptureservice.cpp b/plugins/multimedia/audiocapture/audiocaptureservice.cpp index a85aab2800..fd4fdac403 100644 --- a/plugins/multimedia/audiocapture/audiocaptureservice.cpp +++ b/plugins/multimedia/audiocapture/audiocaptureservice.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/audiocapture/audiocaptureservice.h b/plugins/multimedia/audiocapture/audiocaptureservice.h index 18b72c0bb6..bf8d2a2fae 100644 --- a/plugins/multimedia/audiocapture/audiocaptureservice.h +++ b/plugins/multimedia/audiocapture/audiocaptureservice.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/audiocapture/audiocaptureserviceplugin.cpp b/plugins/multimedia/audiocapture/audiocaptureserviceplugin.cpp index d815c1a568..7c13ab2650 100644 --- a/plugins/multimedia/audiocapture/audiocaptureserviceplugin.cpp +++ b/plugins/multimedia/audiocapture/audiocaptureserviceplugin.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/audiocapture/audiocaptureserviceplugin.h b/plugins/multimedia/audiocapture/audiocaptureserviceplugin.h index 8c1c2c43bd..cea1250668 100644 --- a/plugins/multimedia/audiocapture/audiocaptureserviceplugin.h +++ b/plugins/multimedia/audiocapture/audiocaptureserviceplugin.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/audiocapture/audiocapturesession.cpp b/plugins/multimedia/audiocapture/audiocapturesession.cpp index 73c24eddb6..2a4751ee05 100644 --- a/plugins/multimedia/audiocapture/audiocapturesession.cpp +++ b/plugins/multimedia/audiocapture/audiocapturesession.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/audiocapture/audiocapturesession.h b/plugins/multimedia/audiocapture/audiocapturesession.h index de4dee295d..4ac7a18d2a 100644 --- a/plugins/multimedia/audiocapture/audiocapturesession.h +++ b/plugins/multimedia/audiocapture/audiocapturesession.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/audiocapture/audiocontainercontrol.cpp b/plugins/multimedia/audiocapture/audiocontainercontrol.cpp index e50418be85..454f43eda6 100644 --- a/plugins/multimedia/audiocapture/audiocontainercontrol.cpp +++ b/plugins/multimedia/audiocapture/audiocontainercontrol.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/audiocapture/audiocontainercontrol.h b/plugins/multimedia/audiocapture/audiocontainercontrol.h index f3be686b25..0e0b3e5e20 100644 --- a/plugins/multimedia/audiocapture/audiocontainercontrol.h +++ b/plugins/multimedia/audiocapture/audiocontainercontrol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/audiocapture/audioencodercontrol.cpp b/plugins/multimedia/audiocapture/audioencodercontrol.cpp index a029997c42..a5bafd19c9 100644 --- a/plugins/multimedia/audiocapture/audioencodercontrol.cpp +++ b/plugins/multimedia/audiocapture/audioencodercontrol.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/audiocapture/audioencodercontrol.h b/plugins/multimedia/audiocapture/audioencodercontrol.h index 6571672eea..4cc49ee64d 100644 --- a/plugins/multimedia/audiocapture/audioencodercontrol.h +++ b/plugins/multimedia/audiocapture/audioencodercontrol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/audiocapture/audioendpointselector.cpp b/plugins/multimedia/audiocapture/audioendpointselector.cpp index 45a0d30437..7f6178287f 100644 --- a/plugins/multimedia/audiocapture/audioendpointselector.cpp +++ b/plugins/multimedia/audiocapture/audioendpointselector.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/audiocapture/audioendpointselector.h b/plugins/multimedia/audiocapture/audioendpointselector.h index c2be26d5ef..02512c231e 100644 --- a/plugins/multimedia/audiocapture/audioendpointselector.h +++ b/plugins/multimedia/audiocapture/audioendpointselector.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/audiocapture/audiomediarecordercontrol.cpp b/plugins/multimedia/audiocapture/audiomediarecordercontrol.cpp index c1023189f7..19c7a06342 100644 --- a/plugins/multimedia/audiocapture/audiomediarecordercontrol.cpp +++ b/plugins/multimedia/audiocapture/audiomediarecordercontrol.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/audiocapture/audiomediarecordercontrol.h b/plugins/multimedia/audiocapture/audiomediarecordercontrol.h index 1ae6681050..1c70cbc3cf 100644 --- a/plugins/multimedia/audiocapture/audiomediarecordercontrol.h +++ b/plugins/multimedia/audiocapture/audiomediarecordercontrol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/directshow/directshow.pro b/plugins/multimedia/directshow/directshow.pro index fabd2df350..7444842764 100644 --- a/plugins/multimedia/directshow/directshow.pro +++ b/plugins/multimedia/directshow/directshow.pro @@ -20,8 +20,3 @@ SOURCES += dsserviceplugin.cpp !contains(TMP_REQUIRED_HEADERS, wmsdk.h): DEFINES += QT_NO_WMSDK include (player/player.pri) - -target.path=$${QT_MOBILITY_PREFIX}/plugins/$${PLUGIN_TYPE} -maemo6:target.path=$$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE} -INSTALLS+=target - diff --git a/plugins/multimedia/directshow/dsserviceplugin.cpp b/plugins/multimedia/directshow/dsserviceplugin.cpp index febf91b416..f5cae27a4c 100644 --- a/plugins/multimedia/directshow/dsserviceplugin.cpp +++ b/plugins/multimedia/directshow/dsserviceplugin.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/directshow/dsserviceplugin.h b/plugins/multimedia/directshow/dsserviceplugin.h index b7126d5c12..a6365605eb 100644 --- a/plugins/multimedia/directshow/dsserviceplugin.h +++ b/plugins/multimedia/directshow/dsserviceplugin.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/directshow/player/directshowaudioendpointcontrol.cpp b/plugins/multimedia/directshow/player/directshowaudioendpointcontrol.cpp index 2e9ab4ea19..01c8797320 100644 --- a/plugins/multimedia/directshow/player/directshowaudioendpointcontrol.cpp +++ b/plugins/multimedia/directshow/player/directshowaudioendpointcontrol.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/directshow/player/directshowaudioendpointcontrol.h b/plugins/multimedia/directshow/player/directshowaudioendpointcontrol.h index 57a49380ca..71dcef92a6 100644 --- a/plugins/multimedia/directshow/player/directshowaudioendpointcontrol.h +++ b/plugins/multimedia/directshow/player/directshowaudioendpointcontrol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/directshow/player/directshoweventloop.cpp b/plugins/multimedia/directshow/player/directshoweventloop.cpp index 76cd3be301..f863aa8350 100644 --- a/plugins/multimedia/directshow/player/directshoweventloop.cpp +++ b/plugins/multimedia/directshow/player/directshoweventloop.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/directshow/player/directshoweventloop.h b/plugins/multimedia/directshow/player/directshoweventloop.h index ebba3d2e12..6f1a51cd5b 100644 --- a/plugins/multimedia/directshow/player/directshoweventloop.h +++ b/plugins/multimedia/directshow/player/directshoweventloop.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/directshow/player/directshowglobal.h b/plugins/multimedia/directshow/player/directshowglobal.h index c1f6af5258..d14c117ec9 100644 --- a/plugins/multimedia/directshow/player/directshowglobal.h +++ b/plugins/multimedia/directshow/player/directshowglobal.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/directshow/player/directshowioreader.cpp b/plugins/multimedia/directshow/player/directshowioreader.cpp index 1cfa36d335..5442f30d96 100644 --- a/plugins/multimedia/directshow/player/directshowioreader.cpp +++ b/plugins/multimedia/directshow/player/directshowioreader.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/directshow/player/directshowioreader.h b/plugins/multimedia/directshow/player/directshowioreader.h index 22bd13d54d..ca398f12e9 100644 --- a/plugins/multimedia/directshow/player/directshowioreader.h +++ b/plugins/multimedia/directshow/player/directshowioreader.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/directshow/player/directshowiosource.cpp b/plugins/multimedia/directshow/player/directshowiosource.cpp index 3f49158c07..c8f3e6a97b 100644 --- a/plugins/multimedia/directshow/player/directshowiosource.cpp +++ b/plugins/multimedia/directshow/player/directshowiosource.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/directshow/player/directshowiosource.h b/plugins/multimedia/directshow/player/directshowiosource.h index 071977c02a..3019bdbe93 100644 --- a/plugins/multimedia/directshow/player/directshowiosource.h +++ b/plugins/multimedia/directshow/player/directshowiosource.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/directshow/player/directshowmediatype.cpp b/plugins/multimedia/directshow/player/directshowmediatype.cpp index 6e41a6f0c9..667d9491e0 100644 --- a/plugins/multimedia/directshow/player/directshowmediatype.cpp +++ b/plugins/multimedia/directshow/player/directshowmediatype.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/directshow/player/directshowmediatype.h b/plugins/multimedia/directshow/player/directshowmediatype.h index fdbb745a88..1923539d68 100644 --- a/plugins/multimedia/directshow/player/directshowmediatype.h +++ b/plugins/multimedia/directshow/player/directshowmediatype.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/directshow/player/directshowmediatypelist.cpp b/plugins/multimedia/directshow/player/directshowmediatypelist.cpp index e76107e5a1..3060975fc9 100644 --- a/plugins/multimedia/directshow/player/directshowmediatypelist.cpp +++ b/plugins/multimedia/directshow/player/directshowmediatypelist.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/directshow/player/directshowmediatypelist.h b/plugins/multimedia/directshow/player/directshowmediatypelist.h index 5413361fbb..1b33606cb4 100644 --- a/plugins/multimedia/directshow/player/directshowmediatypelist.h +++ b/plugins/multimedia/directshow/player/directshowmediatypelist.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/directshow/player/directshowmetadatacontrol.cpp b/plugins/multimedia/directshow/player/directshowmetadatacontrol.cpp index 39998e31c6..0b4e28fa07 100644 --- a/plugins/multimedia/directshow/player/directshowmetadatacontrol.cpp +++ b/plugins/multimedia/directshow/player/directshowmetadatacontrol.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/directshow/player/directshowmetadatacontrol.h b/plugins/multimedia/directshow/player/directshowmetadatacontrol.h index 26648505cd..57a6375230 100644 --- a/plugins/multimedia/directshow/player/directshowmetadatacontrol.h +++ b/plugins/multimedia/directshow/player/directshowmetadatacontrol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/directshow/player/directshowpinenum.cpp b/plugins/multimedia/directshow/player/directshowpinenum.cpp index b109e8b411..009e60e5a2 100644 --- a/plugins/multimedia/directshow/player/directshowpinenum.cpp +++ b/plugins/multimedia/directshow/player/directshowpinenum.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/directshow/player/directshowpinenum.h b/plugins/multimedia/directshow/player/directshowpinenum.h index b52f982cb7..9fba3e84e2 100644 --- a/plugins/multimedia/directshow/player/directshowpinenum.h +++ b/plugins/multimedia/directshow/player/directshowpinenum.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/directshow/player/directshowplayercontrol.cpp b/plugins/multimedia/directshow/player/directshowplayercontrol.cpp index d149fa64b3..3c874b0978 100644 --- a/plugins/multimedia/directshow/player/directshowplayercontrol.cpp +++ b/plugins/multimedia/directshow/player/directshowplayercontrol.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/directshow/player/directshowplayercontrol.h b/plugins/multimedia/directshow/player/directshowplayercontrol.h index 2037a9ee7e..2557eeebd3 100644 --- a/plugins/multimedia/directshow/player/directshowplayercontrol.h +++ b/plugins/multimedia/directshow/player/directshowplayercontrol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/directshow/player/directshowplayerservice.cpp b/plugins/multimedia/directshow/player/directshowplayerservice.cpp index f368112ae4..e542f070fd 100644 --- a/plugins/multimedia/directshow/player/directshowplayerservice.cpp +++ b/plugins/multimedia/directshow/player/directshowplayerservice.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/directshow/player/directshowplayerservice.h b/plugins/multimedia/directshow/player/directshowplayerservice.h index af21329eae..6ec55456ef 100644 --- a/plugins/multimedia/directshow/player/directshowplayerservice.h +++ b/plugins/multimedia/directshow/player/directshowplayerservice.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/directshow/player/directshowsamplescheduler.cpp b/plugins/multimedia/directshow/player/directshowsamplescheduler.cpp index 6383a6d08a..48b7899c6e 100644 --- a/plugins/multimedia/directshow/player/directshowsamplescheduler.cpp +++ b/plugins/multimedia/directshow/player/directshowsamplescheduler.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/directshow/player/directshowsamplescheduler.h b/plugins/multimedia/directshow/player/directshowsamplescheduler.h index 3e6e7c7adb..bea833ef9a 100644 --- a/plugins/multimedia/directshow/player/directshowsamplescheduler.h +++ b/plugins/multimedia/directshow/player/directshowsamplescheduler.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/directshow/player/directshowvideooutputcontrol.cpp b/plugins/multimedia/directshow/player/directshowvideooutputcontrol.cpp index 20a39d6098..5795aefb07 100644 --- a/plugins/multimedia/directshow/player/directshowvideooutputcontrol.cpp +++ b/plugins/multimedia/directshow/player/directshowvideooutputcontrol.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/directshow/player/directshowvideooutputcontrol.h b/plugins/multimedia/directshow/player/directshowvideooutputcontrol.h index c9779c22c4..9f40668c0c 100644 --- a/plugins/multimedia/directshow/player/directshowvideooutputcontrol.h +++ b/plugins/multimedia/directshow/player/directshowvideooutputcontrol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/directshow/player/directshowvideorenderercontrol.cpp b/plugins/multimedia/directshow/player/directshowvideorenderercontrol.cpp index 7d60102e3c..429d5e1ec2 100644 --- a/plugins/multimedia/directshow/player/directshowvideorenderercontrol.cpp +++ b/plugins/multimedia/directshow/player/directshowvideorenderercontrol.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/directshow/player/directshowvideorenderercontrol.h b/plugins/multimedia/directshow/player/directshowvideorenderercontrol.h index fb6c21e9f0..7220d79d42 100644 --- a/plugins/multimedia/directshow/player/directshowvideorenderercontrol.h +++ b/plugins/multimedia/directshow/player/directshowvideorenderercontrol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/directshow/player/mediasamplevideobuffer.cpp b/plugins/multimedia/directshow/player/mediasamplevideobuffer.cpp index 48c942d407..cd3c0775f1 100644 --- a/plugins/multimedia/directshow/player/mediasamplevideobuffer.cpp +++ b/plugins/multimedia/directshow/player/mediasamplevideobuffer.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/directshow/player/mediasamplevideobuffer.h b/plugins/multimedia/directshow/player/mediasamplevideobuffer.h index 918714a563..09dffd411a 100644 --- a/plugins/multimedia/directshow/player/mediasamplevideobuffer.h +++ b/plugins/multimedia/directshow/player/mediasamplevideobuffer.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/directshow/player/videosurfacefilter.cpp b/plugins/multimedia/directshow/player/videosurfacefilter.cpp index 94fa8029b4..0ff6cb7867 100644 --- a/plugins/multimedia/directshow/player/videosurfacefilter.cpp +++ b/plugins/multimedia/directshow/player/videosurfacefilter.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/directshow/player/videosurfacefilter.h b/plugins/multimedia/directshow/player/videosurfacefilter.h index ae7447fe60..a589716307 100644 --- a/plugins/multimedia/directshow/player/videosurfacefilter.h +++ b/plugins/multimedia/directshow/player/videosurfacefilter.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/directshow/player/vmr9videowindowcontrol.cpp b/plugins/multimedia/directshow/player/vmr9videowindowcontrol.cpp index 59461ee961..fca344c020 100644 --- a/plugins/multimedia/directshow/player/vmr9videowindowcontrol.cpp +++ b/plugins/multimedia/directshow/player/vmr9videowindowcontrol.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/directshow/player/vmr9videowindowcontrol.h b/plugins/multimedia/directshow/player/vmr9videowindowcontrol.h index f7eabda105..665d5ebc28 100644 --- a/plugins/multimedia/directshow/player/vmr9videowindowcontrol.h +++ b/plugins/multimedia/directshow/player/vmr9videowindowcontrol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/gstreamer/gstreamer.pro b/plugins/multimedia/gstreamer/gstreamer.pro index a3fb91c42e..4d97621f70 100644 --- a/plugins/multimedia/gstreamer/gstreamer.pro +++ b/plugins/multimedia/gstreamer/gstreamer.pro @@ -81,7 +81,3 @@ include(mediaplayer/mediaplayer.pri) include(mediacapture/maemo/mediacapture_maemo.pri) DEFINES += GST_USE_UNSTABLE_API #prevents warnings because of unstable photography API } - -target.path=$${QT_MOBILITY_PREFIX}/plugins/$${PLUGIN_TYPE} -maemo6:target.path=$$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE} -INSTALLS+=target diff --git a/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreameraudioencode_maemo.cpp b/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreameraudioencode_maemo.cpp index 65d3c63112..b948d352c0 100644 --- a/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreameraudioencode_maemo.cpp +++ b/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreameraudioencode_maemo.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreameraudioencode_maemo.h b/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreameraudioencode_maemo.h index 060525a369..db8605a978 100644 --- a/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreameraudioencode_maemo.h +++ b/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreameraudioencode_maemo.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamercapturemetadatacontrol_maemo.cpp b/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamercapturemetadatacontrol_maemo.cpp index 27191aa9e9..775e70a6ad 100644 --- a/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamercapturemetadatacontrol_maemo.cpp +++ b/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamercapturemetadatacontrol_maemo.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamercapturemetadatacontrol_maemo.h b/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamercapturemetadatacontrol_maemo.h index da42fd9b15..5bf52e3b54 100644 --- a/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamercapturemetadatacontrol_maemo.h +++ b/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamercapturemetadatacontrol_maemo.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamercaptureservice_maemo.cpp b/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamercaptureservice_maemo.cpp index 8a0ab735e9..df262e051c 100644 --- a/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamercaptureservice_maemo.cpp +++ b/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamercaptureservice_maemo.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamercaptureservice_maemo.h b/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamercaptureservice_maemo.h index b073413196..a04476620a 100644 --- a/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamercaptureservice_maemo.h +++ b/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamercaptureservice_maemo.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamercapturesession_maemo.cpp b/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamercapturesession_maemo.cpp index 0854a03ec6..653157c958 100644 --- a/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamercapturesession_maemo.cpp +++ b/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamercapturesession_maemo.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamercapturesession_maemo.h b/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamercapturesession_maemo.h index 663aeaddd0..0724e6920d 100644 --- a/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamercapturesession_maemo.h +++ b/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamercapturesession_maemo.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamermediacontainercontrol_maemo.cpp b/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamermediacontainercontrol_maemo.cpp index 41c20abcb4..15ea1d72f4 100644 --- a/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamermediacontainercontrol_maemo.cpp +++ b/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamermediacontainercontrol_maemo.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamermediacontainercontrol_maemo.h b/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamermediacontainercontrol_maemo.h index 62e5cb5233..9d720d5c08 100644 --- a/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamermediacontainercontrol_maemo.h +++ b/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamermediacontainercontrol_maemo.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamerrecordercontrol_maemo.cpp b/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamerrecordercontrol_maemo.cpp index 4e60c68ad9..4761c75edd 100644 --- a/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamerrecordercontrol_maemo.cpp +++ b/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamerrecordercontrol_maemo.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamerrecordercontrol_maemo.h b/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamerrecordercontrol_maemo.h index 4f147dcc3c..9c18fe8df3 100644 --- a/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamerrecordercontrol_maemo.h +++ b/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamerrecordercontrol_maemo.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamervideoencode_maemo.cpp b/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamervideoencode_maemo.cpp index fbfbe99edf..bfe94e07b7 100644 --- a/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamervideoencode_maemo.cpp +++ b/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamervideoencode_maemo.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamervideoencode_maemo.h b/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamervideoencode_maemo.h index 4cb20e2d84..c042efd25c 100644 --- a/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamervideoencode_maemo.h +++ b/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamervideoencode_maemo.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/gstreamer/mediacapture/qgstreameraudioencode.cpp b/plugins/multimedia/gstreamer/mediacapture/qgstreameraudioencode.cpp index b7c8c74dad..bf7d2750af 100644 --- a/plugins/multimedia/gstreamer/mediacapture/qgstreameraudioencode.cpp +++ b/plugins/multimedia/gstreamer/mediacapture/qgstreameraudioencode.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/gstreamer/mediacapture/qgstreameraudioencode.h b/plugins/multimedia/gstreamer/mediacapture/qgstreameraudioencode.h index 060525a369..db8605a978 100644 --- a/plugins/multimedia/gstreamer/mediacapture/qgstreameraudioencode.h +++ b/plugins/multimedia/gstreamer/mediacapture/qgstreameraudioencode.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.cpp b/plugins/multimedia/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.cpp index 79f994cf5f..ad20333b2b 100644 --- a/plugins/multimedia/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.cpp +++ b/plugins/multimedia/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.h b/plugins/multimedia/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.h index da42fd9b15..5bf52e3b54 100644 --- a/plugins/multimedia/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.h +++ b/plugins/multimedia/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/gstreamer/mediacapture/qgstreamercaptureservice.cpp b/plugins/multimedia/gstreamer/mediacapture/qgstreamercaptureservice.cpp index 8a6f28910f..8b6bf15a24 100644 --- a/plugins/multimedia/gstreamer/mediacapture/qgstreamercaptureservice.cpp +++ b/plugins/multimedia/gstreamer/mediacapture/qgstreamercaptureservice.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/gstreamer/mediacapture/qgstreamercaptureservice.h b/plugins/multimedia/gstreamer/mediacapture/qgstreamercaptureservice.h index 1688a3829a..04bbf71c16 100644 --- a/plugins/multimedia/gstreamer/mediacapture/qgstreamercaptureservice.h +++ b/plugins/multimedia/gstreamer/mediacapture/qgstreamercaptureservice.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/gstreamer/mediacapture/qgstreamercapturesession.cpp b/plugins/multimedia/gstreamer/mediacapture/qgstreamercapturesession.cpp index eaf97164fc..3482a9c5aa 100644 --- a/plugins/multimedia/gstreamer/mediacapture/qgstreamercapturesession.cpp +++ b/plugins/multimedia/gstreamer/mediacapture/qgstreamercapturesession.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/gstreamer/mediacapture/qgstreamercapturesession.h b/plugins/multimedia/gstreamer/mediacapture/qgstreamercapturesession.h index d1f033c62f..ca8a1f4a2f 100644 --- a/plugins/multimedia/gstreamer/mediacapture/qgstreamercapturesession.h +++ b/plugins/multimedia/gstreamer/mediacapture/qgstreamercapturesession.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/gstreamer/mediacapture/qgstreamermediacontainercontrol.cpp b/plugins/multimedia/gstreamer/mediacapture/qgstreamermediacontainercontrol.cpp index 8974f4a820..62f2749840 100644 --- a/plugins/multimedia/gstreamer/mediacapture/qgstreamermediacontainercontrol.cpp +++ b/plugins/multimedia/gstreamer/mediacapture/qgstreamermediacontainercontrol.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/gstreamer/mediacapture/qgstreamermediacontainercontrol.h b/plugins/multimedia/gstreamer/mediacapture/qgstreamermediacontainercontrol.h index 62e5cb5233..9d720d5c08 100644 --- a/plugins/multimedia/gstreamer/mediacapture/qgstreamermediacontainercontrol.h +++ b/plugins/multimedia/gstreamer/mediacapture/qgstreamermediacontainercontrol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/gstreamer/mediacapture/qgstreamerrecordercontrol.cpp b/plugins/multimedia/gstreamer/mediacapture/qgstreamerrecordercontrol.cpp index ea9a3113b5..2d20191401 100644 --- a/plugins/multimedia/gstreamer/mediacapture/qgstreamerrecordercontrol.cpp +++ b/plugins/multimedia/gstreamer/mediacapture/qgstreamerrecordercontrol.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/gstreamer/mediacapture/qgstreamerrecordercontrol.h b/plugins/multimedia/gstreamer/mediacapture/qgstreamerrecordercontrol.h index 80d9fb5784..390e357169 100644 --- a/plugins/multimedia/gstreamer/mediacapture/qgstreamerrecordercontrol.h +++ b/plugins/multimedia/gstreamer/mediacapture/qgstreamerrecordercontrol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/gstreamer/mediacapture/qgstreamerv4l2input.cpp b/plugins/multimedia/gstreamer/mediacapture/qgstreamerv4l2input.cpp index c510a98194..70907b2dd2 100644 --- a/plugins/multimedia/gstreamer/mediacapture/qgstreamerv4l2input.cpp +++ b/plugins/multimedia/gstreamer/mediacapture/qgstreamerv4l2input.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/gstreamer/mediacapture/qgstreamerv4l2input.h b/plugins/multimedia/gstreamer/mediacapture/qgstreamerv4l2input.h index f5512ffb4d..5dbdd54532 100644 --- a/plugins/multimedia/gstreamer/mediacapture/qgstreamerv4l2input.h +++ b/plugins/multimedia/gstreamer/mediacapture/qgstreamerv4l2input.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/gstreamer/mediacapture/qgstreamervideoencode.cpp b/plugins/multimedia/gstreamer/mediacapture/qgstreamervideoencode.cpp index e55098de7b..88df944488 100644 --- a/plugins/multimedia/gstreamer/mediacapture/qgstreamervideoencode.cpp +++ b/plugins/multimedia/gstreamer/mediacapture/qgstreamervideoencode.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/gstreamer/mediacapture/qgstreamervideoencode.h b/plugins/multimedia/gstreamer/mediacapture/qgstreamervideoencode.h index 4cb20e2d84..c042efd25c 100644 --- a/plugins/multimedia/gstreamer/mediacapture/qgstreamervideoencode.h +++ b/plugins/multimedia/gstreamer/mediacapture/qgstreamervideoencode.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp b/plugins/multimedia/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp index b2f3660d16..e9bf3ddfe1 100644 --- a/plugins/multimedia/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp +++ b/plugins/multimedia/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/gstreamer/mediaplayer/qgstreamermetadataprovider.h b/plugins/multimedia/gstreamer/mediaplayer/qgstreamermetadataprovider.h index ac3b0fd36f..8a37ceb7f3 100644 --- a/plugins/multimedia/gstreamer/mediaplayer/qgstreamermetadataprovider.h +++ b/plugins/multimedia/gstreamer/mediaplayer/qgstreamermetadataprovider.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayercontrol.cpp b/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayercontrol.cpp index 2558b317af..9aa7ccf6ac 100644 --- a/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayercontrol.cpp +++ b/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayercontrol.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayercontrol.h b/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayercontrol.h index 2b5baa5dec..88a0781629 100644 --- a/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayercontrol.h +++ b/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayercontrol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayerservice.cpp b/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayerservice.cpp index ad33177a6b..10888ebfaf 100644 --- a/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayerservice.cpp +++ b/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayerservice.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayerservice.h b/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayerservice.h index 1f0d303eb8..739e5e2752 100644 --- a/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayerservice.h +++ b/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayerservice.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayersession.cpp b/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayersession.cpp index 9b2a5d698e..657a3ca83d 100644 --- a/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayersession.cpp +++ b/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayersession.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayersession.h b/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayersession.h index 352763d3d8..cc58025b1a 100644 --- a/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayersession.h +++ b/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayersession.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/gstreamer/mediaplayer/qgstreamerstreamscontrol.cpp b/plugins/multimedia/gstreamer/mediaplayer/qgstreamerstreamscontrol.cpp index 18b6b71411..cde3ba8f31 100644 --- a/plugins/multimedia/gstreamer/mediaplayer/qgstreamerstreamscontrol.cpp +++ b/plugins/multimedia/gstreamer/mediaplayer/qgstreamerstreamscontrol.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/gstreamer/mediaplayer/qgstreamerstreamscontrol.h b/plugins/multimedia/gstreamer/mediaplayer/qgstreamerstreamscontrol.h index 15fd45c05e..6c7f1fe0cd 100644 --- a/plugins/multimedia/gstreamer/mediaplayer/qgstreamerstreamscontrol.h +++ b/plugins/multimedia/gstreamer/mediaplayer/qgstreamerstreamscontrol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/gstreamer/qgstreameraudioinputendpointselector.cpp b/plugins/multimedia/gstreamer/qgstreameraudioinputendpointselector.cpp index 64c3519a30..606f06052c 100644 --- a/plugins/multimedia/gstreamer/qgstreameraudioinputendpointselector.cpp +++ b/plugins/multimedia/gstreamer/qgstreameraudioinputendpointselector.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/gstreamer/qgstreameraudioinputendpointselector.h b/plugins/multimedia/gstreamer/qgstreameraudioinputendpointselector.h index d8a7f89175..c9587fcb85 100644 --- a/plugins/multimedia/gstreamer/qgstreameraudioinputendpointselector.h +++ b/plugins/multimedia/gstreamer/qgstreameraudioinputendpointselector.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/gstreamer/qgstreamerbushelper.cpp b/plugins/multimedia/gstreamer/qgstreamerbushelper.cpp index 0f09c6b03b..a60ec7fab1 100644 --- a/plugins/multimedia/gstreamer/qgstreamerbushelper.cpp +++ b/plugins/multimedia/gstreamer/qgstreamerbushelper.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/gstreamer/qgstreamerbushelper.h b/plugins/multimedia/gstreamer/qgstreamerbushelper.h index fe384321a9..5375c44ae2 100644 --- a/plugins/multimedia/gstreamer/qgstreamerbushelper.h +++ b/plugins/multimedia/gstreamer/qgstreamerbushelper.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/gstreamer/qgstreamermessage.cpp b/plugins/multimedia/gstreamer/qgstreamermessage.cpp index 19cdfb19fa..3b8057e093 100644 --- a/plugins/multimedia/gstreamer/qgstreamermessage.cpp +++ b/plugins/multimedia/gstreamer/qgstreamermessage.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/gstreamer/qgstreamermessage.h b/plugins/multimedia/gstreamer/qgstreamermessage.h index 73028d29e5..2bdc2a9c87 100644 --- a/plugins/multimedia/gstreamer/qgstreamermessage.h +++ b/plugins/multimedia/gstreamer/qgstreamermessage.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/gstreamer/qgstreamerserviceplugin.cpp b/plugins/multimedia/gstreamer/qgstreamerserviceplugin.cpp index 629bea9d3f..6dbe294f54 100644 --- a/plugins/multimedia/gstreamer/qgstreamerserviceplugin.cpp +++ b/plugins/multimedia/gstreamer/qgstreamerserviceplugin.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/gstreamer/qgstreamerserviceplugin.h b/plugins/multimedia/gstreamer/qgstreamerserviceplugin.h index b66f0c3547..bed2527fa6 100644 --- a/plugins/multimedia/gstreamer/qgstreamerserviceplugin.h +++ b/plugins/multimedia/gstreamer/qgstreamerserviceplugin.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/gstreamer/qgstreamervideoinputdevicecontrol.cpp b/plugins/multimedia/gstreamer/qgstreamervideoinputdevicecontrol.cpp index 8e7b9fe3e5..16bb5afae0 100644 --- a/plugins/multimedia/gstreamer/qgstreamervideoinputdevicecontrol.cpp +++ b/plugins/multimedia/gstreamer/qgstreamervideoinputdevicecontrol.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/gstreamer/qgstreamervideoinputdevicecontrol.h b/plugins/multimedia/gstreamer/qgstreamervideoinputdevicecontrol.h index 7141d65ad8..a316362394 100644 --- a/plugins/multimedia/gstreamer/qgstreamervideoinputdevicecontrol.h +++ b/plugins/multimedia/gstreamer/qgstreamervideoinputdevicecontrol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/gstreamer/qgstreamervideooutputcontrol.cpp b/plugins/multimedia/gstreamer/qgstreamervideooutputcontrol.cpp index 10d446f056..54b06630ca 100644 --- a/plugins/multimedia/gstreamer/qgstreamervideooutputcontrol.cpp +++ b/plugins/multimedia/gstreamer/qgstreamervideooutputcontrol.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/gstreamer/qgstreamervideooutputcontrol.h b/plugins/multimedia/gstreamer/qgstreamervideooutputcontrol.h index 2722fd1681..537f5d37e3 100644 --- a/plugins/multimedia/gstreamer/qgstreamervideooutputcontrol.h +++ b/plugins/multimedia/gstreamer/qgstreamervideooutputcontrol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/gstreamer/qgstreamervideooverlay.cpp b/plugins/multimedia/gstreamer/qgstreamervideooverlay.cpp index 6ad73b9a0e..915ea1e5c7 100644 --- a/plugins/multimedia/gstreamer/qgstreamervideooverlay.cpp +++ b/plugins/multimedia/gstreamer/qgstreamervideooverlay.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/gstreamer/qgstreamervideooverlay.h b/plugins/multimedia/gstreamer/qgstreamervideooverlay.h index a2d465fbb4..ab8169cbe4 100644 --- a/plugins/multimedia/gstreamer/qgstreamervideooverlay.h +++ b/plugins/multimedia/gstreamer/qgstreamervideooverlay.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/gstreamer/qgstreamervideorenderer.cpp b/plugins/multimedia/gstreamer/qgstreamervideorenderer.cpp index 7e10fbfdcd..1822b087a8 100644 --- a/plugins/multimedia/gstreamer/qgstreamervideorenderer.cpp +++ b/plugins/multimedia/gstreamer/qgstreamervideorenderer.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/gstreamer/qgstreamervideorenderer.h b/plugins/multimedia/gstreamer/qgstreamervideorenderer.h index 73925bbdcb..f61393af5b 100644 --- a/plugins/multimedia/gstreamer/qgstreamervideorenderer.h +++ b/plugins/multimedia/gstreamer/qgstreamervideorenderer.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/gstreamer/qgstreamervideorendererinterface.cpp b/plugins/multimedia/gstreamer/qgstreamervideorendererinterface.cpp index 57df692e2e..b8358ba1cd 100644 --- a/plugins/multimedia/gstreamer/qgstreamervideorendererinterface.cpp +++ b/plugins/multimedia/gstreamer/qgstreamervideorendererinterface.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/gstreamer/qgstreamervideorendererinterface.h b/plugins/multimedia/gstreamer/qgstreamervideorendererinterface.h index 3ac49ac3e7..ee7c50099e 100644 --- a/plugins/multimedia/gstreamer/qgstreamervideorendererinterface.h +++ b/plugins/multimedia/gstreamer/qgstreamervideorendererinterface.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/gstreamer/qgstreamervideowidget.cpp b/plugins/multimedia/gstreamer/qgstreamervideowidget.cpp index 423c38b28c..8e58eb8b04 100644 --- a/plugins/multimedia/gstreamer/qgstreamervideowidget.cpp +++ b/plugins/multimedia/gstreamer/qgstreamervideowidget.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/gstreamer/qgstreamervideowidget.h b/plugins/multimedia/gstreamer/qgstreamervideowidget.h index 54600580a2..0f79f7e998 100644 --- a/plugins/multimedia/gstreamer/qgstreamervideowidget.h +++ b/plugins/multimedia/gstreamer/qgstreamervideowidget.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/gstreamer/qgstvideobuffer.cpp b/plugins/multimedia/gstreamer/qgstvideobuffer.cpp index 6fac81915f..4ea6a7004b 100644 --- a/plugins/multimedia/gstreamer/qgstvideobuffer.cpp +++ b/plugins/multimedia/gstreamer/qgstvideobuffer.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/gstreamer/qgstvideobuffer.h b/plugins/multimedia/gstreamer/qgstvideobuffer.h index bc3c126330..bf244cb4fb 100644 --- a/plugins/multimedia/gstreamer/qgstvideobuffer.h +++ b/plugins/multimedia/gstreamer/qgstvideobuffer.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/gstreamer/qgstxvimagebuffer.cpp b/plugins/multimedia/gstreamer/qgstxvimagebuffer.cpp index d58625a9ad..148cc39b90 100644 --- a/plugins/multimedia/gstreamer/qgstxvimagebuffer.cpp +++ b/plugins/multimedia/gstreamer/qgstxvimagebuffer.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/gstreamer/qgstxvimagebuffer.h b/plugins/multimedia/gstreamer/qgstxvimagebuffer.h index e5811a0c4a..c09b7149a0 100644 --- a/plugins/multimedia/gstreamer/qgstxvimagebuffer.h +++ b/plugins/multimedia/gstreamer/qgstxvimagebuffer.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/gstreamer/qvideosurfacegstsink.cpp b/plugins/multimedia/gstreamer/qvideosurfacegstsink.cpp index 4c04a23392..21048b5818 100644 --- a/plugins/multimedia/gstreamer/qvideosurfacegstsink.cpp +++ b/plugins/multimedia/gstreamer/qvideosurfacegstsink.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/gstreamer/qvideosurfacegstsink.h b/plugins/multimedia/gstreamer/qvideosurfacegstsink.h index 689347e475..63ceac62d4 100644 --- a/plugins/multimedia/gstreamer/qvideosurfacegstsink.h +++ b/plugins/multimedia/gstreamer/qvideosurfacegstsink.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/gstreamer/qx11videosurface.cpp b/plugins/multimedia/gstreamer/qx11videosurface.cpp index 4f0b3456da..413875f567 100644 --- a/plugins/multimedia/gstreamer/qx11videosurface.cpp +++ b/plugins/multimedia/gstreamer/qx11videosurface.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/gstreamer/qx11videosurface.h b/plugins/multimedia/gstreamer/qx11videosurface.h index 07ae9e7d8d..b3f90a0a83 100644 --- a/plugins/multimedia/gstreamer/qx11videosurface.h +++ b/plugins/multimedia/gstreamer/qx11videosurface.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/m3u/m3u.pro b/plugins/multimedia/m3u/m3u.pro index aeebd3b940..81c745088d 100644 --- a/plugins/multimedia/m3u/m3u.pro +++ b/plugins/multimedia/m3u/m3u.pro @@ -2,7 +2,7 @@ TEMPLATE = lib CONFIG += plugin TARGET = $$qtLibraryTarget(qtmedia_m3u) -PLUGIN_TYPE = playlistformats +PLUGIN_TYPE=playlistformats include (../../../common.pri) @@ -26,7 +26,3 @@ symbian { pluginDep.path = $${QT_PLUGINS_BASE_DIR}/$${PLUGIN_TYPE} DEPLOYMENT += pluginDep } - -target.path=$${QT_MOBILITY_PREFIX}/plugins/$${PLUGIN_TYPE} -maemo6:target.path=$$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE} -INSTALLS+=target diff --git a/plugins/multimedia/m3u/main.cpp b/plugins/multimedia/m3u/main.cpp index 2483e37679..37400fbd51 100644 --- a/plugins/multimedia/m3u/main.cpp +++ b/plugins/multimedia/m3u/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/m3u/qm3uhandler.cpp b/plugins/multimedia/m3u/qm3uhandler.cpp index 66716bf0b7..ac03b8d4c9 100644 --- a/plugins/multimedia/m3u/qm3uhandler.cpp +++ b/plugins/multimedia/m3u/qm3uhandler.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/m3u/qm3uhandler.h b/plugins/multimedia/m3u/qm3uhandler.h index 6f9850a176..9013137bf2 100644 --- a/plugins/multimedia/m3u/qm3uhandler.h +++ b/plugins/multimedia/m3u/qm3uhandler.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/qt7/qcvdisplaylink.h b/plugins/multimedia/qt7/qcvdisplaylink.h index f6a4920bd3..5410775c5a 100644 --- a/plugins/multimedia/qt7/qcvdisplaylink.h +++ b/plugins/multimedia/qt7/qcvdisplaylink.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/qt7/qcvdisplaylink.mm b/plugins/multimedia/qt7/qcvdisplaylink.mm index 5d1b4283c5..ecc4235bd7 100644 --- a/plugins/multimedia/qt7/qcvdisplaylink.mm +++ b/plugins/multimedia/qt7/qcvdisplaylink.mm @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/qt7/qt7.pro b/plugins/multimedia/qt7/qt7.pro index ddb29ff16e..c7a1801dfc 100644 --- a/plugins/multimedia/qt7/qt7.pro +++ b/plugins/multimedia/qt7/qt7.pro @@ -55,8 +55,3 @@ OBJECTIVE_SOURCES += \ qt7videooutputcontrol.mm \ qt7playerservice.mm \ qcvdisplaylink.mm - - -target.path=$${QT_MOBILITY_PREFIX}/plugins/$${PLUGIN_TYPE} -maemo6:target.path=$$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE} -INSTALLS+=target diff --git a/plugins/multimedia/qt7/qt7backend.h b/plugins/multimedia/qt7/qt7backend.h index eec8c4d365..f873cbb955 100644 --- a/plugins/multimedia/qt7/qt7backend.h +++ b/plugins/multimedia/qt7/qt7backend.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/qt7/qt7backend.mm b/plugins/multimedia/qt7/qt7backend.mm index 0c628b32db..83a044dab8 100644 --- a/plugins/multimedia/qt7/qt7backend.mm +++ b/plugins/multimedia/qt7/qt7backend.mm @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/qt7/qt7movierenderer.h b/plugins/multimedia/qt7/qt7movierenderer.h index f43cae4669..693de2d838 100644 --- a/plugins/multimedia/qt7/qt7movierenderer.h +++ b/plugins/multimedia/qt7/qt7movierenderer.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/qt7/qt7movierenderer.mm b/plugins/multimedia/qt7/qt7movierenderer.mm index 51503a7068..0a99812da8 100644 --- a/plugins/multimedia/qt7/qt7movierenderer.mm +++ b/plugins/multimedia/qt7/qt7movierenderer.mm @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/qt7/qt7movievideowidget.h b/plugins/multimedia/qt7/qt7movievideowidget.h index a88787048a..6678204364 100644 --- a/plugins/multimedia/qt7/qt7movievideowidget.h +++ b/plugins/multimedia/qt7/qt7movievideowidget.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/qt7/qt7movievideowidget.mm b/plugins/multimedia/qt7/qt7movievideowidget.mm index 0b16998568..f0a3a1e6cb 100644 --- a/plugins/multimedia/qt7/qt7movievideowidget.mm +++ b/plugins/multimedia/qt7/qt7movievideowidget.mm @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/qt7/qt7movieviewoutput.h b/plugins/multimedia/qt7/qt7movieviewoutput.h index 5d502620b9..fdf12c137b 100644 --- a/plugins/multimedia/qt7/qt7movieviewoutput.h +++ b/plugins/multimedia/qt7/qt7movieviewoutput.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/qt7/qt7movieviewoutput.mm b/plugins/multimedia/qt7/qt7movieviewoutput.mm index 0e6387876b..bb41dd8413 100644 --- a/plugins/multimedia/qt7/qt7movieviewoutput.mm +++ b/plugins/multimedia/qt7/qt7movieviewoutput.mm @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/qt7/qt7movieviewrenderer.h b/plugins/multimedia/qt7/qt7movieviewrenderer.h index 1ef18026e2..2148406b3c 100644 --- a/plugins/multimedia/qt7/qt7movieviewrenderer.h +++ b/plugins/multimedia/qt7/qt7movieviewrenderer.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/qt7/qt7movieviewrenderer.mm b/plugins/multimedia/qt7/qt7movieviewrenderer.mm index 561b88959a..62a5a21a3b 100644 --- a/plugins/multimedia/qt7/qt7movieviewrenderer.mm +++ b/plugins/multimedia/qt7/qt7movieviewrenderer.mm @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/qt7/qt7playercontrol.h b/plugins/multimedia/qt7/qt7playercontrol.h index a646d4d75c..b3371839fc 100644 --- a/plugins/multimedia/qt7/qt7playercontrol.h +++ b/plugins/multimedia/qt7/qt7playercontrol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/qt7/qt7playercontrol.mm b/plugins/multimedia/qt7/qt7playercontrol.mm index 7c4dabfbfe..c4734d1a5d 100644 --- a/plugins/multimedia/qt7/qt7playercontrol.mm +++ b/plugins/multimedia/qt7/qt7playercontrol.mm @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/qt7/qt7playermetadata.h b/plugins/multimedia/qt7/qt7playermetadata.h index 9921120303..5683c5c245 100644 --- a/plugins/multimedia/qt7/qt7playermetadata.h +++ b/plugins/multimedia/qt7/qt7playermetadata.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/qt7/qt7playermetadata.mm b/plugins/multimedia/qt7/qt7playermetadata.mm index dcaaa4cc29..76548277cc 100644 --- a/plugins/multimedia/qt7/qt7playermetadata.mm +++ b/plugins/multimedia/qt7/qt7playermetadata.mm @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/qt7/qt7playerservice.h b/plugins/multimedia/qt7/qt7playerservice.h index f658fa4b96..04dffa9c47 100644 --- a/plugins/multimedia/qt7/qt7playerservice.h +++ b/plugins/multimedia/qt7/qt7playerservice.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/qt7/qt7playerservice.mm b/plugins/multimedia/qt7/qt7playerservice.mm index f16f61449c..9765ab8da7 100644 --- a/plugins/multimedia/qt7/qt7playerservice.mm +++ b/plugins/multimedia/qt7/qt7playerservice.mm @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/qt7/qt7playersession.h b/plugins/multimedia/qt7/qt7playersession.h index 41e7d488e9..47e18e9593 100644 --- a/plugins/multimedia/qt7/qt7playersession.h +++ b/plugins/multimedia/qt7/qt7playersession.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/qt7/qt7playersession.mm b/plugins/multimedia/qt7/qt7playersession.mm index 87d0ed202f..cff60e88e2 100644 --- a/plugins/multimedia/qt7/qt7playersession.mm +++ b/plugins/multimedia/qt7/qt7playersession.mm @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/qt7/qt7serviceplugin.h b/plugins/multimedia/qt7/qt7serviceplugin.h index a499953dc8..da4ac9419c 100644 --- a/plugins/multimedia/qt7/qt7serviceplugin.h +++ b/plugins/multimedia/qt7/qt7serviceplugin.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/qt7/qt7serviceplugin.mm b/plugins/multimedia/qt7/qt7serviceplugin.mm index 38f0ded11d..b0335f4bbc 100644 --- a/plugins/multimedia/qt7/qt7serviceplugin.mm +++ b/plugins/multimedia/qt7/qt7serviceplugin.mm @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/qt7/qt7videooutputcontrol.h b/plugins/multimedia/qt7/qt7videooutputcontrol.h index a13ae9a2a9..0ff50c367a 100644 --- a/plugins/multimedia/qt7/qt7videooutputcontrol.h +++ b/plugins/multimedia/qt7/qt7videooutputcontrol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/qt7/qt7videooutputcontrol.mm b/plugins/multimedia/qt7/qt7videooutputcontrol.mm index a57ecc3d33..2a9bfd61a6 100644 --- a/plugins/multimedia/qt7/qt7videooutputcontrol.mm +++ b/plugins/multimedia/qt7/qt7videooutputcontrol.mm @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/symbian/common/s60videooutputcontrol.cpp b/plugins/multimedia/symbian/common/s60videooutputcontrol.cpp index f2e868ae57..9a84ceb496 100644 --- a/plugins/multimedia/symbian/common/s60videooutputcontrol.cpp +++ b/plugins/multimedia/symbian/common/s60videooutputcontrol.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/symbian/common/s60videooutputcontrol.h b/plugins/multimedia/symbian/common/s60videooutputcontrol.h index 10d21b7ab6..e1f3880679 100644 --- a/plugins/multimedia/symbian/common/s60videooutputcontrol.h +++ b/plugins/multimedia/symbian/common/s60videooutputcontrol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/symbian/mmf/audiosource/s60audiocaptureservice.cpp b/plugins/multimedia/symbian/mmf/audiosource/s60audiocaptureservice.cpp index fac5927a7e..023009d1ab 100644 --- a/plugins/multimedia/symbian/mmf/audiosource/s60audiocaptureservice.cpp +++ b/plugins/multimedia/symbian/mmf/audiosource/s60audiocaptureservice.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/symbian/mmf/audiosource/s60audiocaptureservice.h b/plugins/multimedia/symbian/mmf/audiosource/s60audiocaptureservice.h index 18cddbd525..b975eb0d13 100644 --- a/plugins/multimedia/symbian/mmf/audiosource/s60audiocaptureservice.h +++ b/plugins/multimedia/symbian/mmf/audiosource/s60audiocaptureservice.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/symbian/mmf/audiosource/s60audiocapturesession.cpp b/plugins/multimedia/symbian/mmf/audiosource/s60audiocapturesession.cpp index 52d5b7b9ac..1f4cddb1ec 100644 --- a/plugins/multimedia/symbian/mmf/audiosource/s60audiocapturesession.cpp +++ b/plugins/multimedia/symbian/mmf/audiosource/s60audiocapturesession.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/symbian/mmf/audiosource/s60audiocapturesession.h b/plugins/multimedia/symbian/mmf/audiosource/s60audiocapturesession.h index 35d006c40d..8f6b58ba7d 100644 --- a/plugins/multimedia/symbian/mmf/audiosource/s60audiocapturesession.h +++ b/plugins/multimedia/symbian/mmf/audiosource/s60audiocapturesession.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/symbian/mmf/audiosource/s60audiocontainercontrol.cpp b/plugins/multimedia/symbian/mmf/audiosource/s60audiocontainercontrol.cpp index ed5260fc9c..f68942efc2 100644 --- a/plugins/multimedia/symbian/mmf/audiosource/s60audiocontainercontrol.cpp +++ b/plugins/multimedia/symbian/mmf/audiosource/s60audiocontainercontrol.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/symbian/mmf/audiosource/s60audiocontainercontrol.h b/plugins/multimedia/symbian/mmf/audiosource/s60audiocontainercontrol.h index 9a179632ec..3d328e3b46 100644 --- a/plugins/multimedia/symbian/mmf/audiosource/s60audiocontainercontrol.h +++ b/plugins/multimedia/symbian/mmf/audiosource/s60audiocontainercontrol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/symbian/mmf/audiosource/s60audioencodercontrol.cpp b/plugins/multimedia/symbian/mmf/audiosource/s60audioencodercontrol.cpp index cffad40465..69d8c9f0df 100644 --- a/plugins/multimedia/symbian/mmf/audiosource/s60audioencodercontrol.cpp +++ b/plugins/multimedia/symbian/mmf/audiosource/s60audioencodercontrol.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/symbian/mmf/audiosource/s60audioencodercontrol.h b/plugins/multimedia/symbian/mmf/audiosource/s60audioencodercontrol.h index de9e56b525..8e2eb96942 100644 --- a/plugins/multimedia/symbian/mmf/audiosource/s60audioencodercontrol.h +++ b/plugins/multimedia/symbian/mmf/audiosource/s60audioencodercontrol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/symbian/mmf/audiosource/s60audioendpointselector.cpp b/plugins/multimedia/symbian/mmf/audiosource/s60audioendpointselector.cpp index 98b709ff32..b6b0cbdc51 100644 --- a/plugins/multimedia/symbian/mmf/audiosource/s60audioendpointselector.cpp +++ b/plugins/multimedia/symbian/mmf/audiosource/s60audioendpointselector.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/symbian/mmf/audiosource/s60audioendpointselector.h b/plugins/multimedia/symbian/mmf/audiosource/s60audioendpointselector.h index 316fd21f20..ced5ef86df 100644 --- a/plugins/multimedia/symbian/mmf/audiosource/s60audioendpointselector.h +++ b/plugins/multimedia/symbian/mmf/audiosource/s60audioendpointselector.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/symbian/mmf/audiosource/s60audiomediarecordercontrol.cpp b/plugins/multimedia/symbian/mmf/audiosource/s60audiomediarecordercontrol.cpp index 2e8f9bd54e..b9bf4f6f73 100644 --- a/plugins/multimedia/symbian/mmf/audiosource/s60audiomediarecordercontrol.cpp +++ b/plugins/multimedia/symbian/mmf/audiosource/s60audiomediarecordercontrol.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/symbian/mmf/audiosource/s60audiomediarecordercontrol.h b/plugins/multimedia/symbian/mmf/audiosource/s60audiomediarecordercontrol.h index b8c864f156..7d2f48c8eb 100644 --- a/plugins/multimedia/symbian/mmf/audiosource/s60audiomediarecordercontrol.h +++ b/plugins/multimedia/symbian/mmf/audiosource/s60audiomediarecordercontrol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/symbian/mmf/mediaplayer/ms60mediaplayerresolver.h b/plugins/multimedia/symbian/mmf/mediaplayer/ms60mediaplayerresolver.h index 4b427ef2de..d836dae3ef 100644 --- a/plugins/multimedia/symbian/mmf/mediaplayer/ms60mediaplayerresolver.h +++ b/plugins/multimedia/symbian/mmf/mediaplayer/ms60mediaplayerresolver.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/symbian/mmf/mediaplayer/s60audioplayersession.cpp b/plugins/multimedia/symbian/mmf/mediaplayer/s60audioplayersession.cpp index 1248330608..ef2c9d9b44 100644 --- a/plugins/multimedia/symbian/mmf/mediaplayer/s60audioplayersession.cpp +++ b/plugins/multimedia/symbian/mmf/mediaplayer/s60audioplayersession.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/symbian/mmf/mediaplayer/s60audioplayersession.h b/plugins/multimedia/symbian/mmf/mediaplayer/s60audioplayersession.h index 51d486628e..934b381b75 100644 --- a/plugins/multimedia/symbian/mmf/mediaplayer/s60audioplayersession.h +++ b/plugins/multimedia/symbian/mmf/mediaplayer/s60audioplayersession.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediametadataprovider.cpp b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediametadataprovider.cpp index b05da12895..980937f1ce 100644 --- a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediametadataprovider.cpp +++ b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediametadataprovider.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediametadataprovider.h b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediametadataprovider.h index f3807ef15f..1a2e205cfc 100644 --- a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediametadataprovider.h +++ b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediametadataprovider.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayeraudioendpointselector.cpp b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayeraudioendpointselector.cpp index d592ce6d8e..d29a89c0cf 100644 --- a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayeraudioendpointselector.cpp +++ b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayeraudioendpointselector.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayeraudioendpointselector.h b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayeraudioendpointselector.h index eb8215b005..638cbd42b6 100644 --- a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayeraudioendpointselector.h +++ b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayeraudioendpointselector.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayercontrol.cpp b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayercontrol.cpp index cb711d332c..7c25cb0fec 100644 --- a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayercontrol.cpp +++ b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayercontrol.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayercontrol.h b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayercontrol.h index af3879b789..d3d912f37a 100644 --- a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayercontrol.h +++ b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayercontrol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayerservice.cpp b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayerservice.cpp index b80df24024..e599fb61b6 100644 --- a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayerservice.cpp +++ b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayerservice.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayerservice.h b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayerservice.h index 28f13a16f8..ebd98bee32 100644 --- a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayerservice.h +++ b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayerservice.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayersession.cpp b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayersession.cpp index f01d055b8a..5373b4b862 100644 --- a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayersession.cpp +++ b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayersession.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayersession.h b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayersession.h index 60f854f66b..c7dd750c8e 100644 --- a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayersession.h +++ b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayersession.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediarecognizer.cpp b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediarecognizer.cpp index 91db159417..2a8a662f68 100644 --- a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediarecognizer.cpp +++ b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediarecognizer.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediarecognizer.h b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediarecognizer.h index 493be90942..847b79e9e6 100644 --- a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediarecognizer.h +++ b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediarecognizer.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/symbian/mmf/mediaplayer/s60videooverlay.cpp b/plugins/multimedia/symbian/mmf/mediaplayer/s60videooverlay.cpp index 6c36046424..603d25ee04 100644 --- a/plugins/multimedia/symbian/mmf/mediaplayer/s60videooverlay.cpp +++ b/plugins/multimedia/symbian/mmf/mediaplayer/s60videooverlay.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/symbian/mmf/mediaplayer/s60videooverlay.h b/plugins/multimedia/symbian/mmf/mediaplayer/s60videooverlay.h index 4fd27ee2fb..6e2f9e74c7 100644 --- a/plugins/multimedia/symbian/mmf/mediaplayer/s60videooverlay.h +++ b/plugins/multimedia/symbian/mmf/mediaplayer/s60videooverlay.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/symbian/mmf/mediaplayer/s60videoplayersession.cpp b/plugins/multimedia/symbian/mmf/mediaplayer/s60videoplayersession.cpp index 29244d8655..e6d9274e11 100644 --- a/plugins/multimedia/symbian/mmf/mediaplayer/s60videoplayersession.cpp +++ b/plugins/multimedia/symbian/mmf/mediaplayer/s60videoplayersession.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/symbian/mmf/mediaplayer/s60videoplayersession.h b/plugins/multimedia/symbian/mmf/mediaplayer/s60videoplayersession.h index 56eef5fc90..14a59b00ee 100644 --- a/plugins/multimedia/symbian/mmf/mediaplayer/s60videoplayersession.h +++ b/plugins/multimedia/symbian/mmf/mediaplayer/s60videoplayersession.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/symbian/mmf/mediaplayer/s60videorenderer.cpp b/plugins/multimedia/symbian/mmf/mediaplayer/s60videorenderer.cpp index 55c55502a6..6b433d2cc8 100644 --- a/plugins/multimedia/symbian/mmf/mediaplayer/s60videorenderer.cpp +++ b/plugins/multimedia/symbian/mmf/mediaplayer/s60videorenderer.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/symbian/mmf/mediaplayer/s60videorenderer.h b/plugins/multimedia/symbian/mmf/mediaplayer/s60videorenderer.h index f725bcd068..1086edd75a 100644 --- a/plugins/multimedia/symbian/mmf/mediaplayer/s60videorenderer.h +++ b/plugins/multimedia/symbian/mmf/mediaplayer/s60videorenderer.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/symbian/mmf/mediaplayer/s60videosurface.cpp b/plugins/multimedia/symbian/mmf/mediaplayer/s60videosurface.cpp index 9fd83f6661..93d8cddfb8 100644 --- a/plugins/multimedia/symbian/mmf/mediaplayer/s60videosurface.cpp +++ b/plugins/multimedia/symbian/mmf/mediaplayer/s60videosurface.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/symbian/mmf/mediaplayer/s60videosurface.h b/plugins/multimedia/symbian/mmf/mediaplayer/s60videosurface.h index d3eebae8cc..1fd565fe4f 100644 --- a/plugins/multimedia/symbian/mmf/mediaplayer/s60videosurface.h +++ b/plugins/multimedia/symbian/mmf/mediaplayer/s60videosurface.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/symbian/mmf/mediaplayer/s60videowidget.cpp b/plugins/multimedia/symbian/mmf/mediaplayer/s60videowidget.cpp index c093c97dea..b8588fff00 100644 --- a/plugins/multimedia/symbian/mmf/mediaplayer/s60videowidget.cpp +++ b/plugins/multimedia/symbian/mmf/mediaplayer/s60videowidget.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/symbian/mmf/mediaplayer/s60videowidget.h b/plugins/multimedia/symbian/mmf/mediaplayer/s60videowidget.h index e0c4b65e51..bb2c165b00 100644 --- a/plugins/multimedia/symbian/mmf/mediaplayer/s60videowidget.h +++ b/plugins/multimedia/symbian/mmf/mediaplayer/s60videowidget.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/symbian/mmf/radio/s60radiotunercontrol_31.cpp b/plugins/multimedia/symbian/mmf/radio/s60radiotunercontrol_31.cpp index 93c26e4a9f..ca6558882f 100644 --- a/plugins/multimedia/symbian/mmf/radio/s60radiotunercontrol_31.cpp +++ b/plugins/multimedia/symbian/mmf/radio/s60radiotunercontrol_31.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/symbian/mmf/radio/s60radiotunercontrol_31.h b/plugins/multimedia/symbian/mmf/radio/s60radiotunercontrol_31.h index 3e2198e660..c1291b48b0 100644 --- a/plugins/multimedia/symbian/mmf/radio/s60radiotunercontrol_31.h +++ b/plugins/multimedia/symbian/mmf/radio/s60radiotunercontrol_31.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/symbian/mmf/radio/s60radiotunercontrol_since32.cpp b/plugins/multimedia/symbian/mmf/radio/s60radiotunercontrol_since32.cpp index 1517cb6ce8..7364661a0b 100644 --- a/plugins/multimedia/symbian/mmf/radio/s60radiotunercontrol_since32.cpp +++ b/plugins/multimedia/symbian/mmf/radio/s60radiotunercontrol_since32.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/symbian/mmf/radio/s60radiotunercontrol_since32.h b/plugins/multimedia/symbian/mmf/radio/s60radiotunercontrol_since32.h index 7183794edb..3cb3554425 100644 --- a/plugins/multimedia/symbian/mmf/radio/s60radiotunercontrol_since32.h +++ b/plugins/multimedia/symbian/mmf/radio/s60radiotunercontrol_since32.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/symbian/mmf/radio/s60radiotunerservice.cpp b/plugins/multimedia/symbian/mmf/radio/s60radiotunerservice.cpp index 33b8c94832..06eb9203b4 100644 --- a/plugins/multimedia/symbian/mmf/radio/s60radiotunerservice.cpp +++ b/plugins/multimedia/symbian/mmf/radio/s60radiotunerservice.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/symbian/mmf/radio/s60radiotunerservice.h b/plugins/multimedia/symbian/mmf/radio/s60radiotunerservice.h index 946b726e73..fc937184be 100644 --- a/plugins/multimedia/symbian/mmf/radio/s60radiotunerservice.h +++ b/plugins/multimedia/symbian/mmf/radio/s60radiotunerservice.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/symbian/mmf/s60mediaserviceplugin.cpp b/plugins/multimedia/symbian/mmf/s60mediaserviceplugin.cpp index f5b7bf22cb..1846a557e0 100644 --- a/plugins/multimedia/symbian/mmf/s60mediaserviceplugin.cpp +++ b/plugins/multimedia/symbian/mmf/s60mediaserviceplugin.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/symbian/mmf/s60mediaserviceplugin.h b/plugins/multimedia/symbian/mmf/s60mediaserviceplugin.h index 8e6c7165f5..a4985c8b4f 100644 --- a/plugins/multimedia/symbian/mmf/s60mediaserviceplugin.h +++ b/plugins/multimedia/symbian/mmf/s60mediaserviceplugin.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/symbian/openmaxal/mediarecorder/qxaaudioencodercontrol.cpp b/plugins/multimedia/symbian/openmaxal/mediarecorder/qxaaudioencodercontrol.cpp index 38bbffd479..2826f79a2f 100644 --- a/plugins/multimedia/symbian/openmaxal/mediarecorder/qxaaudioencodercontrol.cpp +++ b/plugins/multimedia/symbian/openmaxal/mediarecorder/qxaaudioencodercontrol.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/symbian/openmaxal/mediarecorder/qxaaudioencodercontrol.h b/plugins/multimedia/symbian/openmaxal/mediarecorder/qxaaudioencodercontrol.h index 745b82649b..117d36fdce 100644 --- a/plugins/multimedia/symbian/openmaxal/mediarecorder/qxaaudioencodercontrol.h +++ b/plugins/multimedia/symbian/openmaxal/mediarecorder/qxaaudioencodercontrol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/symbian/openmaxal/mediarecorder/qxaaudioendpointselector.cpp b/plugins/multimedia/symbian/openmaxal/mediarecorder/qxaaudioendpointselector.cpp index 1b7659bbce..7e546595c3 100644 --- a/plugins/multimedia/symbian/openmaxal/mediarecorder/qxaaudioendpointselector.cpp +++ b/plugins/multimedia/symbian/openmaxal/mediarecorder/qxaaudioendpointselector.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/symbian/openmaxal/mediarecorder/qxaaudioendpointselector.h b/plugins/multimedia/symbian/openmaxal/mediarecorder/qxaaudioendpointselector.h index 6e74a39026..5fbadbc643 100644 --- a/plugins/multimedia/symbian/openmaxal/mediarecorder/qxaaudioendpointselector.h +++ b/plugins/multimedia/symbian/openmaxal/mediarecorder/qxaaudioendpointselector.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/symbian/openmaxal/mediarecorder/qxacommon.h b/plugins/multimedia/symbian/openmaxal/mediarecorder/qxacommon.h index 06e0653002..dcd21cef26 100644 --- a/plugins/multimedia/symbian/openmaxal/mediarecorder/qxacommon.h +++ b/plugins/multimedia/symbian/openmaxal/mediarecorder/qxacommon.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/symbian/openmaxal/mediarecorder/qxamediacontainercontrol.cpp b/plugins/multimedia/symbian/openmaxal/mediarecorder/qxamediacontainercontrol.cpp index e8ad19bcd2..0d97fd5e5a 100644 --- a/plugins/multimedia/symbian/openmaxal/mediarecorder/qxamediacontainercontrol.cpp +++ b/plugins/multimedia/symbian/openmaxal/mediarecorder/qxamediacontainercontrol.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/symbian/openmaxal/mediarecorder/qxamediacontainercontrol.h b/plugins/multimedia/symbian/openmaxal/mediarecorder/qxamediacontainercontrol.h index ec6649bc3f..4b05fc190d 100644 --- a/plugins/multimedia/symbian/openmaxal/mediarecorder/qxamediacontainercontrol.h +++ b/plugins/multimedia/symbian/openmaxal/mediarecorder/qxamediacontainercontrol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/symbian/openmaxal/mediarecorder/qxamediarecordercontrol.cpp b/plugins/multimedia/symbian/openmaxal/mediarecorder/qxamediarecordercontrol.cpp index 2f21f1a081..182e444fd1 100644 --- a/plugins/multimedia/symbian/openmaxal/mediarecorder/qxamediarecordercontrol.cpp +++ b/plugins/multimedia/symbian/openmaxal/mediarecorder/qxamediarecordercontrol.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/symbian/openmaxal/mediarecorder/qxamediarecordercontrol.h b/plugins/multimedia/symbian/openmaxal/mediarecorder/qxamediarecordercontrol.h index 70e19944cf..c12d307b99 100644 --- a/plugins/multimedia/symbian/openmaxal/mediarecorder/qxamediarecordercontrol.h +++ b/plugins/multimedia/symbian/openmaxal/mediarecorder/qxamediarecordercontrol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/symbian/openmaxal/mediarecorder/qxarecordmediaservice.cpp b/plugins/multimedia/symbian/openmaxal/mediarecorder/qxarecordmediaservice.cpp index 75b6dd4baa..7edf56b595 100644 --- a/plugins/multimedia/symbian/openmaxal/mediarecorder/qxarecordmediaservice.cpp +++ b/plugins/multimedia/symbian/openmaxal/mediarecorder/qxarecordmediaservice.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/symbian/openmaxal/mediarecorder/qxarecordmediaservice.h b/plugins/multimedia/symbian/openmaxal/mediarecorder/qxarecordmediaservice.h index b3b3389d79..e56b016acd 100644 --- a/plugins/multimedia/symbian/openmaxal/mediarecorder/qxarecordmediaservice.h +++ b/plugins/multimedia/symbian/openmaxal/mediarecorder/qxarecordmediaservice.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/symbian/openmaxal/mediarecorder/qxarecordmediaserviceproviderplugin.cpp b/plugins/multimedia/symbian/openmaxal/mediarecorder/qxarecordmediaserviceproviderplugin.cpp index bace9eb282..62421a58be 100644 --- a/plugins/multimedia/symbian/openmaxal/mediarecorder/qxarecordmediaserviceproviderplugin.cpp +++ b/plugins/multimedia/symbian/openmaxal/mediarecorder/qxarecordmediaserviceproviderplugin.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/symbian/openmaxal/mediarecorder/qxarecordmediaserviceproviderplugin.h b/plugins/multimedia/symbian/openmaxal/mediarecorder/qxarecordmediaserviceproviderplugin.h index a6f66c73dc..5d1363f486 100644 --- a/plugins/multimedia/symbian/openmaxal/mediarecorder/qxarecordmediaserviceproviderplugin.h +++ b/plugins/multimedia/symbian/openmaxal/mediarecorder/qxarecordmediaserviceproviderplugin.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/symbian/openmaxal/mediarecorder/qxarecordsession.cpp b/plugins/multimedia/symbian/openmaxal/mediarecorder/qxarecordsession.cpp index 24da04cbdd..542737463a 100644 --- a/plugins/multimedia/symbian/openmaxal/mediarecorder/qxarecordsession.cpp +++ b/plugins/multimedia/symbian/openmaxal/mediarecorder/qxarecordsession.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/symbian/openmaxal/mediarecorder/qxarecordsession.h b/plugins/multimedia/symbian/openmaxal/mediarecorder/qxarecordsession.h index 2f2cd30594..3c76d11865 100644 --- a/plugins/multimedia/symbian/openmaxal/mediarecorder/qxarecordsession.h +++ b/plugins/multimedia/symbian/openmaxal/mediarecorder/qxarecordsession.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/symbian/openmaxal/mediarecorder/xarecordsessioncommon.h b/plugins/multimedia/symbian/openmaxal/mediarecorder/xarecordsessioncommon.h index 8b6fc4b3fd..95d748f9ef 100644 --- a/plugins/multimedia/symbian/openmaxal/mediarecorder/xarecordsessioncommon.h +++ b/plugins/multimedia/symbian/openmaxal/mediarecorder/xarecordsessioncommon.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/symbian/openmaxal/mediarecorder/xarecordsessionimpl.cpp b/plugins/multimedia/symbian/openmaxal/mediarecorder/xarecordsessionimpl.cpp index 0303886fee..b03cbff789 100644 --- a/plugins/multimedia/symbian/openmaxal/mediarecorder/xarecordsessionimpl.cpp +++ b/plugins/multimedia/symbian/openmaxal/mediarecorder/xarecordsessionimpl.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/symbian/openmaxal/mediarecorder/xarecordsessionimpl.h b/plugins/multimedia/symbian/openmaxal/mediarecorder/xarecordsessionimpl.h index e5280e4e6e..64796ef7dd 100644 --- a/plugins/multimedia/symbian/openmaxal/mediarecorder/xarecordsessionimpl.h +++ b/plugins/multimedia/symbian/openmaxal/mediarecorder/xarecordsessionimpl.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/v4l/radio/v4lradiocontrol.cpp b/plugins/multimedia/v4l/radio/v4lradiocontrol.cpp index 92c36e976a..ae7c21c72c 100644 --- a/plugins/multimedia/v4l/radio/v4lradiocontrol.cpp +++ b/plugins/multimedia/v4l/radio/v4lradiocontrol.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/v4l/radio/v4lradiocontrol.h b/plugins/multimedia/v4l/radio/v4lradiocontrol.h index ac031a42ae..201e6d6873 100644 --- a/plugins/multimedia/v4l/radio/v4lradiocontrol.h +++ b/plugins/multimedia/v4l/radio/v4lradiocontrol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/v4l/radio/v4lradiocontrol_maemo5.cpp b/plugins/multimedia/v4l/radio/v4lradiocontrol_maemo5.cpp index 07d1cc7720..ce11e97bf8 100644 --- a/plugins/multimedia/v4l/radio/v4lradiocontrol_maemo5.cpp +++ b/plugins/multimedia/v4l/radio/v4lradiocontrol_maemo5.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/v4l/radio/v4lradiocontrol_maemo5.h b/plugins/multimedia/v4l/radio/v4lradiocontrol_maemo5.h index 70c54fba11..77f5d016cf 100644 --- a/plugins/multimedia/v4l/radio/v4lradiocontrol_maemo5.h +++ b/plugins/multimedia/v4l/radio/v4lradiocontrol_maemo5.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/v4l/radio/v4lradioservice.cpp b/plugins/multimedia/v4l/radio/v4lradioservice.cpp index 44dd408d05..9b3037d324 100644 --- a/plugins/multimedia/v4l/radio/v4lradioservice.cpp +++ b/plugins/multimedia/v4l/radio/v4lradioservice.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/v4l/radio/v4lradioservice.h b/plugins/multimedia/v4l/radio/v4lradioservice.h index 7e82b46a74..f256b6b936 100644 --- a/plugins/multimedia/v4l/radio/v4lradioservice.h +++ b/plugins/multimedia/v4l/radio/v4lradioservice.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/v4l/v4l.pro b/plugins/multimedia/v4l/v4l.pro index 13efec2f6a..f250a4f04f 100644 --- a/plugins/multimedia/v4l/v4l.pro +++ b/plugins/multimedia/v4l/v4l.pro @@ -17,7 +17,3 @@ HEADERS += v4lserviceplugin.h SOURCES += v4lserviceplugin.cpp include(radio/radio.pri) - -target.path=$${QT_MOBILITY_PREFIX}/plugins/$${PLUGIN_TYPE} -maemo6:target.path=$$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE} -INSTALLS+=target diff --git a/plugins/multimedia/v4l/v4lserviceplugin.cpp b/plugins/multimedia/v4l/v4lserviceplugin.cpp index 0a2e6b94c2..3e02be9fa7 100644 --- a/plugins/multimedia/v4l/v4lserviceplugin.cpp +++ b/plugins/multimedia/v4l/v4lserviceplugin.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/v4l/v4lserviceplugin.h b/plugins/multimedia/v4l/v4lserviceplugin.h index 9342ccb1c4..b95d70358a 100644 --- a/plugins/multimedia/v4l/v4lserviceplugin.h +++ b/plugins/multimedia/v4l/v4lserviceplugin.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/wmp/qevrvideooverlay.cpp b/plugins/multimedia/wmp/qevrvideooverlay.cpp index 56e0eb3380..8840ac8dd2 100644 --- a/plugins/multimedia/wmp/qevrvideooverlay.cpp +++ b/plugins/multimedia/wmp/qevrvideooverlay.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/wmp/qevrvideooverlay.h b/plugins/multimedia/wmp/qevrvideooverlay.h index 496646f44e..0f7f31e5b4 100644 --- a/plugins/multimedia/wmp/qevrvideooverlay.h +++ b/plugins/multimedia/wmp/qevrvideooverlay.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/wmp/qmfactivate.cpp b/plugins/multimedia/wmp/qmfactivate.cpp index 15c3192f60..8cd64b0e47 100644 --- a/plugins/multimedia/wmp/qmfactivate.cpp +++ b/plugins/multimedia/wmp/qmfactivate.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/wmp/qmfactivate.h b/plugins/multimedia/wmp/qmfactivate.h index c7982a094a..0e16926890 100644 --- a/plugins/multimedia/wmp/qmfactivate.h +++ b/plugins/multimedia/wmp/qmfactivate.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/wmp/qwmpevents.cpp b/plugins/multimedia/wmp/qwmpevents.cpp index d2df920286..66df07b4a6 100644 --- a/plugins/multimedia/wmp/qwmpevents.cpp +++ b/plugins/multimedia/wmp/qwmpevents.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/wmp/qwmpevents.h b/plugins/multimedia/wmp/qwmpevents.h index a200abde9e..1fb40309d1 100644 --- a/plugins/multimedia/wmp/qwmpevents.h +++ b/plugins/multimedia/wmp/qwmpevents.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/wmp/qwmpglobal.cpp b/plugins/multimedia/wmp/qwmpglobal.cpp index ae10c896e1..4196bbc4f4 100644 --- a/plugins/multimedia/wmp/qwmpglobal.cpp +++ b/plugins/multimedia/wmp/qwmpglobal.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/wmp/qwmpglobal.h b/plugins/multimedia/wmp/qwmpglobal.h index 8dcef41b39..f8152903f9 100644 --- a/plugins/multimedia/wmp/qwmpglobal.h +++ b/plugins/multimedia/wmp/qwmpglobal.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/wmp/qwmpmetadata.cpp b/plugins/multimedia/wmp/qwmpmetadata.cpp index a59136710a..9ed76c1873 100644 --- a/plugins/multimedia/wmp/qwmpmetadata.cpp +++ b/plugins/multimedia/wmp/qwmpmetadata.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/wmp/qwmpmetadata.h b/plugins/multimedia/wmp/qwmpmetadata.h index d1bd6f63d2..f8d13894a9 100644 --- a/plugins/multimedia/wmp/qwmpmetadata.h +++ b/plugins/multimedia/wmp/qwmpmetadata.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/wmp/qwmpplayercontrol.cpp b/plugins/multimedia/wmp/qwmpplayercontrol.cpp index ae93caff94..ed3b4e0998 100644 --- a/plugins/multimedia/wmp/qwmpplayercontrol.cpp +++ b/plugins/multimedia/wmp/qwmpplayercontrol.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/wmp/qwmpplayercontrol.h b/plugins/multimedia/wmp/qwmpplayercontrol.h index 9d282c5102..52bb3cbb95 100644 --- a/plugins/multimedia/wmp/qwmpplayercontrol.h +++ b/plugins/multimedia/wmp/qwmpplayercontrol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/wmp/qwmpplayerservice.cpp b/plugins/multimedia/wmp/qwmpplayerservice.cpp index f8291c81f8..895feee473 100644 --- a/plugins/multimedia/wmp/qwmpplayerservice.cpp +++ b/plugins/multimedia/wmp/qwmpplayerservice.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/wmp/qwmpplayerservice.h b/plugins/multimedia/wmp/qwmpplayerservice.h index 823779e39b..4d005d169b 100644 --- a/plugins/multimedia/wmp/qwmpplayerservice.h +++ b/plugins/multimedia/wmp/qwmpplayerservice.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/wmp/qwmpplaylist.cpp b/plugins/multimedia/wmp/qwmpplaylist.cpp index 6d287f7fa5..10ce753b17 100644 --- a/plugins/multimedia/wmp/qwmpplaylist.cpp +++ b/plugins/multimedia/wmp/qwmpplaylist.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/wmp/qwmpplaylist.h b/plugins/multimedia/wmp/qwmpplaylist.h index 158508cca9..be168a7b5c 100644 --- a/plugins/multimedia/wmp/qwmpplaylist.h +++ b/plugins/multimedia/wmp/qwmpplaylist.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/wmp/qwmpplaylistcontrol.cpp b/plugins/multimedia/wmp/qwmpplaylistcontrol.cpp index e3a3e94560..9e84b9afff 100644 --- a/plugins/multimedia/wmp/qwmpplaylistcontrol.cpp +++ b/plugins/multimedia/wmp/qwmpplaylistcontrol.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/wmp/qwmpplaylistcontrol.h b/plugins/multimedia/wmp/qwmpplaylistcontrol.h index b152ad4edf..cf519aebb3 100644 --- a/plugins/multimedia/wmp/qwmpplaylistcontrol.h +++ b/plugins/multimedia/wmp/qwmpplaylistcontrol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/wmp/qwmpserviceprovider.cpp b/plugins/multimedia/wmp/qwmpserviceprovider.cpp index 5397750518..eec06008e2 100644 --- a/plugins/multimedia/wmp/qwmpserviceprovider.cpp +++ b/plugins/multimedia/wmp/qwmpserviceprovider.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/wmp/qwmpserviceprovider.h b/plugins/multimedia/wmp/qwmpserviceprovider.h index 3b8d5def1e..d58fb3bc8c 100644 --- a/plugins/multimedia/wmp/qwmpserviceprovider.h +++ b/plugins/multimedia/wmp/qwmpserviceprovider.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/wmp/qwmpvideooutputcontrol.cpp b/plugins/multimedia/wmp/qwmpvideooutputcontrol.cpp index c0cd89ecd0..7494bd1cdc 100644 --- a/plugins/multimedia/wmp/qwmpvideooutputcontrol.cpp +++ b/plugins/multimedia/wmp/qwmpvideooutputcontrol.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/wmp/qwmpvideooutputcontrol.h b/plugins/multimedia/wmp/qwmpvideooutputcontrol.h index ae710dd40f..ad30915fa0 100644 --- a/plugins/multimedia/wmp/qwmpvideooutputcontrol.h +++ b/plugins/multimedia/wmp/qwmpvideooutputcontrol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/wmp/qwmpvideooverlay.cpp b/plugins/multimedia/wmp/qwmpvideooverlay.cpp index 8d9c73c433..bb8a1bc20c 100644 --- a/plugins/multimedia/wmp/qwmpvideooverlay.cpp +++ b/plugins/multimedia/wmp/qwmpvideooverlay.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/wmp/qwmpvideooverlay.h b/plugins/multimedia/wmp/qwmpvideooverlay.h index e4790ca465..2c3b77de8f 100644 --- a/plugins/multimedia/wmp/qwmpvideooverlay.h +++ b/plugins/multimedia/wmp/qwmpvideooverlay.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/multimedia/wmp/wmp.pro b/plugins/multimedia/wmp/wmp.pro index 4c2bd22d7c..39fa631d32 100644 --- a/plugins/multimedia/wmp/wmp.pro +++ b/plugins/multimedia/wmp/wmp.pro @@ -42,7 +42,3 @@ SOURCES = \ qwmpserviceprovider.cpp \ qwmpvideooutputcontrol.cpp \ qwmpvideooverlay.cpp - -target.path=$${QT_MOBILITY_PREFIX}/plugins/$${PLUGIN_TYPE} -maemo6:target.path=$$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE} -INSTALLS+=target diff --git a/plugins/plugins.pro b/plugins/plugins.pro index affdd29f8c..7e1d3e5212 100644 --- a/plugins/plugins.pro +++ b/plugins/plugins.pro @@ -6,3 +6,4 @@ contains(mobility_modules,contacts): SUBDIRS += contacts contains(mobility_modules,multimedia): SUBDIRS += multimedia contains(mobility_modules,sensors): SUBDIRS += sensors contains(mobility_modules,location): SUBDIRS += landmarks +contains(QT_CONFIG,declarative): SUBDIRS += declarative diff --git a/plugins/qimportbase.pri b/plugins/qimportbase.pri new file mode 100644 index 0000000000..cadc97d80a --- /dev/null +++ b/plugins/qimportbase.pri @@ -0,0 +1,31 @@ +TEMPLATE = lib +CONFIG += qt plugin + +win32|mac:!wince*:!win32-msvc:!macx-xcode:CONFIG += debug_and_release + +isEmpty(TARGETPATH) { + error("qimportbase.pri: You must provide a TARGETPATH!") +} +isEmpty(TARGET) { + error("qimportbase.pri: You must provide a TARGET!") +} + +QMLDIRFILE = $${_PRO_FILE_PWD_}/qmldir +copy2build.input = QMLDIRFILE +copy2build.output = $$[QT_INSTALL_PREFIX]/imports/$$TARGETPATH/qmldir +!contains(TEMPLATE_PREFIX, vc):copy2build.variable_out = PRE_TARGETDEPS +copy2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} +copy2build.name = COPY ${QMAKE_FILE_IN} +copy2build.CONFIG += no_link +QMAKE_EXTRA_COMPILERS += copy2build + +TARGET = $$qtLibraryTarget($$TARGET) +contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols + +wince*:LIBS += $$QMAKE_LIBS_GUI + +symbian: { + TARGET.EPOCALLOWDLLDATA=1 + TARGET.CAPABILITY = All -Tcb + load(armcc_warnings) +} diff --git a/plugins/sensors/dummy/dummy.pro b/plugins/sensors/dummy/dummy.pro index 315a767323..c1a6baa78e 100644 --- a/plugins/sensors/dummy/dummy.pro +++ b/plugins/sensors/dummy/dummy.pro @@ -1,13 +1,14 @@ INCLUDEPATH+=../../../src/sensors +TEMPLATE = lib +CONFIG += plugin +PLUGIN_TYPE = sensors + include(version.pri) include(dummy.pri) include(../../../common.pri) -PLUGIN_TYPE = sensors -TEMPLATE = lib -CONFIG += plugin TARGET = $$qtLibraryTarget(qtsensors_dummy) symbian:TARGET.EPOCALLOWDLLDATA = 1 @@ -16,8 +17,3 @@ CONFIG+=mobility MOBILITY+=sensors CONFIG+=strict_flags - -target.path=$${QT_MOBILITY_PREFIX}/plugins/$${PLUGIN_TYPE} -maemo6:target.path=$$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE} -INSTALLS += target - diff --git a/plugins/sensors/dummy/dummyaccelerometer.cpp b/plugins/sensors/dummy/dummyaccelerometer.cpp index 99abe2e1c5..9830b9c199 100644 --- a/plugins/sensors/dummy/dummyaccelerometer.cpp +++ b/plugins/sensors/dummy/dummyaccelerometer.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/sensors/dummy/dummyaccelerometer.h b/plugins/sensors/dummy/dummyaccelerometer.h index b0810667bb..9272e9a969 100644 --- a/plugins/sensors/dummy/dummyaccelerometer.h +++ b/plugins/sensors/dummy/dummyaccelerometer.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/sensors/dummy/dummycommon.cpp b/plugins/sensors/dummy/dummycommon.cpp index baf956e296..abc440dde2 100644 --- a/plugins/sensors/dummy/dummycommon.cpp +++ b/plugins/sensors/dummy/dummycommon.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/sensors/dummy/dummycommon.h b/plugins/sensors/dummy/dummycommon.h index ddf65df15a..c910e594ae 100644 --- a/plugins/sensors/dummy/dummycommon.h +++ b/plugins/sensors/dummy/dummycommon.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/sensors/dummy/dummylightsensor.cpp b/plugins/sensors/dummy/dummylightsensor.cpp index c99775b8f8..f5f96233dd 100644 --- a/plugins/sensors/dummy/dummylightsensor.cpp +++ b/plugins/sensors/dummy/dummylightsensor.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -49,6 +49,8 @@ dummylightsensor::dummylightsensor(QSensor *sensor) : dummycommon(sensor) { setReading<QAmbientLightReading>(&m_reading); + addDataRate(100,100); + sensor->setDataRate(100); } void dummylightsensor::poll() diff --git a/plugins/sensors/dummy/dummylightsensor.h b/plugins/sensors/dummy/dummylightsensor.h index f0283d6e23..7facebab8a 100644 --- a/plugins/sensors/dummy/dummylightsensor.h +++ b/plugins/sensors/dummy/dummylightsensor.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/sensors/dummy/main.cpp b/plugins/sensors/dummy/main.cpp index f7f052587c..99563ebf67 100644 --- a/plugins/sensors/dummy/main.cpp +++ b/plugins/sensors/dummy/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/sensors/generic/generic.pro b/plugins/sensors/generic/generic.pro index afde8b4821..ee09764efe 100644 --- a/plugins/sensors/generic/generic.pro +++ b/plugins/sensors/generic/generic.pro @@ -1,15 +1,15 @@ INCLUDEPATH+=../../../src/sensors -include(version.pri) -include(generic.pri) -include(../../../common.pri) - PLUGIN_TYPE = sensors TEMPLATE = lib CONFIG += plugin TARGET = $$qtLibraryTarget(qtsensors_generic) +include(version.pri) +include(generic.pri) +include(../../../common.pri) + symbian { TARGET.EPOCALLOWDLLDATA = 1 TARGET.UID3 = 0x2002BFC3 @@ -25,8 +25,3 @@ CONFIG+=mobility MOBILITY+=sensors CONFIG+=strict_flags - -target.path=$${QT_MOBILITY_PREFIX}/plugins/$${PLUGIN_TYPE} -maemo6:target.path=$$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE} -INSTALLS += target - diff --git a/plugins/sensors/generic/genericorientationsensor.cpp b/plugins/sensors/generic/genericorientationsensor.cpp index acea82277e..24a7e3a4e0 100644 --- a/plugins/sensors/generic/genericorientationsensor.cpp +++ b/plugins/sensors/generic/genericorientationsensor.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/sensors/generic/genericorientationsensor.h b/plugins/sensors/generic/genericorientationsensor.h index 8d436bb44b..8c4c35774c 100644 --- a/plugins/sensors/generic/genericorientationsensor.h +++ b/plugins/sensors/generic/genericorientationsensor.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/sensors/generic/genericrotationsensor.cpp b/plugins/sensors/generic/genericrotationsensor.cpp index 143db32d99..cd453f6b9c 100644 --- a/plugins/sensors/generic/genericrotationsensor.cpp +++ b/plugins/sensors/generic/genericrotationsensor.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/sensors/generic/genericrotationsensor.h b/plugins/sensors/generic/genericrotationsensor.h index df890b94d5..cb3c5dce5a 100644 --- a/plugins/sensors/generic/genericrotationsensor.h +++ b/plugins/sensors/generic/genericrotationsensor.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/sensors/generic/main.cpp b/plugins/sensors/generic/main.cpp index 93ac50c9b3..dd096b4faa 100644 --- a/plugins/sensors/generic/main.cpp +++ b/plugins/sensors/generic/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/sensors/maemo6/maemo6.pro b/plugins/sensors/maemo6/maemo6.pro index 41e6fc5700..49d2797964 100644 --- a/plugins/sensors/maemo6/maemo6.pro +++ b/plugins/sensors/maemo6/maemo6.pro @@ -16,7 +16,3 @@ MOBILITY += sensors CONFIG += link_pkgconfig PKGCONFIG += sensord -target.path=$${QT_MOBILITY_PREFIX}/plugins/$${PLUGIN_TYPE} -maemo6:target.path=$$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE} -INSTALLS += target - diff --git a/plugins/sensors/maemo6/maemo6accelerometer.cpp b/plugins/sensors/maemo6/maemo6accelerometer.cpp index 8623e734d8..e7c563893a 100644 --- a/plugins/sensors/maemo6/maemo6accelerometer.cpp +++ b/plugins/sensors/maemo6/maemo6accelerometer.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -47,31 +47,30 @@ bool maemo6accelerometer::m_initDone = false; maemo6accelerometer::maemo6accelerometer(QSensor *sensor) : maemo6sensorbase(sensor) { - setReading<QAccelerometerReading>(&m_reading); - + const QString sensorName = "accelerometersensor"; if (!m_initDone) { - qDBusRegisterMetaType<XYZ>(); - - initSensor<AccelerometerSensorChannelInterface>("accelerometersensor"); - - if (m_sensorInterface) - QObject::connect(static_cast<AccelerometerSensorChannelInterface*>(m_sensorInterface), SIGNAL(dataAvailable(const XYZ&)), this, SLOT(slotDataAvailable(const XYZ&))); - else - qWarning() << "Unable to initialize accelerometer sensor."; - - // adding metadata - addDataRate(142, 142); // 142Hz - sensor->setDataRate(142); - //addDataRate(400, 400); // 400Hz - - // accuracy - or resolution??? - // 2^8 = 256 256/2 - 1 = 127 - addOutputRange(-2*GRAVITY_EARTH, 2*GRAVITY_EARTH, 2*GRAVITY_EARTH/127); // 2G - addOutputRange(-8*GRAVITY_EARTH, 8*GRAVITY_EARTH, 8*GRAVITY_EARTH/127); // 8G - setDescription(QLatin1String("Measures x, y, and z axes accelerations in m/s^2")); - + //qDBusRegisterMetaType<XYZ>(); initSensor<AccelerometerSensorChannelInterface>("accelerometersensor"); + m_remoteSensorManager->loadPlugin(sensorName); + m_remoteSensorManager->registerSensorInterface<AccelerometerSensorChannelInterface>(sensorName); m_initDone = true; } + m_sensorInterface = AccelerometerSensorChannelInterface::controlInterface(sensorName); + if (!m_sensorInterface) + m_sensorInterface = const_cast<AccelerometerSensorChannelInterface*>(AccelerometerSensorChannelInterface::listenInterface(sensorName)); + if (m_sensorInterface) + QObject::connect(m_sensorInterface, SIGNAL(dataAvailable(const XYZ&)), this, SLOT(slotDataAvailable(const XYZ&))); + else + qWarning() << "Unable to initialize accelerometer sensor."; + setReading<QAccelerometerReading>(&m_reading); + // adding metadata + addDataRate(0, 130); // 130 Hz + //addDataRate(400, 400); // 400Hz + + // accuracy - or resolution??? + // 2^8 = 256 256/2 - 1 = 127 + addOutputRange(-2*GRAVITY_EARTH, 2*GRAVITY_EARTH, 2*GRAVITY_EARTH/127); // 2G + addOutputRange(-8*GRAVITY_EARTH, 8*GRAVITY_EARTH, 8*GRAVITY_EARTH/127); // 8G + setDescription(QLatin1String("Measures x, y, and z axes accelerations in m/s^2")); } void maemo6accelerometer::slotDataAvailable(const XYZ& data) @@ -85,7 +84,6 @@ void maemo6accelerometer::slotDataAvailable(const XYZ& data) m_reading.setX(ax); m_reading.setY(ay); m_reading.setZ(az); - //m_reading.setTimestamp(data.timestamp()); - m_reading.setTimestamp(createTimestamp()); //TODO: use correct timestamp + m_reading.setTimestamp(data.XYZData().timestamp_); newReadingAvailable(); } diff --git a/plugins/sensors/maemo6/maemo6accelerometer.h b/plugins/sensors/maemo6/maemo6accelerometer.h index 9a5c879b23..60fb354114 100644 --- a/plugins/sensors/maemo6/maemo6accelerometer.h +++ b/plugins/sensors/maemo6/maemo6accelerometer.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -44,10 +44,9 @@ #include "maemo6sensorbase.h" #include <qaccelerometer.h> -#include <qsensorbackend.h> -#include <sensord/accelerometersensor_i.h> -#include <sensord/datatypes/xyz.h> +#include <accelerometersensor_i.h> +#include <datatypes/xyz.h> QTM_USE_NAMESPACE diff --git a/plugins/sensors/maemo6/maemo6als.cpp b/plugins/sensors/maemo6/maemo6als.cpp index 40512c9acc..21d2db3b2e 100644 --- a/plugins/sensors/maemo6/maemo6als.cpp +++ b/plugins/sensors/maemo6/maemo6als.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -47,48 +47,49 @@ bool maemo6als::m_initDone = false; maemo6als::maemo6als(QSensor *sensor) : maemo6sensorbase(sensor) { - setReading<QAmbientLightReading>(&m_reading); + const QString sensorName = "alssensor"; if (!m_initDone) { - initSensor<ALSSensorChannelInterface>("alssensor"); - - if (m_sensorInterface) - QObject::connect(static_cast<const ALSSensorChannelInterface*>(m_sensorInterface), SIGNAL(ALSChanged(const int&)), this, SLOT(slotDataAvailable(const int&))); - else - qWarning() << "Unable to initialize ambient light sensor."; - - // metadata - addDataRate(1, 1); // 1Hz - sensor->setDataRate(1); - addOutputRange(0, 5, 1); - setDescription(QLatin1String("Ambient light intensity given as 5 pre-defined levels")); - + //initSensor<ALSSensorChannelInterface>(sensorName); + m_remoteSensorManager->loadPlugin(sensorName); + m_remoteSensorManager->registerSensorInterface<ALSSensorChannelInterface>(sensorName); m_initDone = true; } + m_sensorInterface = ALSSensorChannelInterface::controlInterface(sensorName); + if (!m_sensorInterface) + m_sensorInterface = const_cast<ALSSensorChannelInterface*>(ALSSensorChannelInterface::listenInterface(sensorName)); + if (m_sensorInterface) + QObject::connect(m_sensorInterface, SIGNAL(ALSChanged(const Unsigned&)), this, SLOT(slotDataAvailable(const Unsigned&))); + else + qWarning() << "Unable to initialize ambient light sensor."; + setReading<QAmbientLightReading>(&m_reading); + // metadata + addDataRate(0, 1); // 1 Hz + addOutputRange(0, 5, 1); + setDescription(QLatin1String("Measures ambient light intensity given as 5 pre-defined levels")); } -void maemo6als::slotDataAvailable(const int& data) +void maemo6als::slotDataAvailable(const Unsigned& data) { // Convert from integer to fixed levels // TODO: verify levels QAmbientLightReading::LightLevel level; - if (data < 0) { + int x = data.x(); + if (x < 0) { level = QAmbientLightReading::Undefined; - } else if (data < 10) { + } else if (x < 10) { level = QAmbientLightReading::Dark; - } else if (data < 50) { + } else if (x < 50) { level = QAmbientLightReading::Twilight; - } else if (data < 100) { + } else if (x < 100) { level = QAmbientLightReading::Light; - } else if (data < 150) { + } else if (x < 150) { level = QAmbientLightReading::Bright; } else { level = QAmbientLightReading::Sunny; } - if (level != m_reading.lightLevel()) { m_reading.setLightLevel(level); - //m_reading.setTimestamp(data.timestamp()); - m_reading.setTimestamp(createTimestamp()); //TODO: use correct timestamp + m_reading.setTimestamp(data.UnsignedData().timestamp_); newReadingAvailable(); } } diff --git a/plugins/sensors/maemo6/maemo6als.h b/plugins/sensors/maemo6/maemo6als.h index 440bc7021b..5d776dc13a 100644 --- a/plugins/sensors/maemo6/maemo6als.h +++ b/plugins/sensors/maemo6/maemo6als.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -45,7 +45,8 @@ #include "maemo6sensorbase.h" #include <qambientlightsensor.h> -#include <sensord/alssensor_i.h> +#include <alssensor_i.h> +#include <unsigned.h> QTM_USE_NAMESPACE @@ -63,7 +64,7 @@ private: static bool m_initDone; private slots: - void slotDataAvailable(const int& data); + void slotDataAvailable(const Unsigned& data); }; #endif diff --git a/plugins/sensors/maemo6/maemo6compass.cpp b/plugins/sensors/maemo6/maemo6compass.cpp index 7ed6261f1b..6336ed28f3 100644 --- a/plugins/sensors/maemo6/maemo6compass.cpp +++ b/plugins/sensors/maemo6/maemo6compass.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -47,48 +47,37 @@ bool maemo6compass::m_initDone = false; maemo6compass::maemo6compass(QSensor *sensor) : maemo6sensorbase(sensor) { - setReading<QCompassReading>(&m_reading); - + const QString sensorName = "compasssensor"; if (!m_initDone) { - initSensor<CompassSensorChannelInterface>("compasssensor"); - - if (m_sensorInterface) { - QObject::connect(static_cast<CompassSensorChannelInterface*>(m_sensorInterface), SIGNAL(levelChanged(const int&)), this, SLOT(slotLevelChanged(const int&))); - QObject::connect(static_cast<CompassSensorChannelInterface*>(m_sensorInterface), SIGNAL(degreesChanged(const int&)), this, SLOT(slotDegreesChanged(const int&))); - } else { - qWarning() << "Unable to initialize compass sensor."; - } - - // metadata TODO accuracy - addDataRate(43, 43); // 43Hz - sensor->setDataRate(43); - addOutputRange(0, 359, 1); - setDescription(QLatin1String("Measures compass north in degrees")); - + //initSensor<CompassSensorChannelInterface>("compasssensor"); + m_remoteSensorManager->loadPlugin(sensorName); + m_remoteSensorManager->registerSensorInterface<CompassSensorChannelInterface>(sensorName); m_initDone = true; } + m_sensorInterface = CompassSensorChannelInterface::controlInterface(sensorName); + if (!m_sensorInterface) + m_sensorInterface = const_cast<CompassSensorChannelInterface*>(CompassSensorChannelInterface::listenInterface(sensorName)); + if (m_sensorInterface) + QObject::connect(m_sensorInterface, SIGNAL(dataAvailable(const Compass&)), this, SLOT(dataAvailable(const Compass&))); + else + qWarning() << "Unable to initialize compass sensor."; + setReading<QCompassReading>(&m_reading); + // metadata + addDataRate(0, 130); // 43 Hz + addOutputRange(0, 359, 1); + setDescription(QLatin1String("Measures compass north in degrees")); } -void maemo6compass::slotLevelChanged(const int& level) +void maemo6compass::dataAvailable(const Compass& data) { // The scale for level is [0,3], where 3 is the best // Qt: Measured as a value from 0 to 1 with higher values being better. - float l = ((float) level) / 3.0; + m_reading.setCalibrationLevel(((float) data.level()) / 3.0); - qreal calibrationLevel = l; - m_reading.setCalibrationLevel(calibrationLevel); - //m_reading.setTimestamp(level.timestamp()); - m_reading.setTimestamp(createTimestamp()); //TODO: use correct timestamp - newReadingAvailable(); -} - -void maemo6compass::slotDegreesChanged(const int& degrees) -{ // The scale for degrees from sensord is [0,359] // Value can be directly used as azimuth - qreal azimuth = degrees; - m_reading.setAzimuth(azimuth); - //m_reading.setTimestamp(degrees.timestamp()); - m_reading.setTimestamp(createTimestamp()); //TODO: use correct timestamp + m_reading.setAzimuth(data.degrees()); + + m_reading.setTimestamp(data.data().timestamp_); newReadingAvailable(); } diff --git a/plugins/sensors/maemo6/maemo6compass.h b/plugins/sensors/maemo6/maemo6compass.h index dc3297982b..28f4fa7d60 100644 --- a/plugins/sensors/maemo6/maemo6compass.h +++ b/plugins/sensors/maemo6/maemo6compass.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -44,9 +44,9 @@ #include "maemo6sensorbase.h" #include <qcompass.h> -#include <qsensorbackend.h> -#include <sensord/compasssensor_i.h> +#include <compasssensor_i.h> +#include <compass.h> QTM_USE_NAMESPACE @@ -63,8 +63,7 @@ private: static bool m_initDone; private slots: - void slotLevelChanged(const int& level); - void slotDegreesChanged(const int& degrees); + void dataAvailable(const Compass& data); }; #endif diff --git a/plugins/sensors/maemo6/maemo6magnetometer.cpp b/plugins/sensors/maemo6/maemo6magnetometer.cpp index fafc0785b5..42e3bf848f 100644 --- a/plugins/sensors/maemo6/maemo6magnetometer.cpp +++ b/plugins/sensors/maemo6/maemo6magnetometer.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -47,25 +47,25 @@ bool maemo6magnetometer::m_initDone = false; maemo6magnetometer::maemo6magnetometer(QSensor *sensor) : maemo6sensorbase(sensor), m_sensor(sensor) { - setReading<QMagnetometerReading>(&m_reading); - + const QString sensorName = "magnetometersensor"; if (!m_initDone) { - qDBusRegisterMetaType<MagneticField>(); - initSensor<MagnetometerSensorChannelInterface>("magnetometersensor"); - - if (m_sensorInterface) - QObject::connect(static_cast<const MagnetometerSensorChannelInterface*>(m_sensorInterface), SIGNAL(dataAvailable(const MagneticField&)), this, SLOT(slotDataAvailable(const MagneticField&))); - else - qWarning() << "Unable to initialize magnetometer sensor."; - - // metadata - addDataRate(43, 43); // 43Hz - sensor->setDataRate(43); - addOutputRange(-0.000614, 0.000614, 0.0000003); // -600 ... 600 mikroteslas, 0.3 uT resolution - setDescription(QLatin1String("Magnetic flux density measured in teslas")); - + //qDBusRegisterMetaType<MagneticField>(); + m_remoteSensorManager->loadPlugin(sensorName); + m_remoteSensorManager->registerSensorInterface<MagnetometerSensorChannelInterface>(sensorName); m_initDone = true; } + m_sensorInterface = MagnetometerSensorChannelInterface::controlInterface(sensorName); + if (!m_sensorInterface) + m_sensorInterface = const_cast<MagnetometerSensorChannelInterface*>(MagnetometerSensorChannelInterface::listenInterface(sensorName)); + if (m_sensorInterface) + QObject::connect(m_sensorInterface, SIGNAL(dataAvailable(const MagneticField&)), this, SLOT(slotDataAvailable(const MagneticField&))); + else + qWarning() << "Unable to initialize magnetometer sensor."; + setReading<QMagnetometerReading>(&m_reading); + // metadata + addDataRate(0, 130); // 43 Hz + addOutputRange(-0.000614, 0.000614, 0.0000003); // -600 ... 600 mikroteslas, 0.3 uT resolution + setDescription(QLatin1String("Measures magnetic flux density in teslas")); } void maemo6magnetometer::slotDataAvailable(const MagneticField& data) @@ -82,7 +82,6 @@ void maemo6magnetometer::slotDataAvailable(const MagneticField& data) m_reading.setZ( 0.0000003 * data.rz() ); m_reading.setCalibrationLevel(1); } - //m_reading.setTimestamp(data.timestamp()); - m_reading.setTimestamp(createTimestamp()); //TODO: use correct timestamp + m_reading.setTimestamp(data.timestamp()); newReadingAvailable(); } diff --git a/plugins/sensors/maemo6/maemo6magnetometer.h b/plugins/sensors/maemo6/maemo6magnetometer.h index bd0b75095f..263873a150 100644 --- a/plugins/sensors/maemo6/maemo6magnetometer.h +++ b/plugins/sensors/maemo6/maemo6magnetometer.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -45,8 +45,8 @@ #include "maemo6sensorbase.h" #include <qmagnetometer.h> -#include <sensord/magnetometersensor_i.h> -#include <sensord/datatypes/magneticfield.h> +#include <magnetometersensor_i.h> +#include <magneticfield.h> QTM_USE_NAMESPACE diff --git a/plugins/sensors/maemo6/maemo6orientationsensor.cpp b/plugins/sensors/maemo6/maemo6orientationsensor.cpp index b2a06d4dde..3dffd19eff 100644 --- a/plugins/sensors/maemo6/maemo6orientationsensor.cpp +++ b/plugins/sensors/maemo6/maemo6orientationsensor.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -41,7 +41,7 @@ #include "maemo6orientationsensor.h" -#include "sensord/filters/posedata.h" +#include <posedata.h> const char *maemo6orientationsensor::id("maemo6.orientationsensor"); bool maemo6orientationsensor::m_initDone = false; @@ -49,30 +49,33 @@ bool maemo6orientationsensor::m_initDone = false; maemo6orientationsensor::maemo6orientationsensor(QSensor *sensor) : maemo6sensorbase(sensor) { - setReading<QOrientationReading>(&m_reading); - + const QString sensorName = "orientationsensor"; if (!m_initDone) { - initSensor<OrientationSensorChannelInterface>("orientationsensor"); - - if (m_sensorInterface) - QObject::connect(static_cast<OrientationSensorChannelInterface*>(m_sensorInterface), SIGNAL(orientationChanged(const int&)), this, SLOT(slotOrientationChanged(const int&))); - else - qWarning() << "Unable to initialize orientation sensor."; - - // metadata - addDataRate(142, 142); // 142Hz - sensor->setDataRate(142); - addOutputRange(0, 6, 1); - setDescription(QLatin1String("Orientation of the device screen")); - + //initSensor<OrientationSensorChannelInterface>("orientationsensor"); + m_remoteSensorManager->loadPlugin(sensorName); + m_remoteSensorManager->registerSensorInterface<OrientationSensorChannelInterface>(sensorName); m_initDone = true; } + m_sensorInterface = OrientationSensorChannelInterface::controlInterface(sensorName); + if (!m_sensorInterface) + m_sensorInterface = const_cast<OrientationSensorChannelInterface*>(OrientationSensorChannelInterface::listenInterface(sensorName)); + if (m_sensorInterface) + QObject::connect(m_sensorInterface, SIGNAL(orientationChanged(const Unsigned&)), this, SLOT(slotOrientationChanged(const Unsigned&))); + else + qWarning() << "Unable to initialize orientation sensor."; + setReading<QOrientationReading>(&m_reading); + // metadata + addDataRate(0, 0); + addDataRate(130, 130); + addDataRate(0, 130); // TODO: this is for testing only + addOutputRange(0, 6, 1); + setDescription(QLatin1String("Measures orientation of the device screen as 6 pre-defined levels")); } -void maemo6orientationsensor::slotOrientationChanged(const int& data) +void maemo6orientationsensor::slotOrientationChanged(const Unsigned& data) { QOrientationReading::Orientation o; - switch (data) { + switch (data.x()) { case PoseData::BottomDown: o = QOrientationReading::TopUp; break; case PoseData::BottomUp: o = QOrientationReading::TopDown; break; case PoseData::LeftUp: o = QOrientationReading::LeftUp; break; @@ -82,7 +85,6 @@ void maemo6orientationsensor::slotOrientationChanged(const int& data) default: o = QOrientationReading::Undefined; } m_reading.setOrientation(o); - //m_reading.setTimestamp(data.timestamp()); - m_reading.setTimestamp(createTimestamp()); //TODO: use correct timestamp + m_reading.setTimestamp(data.UnsignedData().timestamp_); newReadingAvailable(); } diff --git a/plugins/sensors/maemo6/maemo6orientationsensor.h b/plugins/sensors/maemo6/maemo6orientationsensor.h index 7d04ce4ed7..f8a492134d 100644 --- a/plugins/sensors/maemo6/maemo6orientationsensor.h +++ b/plugins/sensors/maemo6/maemo6orientationsensor.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -44,9 +44,9 @@ #include "maemo6sensorbase.h" #include <qorientationsensor.h> -#include <qsensorbackend.h> -#include <sensord/orientationsensor_i.h> +#include <orientationsensor_i.h> +#include <unsigned.h> QTM_USE_NAMESPACE @@ -64,7 +64,7 @@ private: static bool m_initDone; private slots: - void slotOrientationChanged(const int& orientation); + void slotOrientationChanged(const Unsigned& orientation); }; #endif diff --git a/plugins/sensors/maemo6/maemo6proximitysensor.cpp b/plugins/sensors/maemo6/maemo6proximitysensor.cpp index b732030ecd..01dd0ebc39 100644 --- a/plugins/sensors/maemo6/maemo6proximitysensor.cpp +++ b/plugins/sensors/maemo6/maemo6proximitysensor.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -47,36 +47,36 @@ bool maemo6proximitysensor::m_initDone = false; maemo6proximitysensor::maemo6proximitysensor(QSensor *sensor) : maemo6sensorbase(sensor) { - setReading<QProximityReading>(&m_reading); - + const QString sensorName = "proximitysensor"; if (!m_initDone) { - initSensor<ProximitySensorChannelInterface>("proximitysensor"); - - if (m_sensorInterface) - QObject::connect(static_cast<ProximitySensorChannelInterface*>(m_sensorInterface), SIGNAL(dataAvailable(const int&)), this, SLOT(slotDataAvailable(const int&))); - else - qWarning() << "Unable to initialize proximity sensor."; - - // metadata - addDataRate(2, 2); // 2Hz - sensor->setDataRate(2); - addOutputRange(0, 1, 1); // close definition in meters - may be used as metadata even the sensor gives true/false values - setDescription(QLatin1String("Measures if a living object is in proximity or not")); - + //initSensor<ProximitySensorChannelInterface>("proximitysensor"); + m_remoteSensorManager->loadPlugin(sensorName); + m_remoteSensorManager->registerSensorInterface<ProximitySensorChannelInterface>(sensorName); m_initDone = true; } + m_sensorInterface = ProximitySensorChannelInterface::controlInterface(sensorName); + if (!m_sensorInterface) + m_sensorInterface = const_cast<ProximitySensorChannelInterface*>(ProximitySensorChannelInterface::listenInterface(sensorName)); + if (m_sensorInterface) + QObject::connect(m_sensorInterface, SIGNAL(dataAvailable(const Unsigned&)), this, SLOT(slotDataAvailable(const Unsigned&))); + else + qWarning() << "Unable to initialize proximity sensor."; + setReading<QProximityReading>(&m_reading); + // metadata + addDataRate(0, 0); + addDataRate(2, 2); // 2 Hz + addOutputRange(0, 1, 1); // close definition in meters - may be used as metadata even the sensor gives true/false values + setDescription(QLatin1String("Measures if a living object is in proximity or not")); } -void maemo6proximitysensor::slotDataAvailable(const int& data) +void maemo6proximitysensor::slotDataAvailable(const Unsigned& data) { bool close; - if (data) + if (data.x()) close = true; else close = false; - m_reading.setClose(close); - //m_reading.setTimestamp(data.timestamp()); - m_reading.setTimestamp(createTimestamp()); //TODO: use correct timestamp + m_reading.setTimestamp(data.UnsignedData().timestamp_); newReadingAvailable(); } diff --git a/plugins/sensors/maemo6/maemo6proximitysensor.h b/plugins/sensors/maemo6/maemo6proximitysensor.h index 086c47da68..d558d1ca78 100644 --- a/plugins/sensors/maemo6/maemo6proximitysensor.h +++ b/plugins/sensors/maemo6/maemo6proximitysensor.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -45,7 +45,8 @@ #include "maemo6sensorbase.h" #include <qproximitysensor.h> -#include <sensord/proximitysensor_i.h> +#include <proximitysensor_i.h> +#include <unsigned.h> QTM_USE_NAMESPACE @@ -63,7 +64,7 @@ private: static bool m_initDone; private slots: - void slotDataAvailable(const int& data); + void slotDataAvailable(const Unsigned& data); }; #endif diff --git a/plugins/sensors/maemo6/maemo6rotationsensor.cpp b/plugins/sensors/maemo6/maemo6rotationsensor.cpp index 08a270c0c6..198c7c6084 100644 --- a/plugins/sensors/maemo6/maemo6rotationsensor.cpp +++ b/plugins/sensors/maemo6/maemo6rotationsensor.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -47,26 +47,25 @@ bool maemo6rotationsensor::m_initDone = false; maemo6rotationsensor::maemo6rotationsensor(QSensor *sensor) : maemo6sensorbase(sensor) { - setReading<QRotationReading>(&m_reading); - + const QString sensorName = "rotationsensor"; if (!m_initDone) { - qDBusRegisterMetaType<XYZ>(); - - initSensor<RotationSensorChannelInterface>("rotationsensor"); - - if (m_sensorInterface) - QObject::connect(static_cast<RotationSensorChannelInterface*>(m_sensorInterface), SIGNAL(dataAvailable(const XYZ&)), this, SLOT(slotDataAvailable(const XYZ&))); - else - qWarning() << "Unable to initialize rotation sensor."; - - // metadata - addDataRate(23, 23); // 23Hz - sensor->setDataRate(23); - addOutputRange(-180, 180, 1); - setDescription(QLatin1String("Measures x, y, and z axes rotation")); - + //qDBusRegisterMetaType<XYZ>(); initSensor<RotationSensorChannelInterface>("rotationsensor"); + m_remoteSensorManager->loadPlugin(sensorName); + m_remoteSensorManager->registerSensorInterface<RotationSensorChannelInterface>(sensorName); m_initDone = true; } + m_sensorInterface = RotationSensorChannelInterface::controlInterface(sensorName); + if (!m_sensorInterface) + m_sensorInterface = const_cast<RotationSensorChannelInterface*>(RotationSensorChannelInterface::listenInterface(sensorName)); + if (m_sensorInterface) + QObject::connect(m_sensorInterface, SIGNAL(dataAvailable(const XYZ&)), this, SLOT(slotDataAvailable(const XYZ&))); + else + qWarning() << "Unable to initialize rotation sensor."; + setReading<QRotationReading>(&m_reading); + // metadata + addDataRate(0, 130); // 43 Hz + addOutputRange(-179, 180, 1); + setDescription(QLatin1String("Measures x, y, and z axes rotation in degrees")); sensor->setProperty("hasZ", true); } @@ -75,7 +74,6 @@ void maemo6rotationsensor::slotDataAvailable(const XYZ& data) m_reading.setX(data.x()); m_reading.setY(data.y()); m_reading.setZ(data.z()); - //m_reading.setTimestamp(data.timestamp()); - m_reading.setTimestamp(createTimestamp()); //TODO: use correct timestamp + m_reading.setTimestamp(data.XYZData().timestamp_); newReadingAvailable(); } diff --git a/plugins/sensors/maemo6/maemo6rotationsensor.h b/plugins/sensors/maemo6/maemo6rotationsensor.h index cc4621527c..ac7e78d4d8 100644 --- a/plugins/sensors/maemo6/maemo6rotationsensor.h +++ b/plugins/sensors/maemo6/maemo6rotationsensor.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -44,10 +44,9 @@ #include "maemo6sensorbase.h" #include <qrotationsensor.h> -#include <qsensorbackend.h> -#include <sensord/rotationsensor_i.h> -#include <sensord/datatypes/xyz.h> +#include <rotationsensor_i.h> +#include <xyz.h> QTM_USE_NAMESPACE diff --git a/plugins/sensors/maemo6/maemo6sensorbase.cpp b/plugins/sensors/maemo6/maemo6sensorbase.cpp index 9cae8b311f..8b53dfb485 100644 --- a/plugins/sensors/maemo6/maemo6sensorbase.cpp +++ b/plugins/sensors/maemo6/maemo6sensorbase.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -40,14 +40,13 @@ ****************************************************************************/ #include "maemo6sensorbase.h" -#include <ctime> SensorManagerInterface* maemo6sensorbase::m_remoteSensorManager = 0; const float maemo6sensorbase::GRAVITY_EARTH = 9.80665; const float maemo6sensorbase::GRAVITY_EARTH_THOUSANDTH = 0.00980665; maemo6sensorbase::maemo6sensorbase(QSensor *sensor) - : QSensorBackend(sensor), m_sensorRunning(false) + : QSensorBackend(sensor), m_sensorInterface(0), m_sensorRunning(false) { if (!m_remoteSensorManager) m_remoteSensorManager = &SensorManagerInterface::instance(); @@ -91,13 +90,3 @@ void maemo6sensorbase::stop() m_sensorInterface->stop(); m_sensorRunning = false; } - -qtimestamp maemo6sensorbase::createTimestamp() -{ - timespec stamp; - clock_gettime(CLOCK_MONOTONIC, &stamp); - qtimestamp data = stamp.tv_sec; - data = data * 1000000; - data = stamp.tv_nsec / 1000 + data; - return data; -} diff --git a/plugins/sensors/maemo6/maemo6sensorbase.h b/plugins/sensors/maemo6/maemo6sensorbase.h index 85efd269f7..2a02de11e2 100644 --- a/plugins/sensors/maemo6/maemo6sensorbase.h +++ b/plugins/sensors/maemo6/maemo6sensorbase.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -43,8 +43,8 @@ #define MAEMO6SENSORBASE_H #include <qsensorbackend.h> -#include "sensord/sensormanagerinterface.h" -#include "sensord/abstractsensor_i.h" +#include <sensormanagerinterface.h> +#include <abstractsensor_i.h> QTM_USE_NAMESPACE @@ -64,19 +64,6 @@ protected: static const float GRAVITY_EARTH; static const float GRAVITY_EARTH_THOUSANDTH; //for speed - - template<typename T> - void initSensor(QString sensorName) - { - m_remoteSensorManager->loadPlugin(sensorName); - m_remoteSensorManager->registerSensorInterface<T>(sensorName); - m_sensorInterface = T::controlInterface(sensorName); - if (!m_sensorInterface) { - m_sensorInterface = const_cast<T*>(T::listenInterface(sensorName)); - } - } - - qtimestamp createTimestamp(); }; #endif diff --git a/plugins/sensors/maemo6/maemo6tapsensor.cpp b/plugins/sensors/maemo6/maemo6tapsensor.cpp index 177e026a06..eeee652468 100644 --- a/plugins/sensors/maemo6/maemo6tapsensor.cpp +++ b/plugins/sensors/maemo6/maemo6tapsensor.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -41,33 +41,33 @@ #include "maemo6tapsensor.h" -#include "sensord/filters/tapdata.h" - const char *maemo6tapsensor::id("maemo6.tapsensor"); bool maemo6tapsensor::m_initDone = false; maemo6tapsensor::maemo6tapsensor(QSensor *sensor) - : maemo6sensorbase(sensor), m_sensor(sensor) + : maemo6sensorbase(sensor) { - setReading<QTapReading>(&m_reading); - + const QString sensorName = "tapsensor"; if (!m_initDone) { - qDBusRegisterMetaType<Tap>(); - initSensor<TapSensorChannelInterface>("tapsensor"); - - if (m_sensorInterface) - QObject::connect(static_cast<TapSensorChannelInterface*>(m_sensorInterface), SIGNAL(dataAvailable(const Tap&)), this, SLOT(slotDataAvailable(const Tap&))); - else - qWarning() << "Unable to initialize tap sensor."; - - // metadata - addDataRate(100, 100); // 100Hz - sensor->setDataRate(100); - addOutputRange(0, 9, 1); - setDescription(QLatin1String("Measures single and double taps and gives tap direction")); - + //qDBusRegisterMetaType<Tap>(); initSensor<TapSensorChannelInterface>("tapsensor"); + m_remoteSensorManager->loadPlugin(sensorName); + m_remoteSensorManager->registerSensorInterface<TapSensorChannelInterface>(sensorName); m_initDone = true; } + m_sensorInterface = TapSensorChannelInterface::controlInterface(sensorName); + if (!m_sensorInterface) + m_sensorInterface = const_cast<TapSensorChannelInterface*>(TapSensorChannelInterface::listenInterface(sensorName)); + if (m_sensorInterface) + QObject::connect(m_sensorInterface, SIGNAL(dataAvailable(const Tap&)), this, SLOT(slotDataAvailable(const Tap&))); + else + qWarning() << "Unable to initialize tap sensor."; + setReading<QTapReading>(&m_reading); + // metadata + addDataRate(0, 0); + addDataRate(130, 130); + addDataRate(0, 130); // TODO: this is for testing only + addOutputRange(0, 9, 1); + setDescription(QLatin1String("Measures single and double taps and gives tap direction")); } void maemo6tapsensor::slotDataAvailable(const Tap& data) @@ -79,11 +79,15 @@ void maemo6tapsensor::slotDataAvailable(const Tap& data) case TapData::SingleTap: doubleTap = false; break; default: doubleTap = false; } - QVariant v = m_sensor->property("returnDoubleTapEvents"); - if (v.isValid() && v.toBool() == false) - m_reading.setDoubleTap(false); - else - m_reading.setDoubleTap(doubleTap); + QVariant v = sensor()->property("returnDoubleTapEvents"); + if (v.isValid() && v.toBool() == false) { + if (doubleTap) + return; + } else { + if (! doubleTap) + return; + } + m_reading.setDoubleTap(doubleTap); // Set tap direction QTapReading::TapDirection o; @@ -101,7 +105,6 @@ void maemo6tapsensor::slotDataAvailable(const Tap& data) } m_reading.setTapDirection(o); - //m_reading.setTimestamp(data.timestamp()); - m_reading.setTimestamp(createTimestamp()); //TODO: use correct timestamp + m_reading.setTimestamp(data.tapData().timestamp_); newReadingAvailable(); } diff --git a/plugins/sensors/maemo6/maemo6tapsensor.h b/plugins/sensors/maemo6/maemo6tapsensor.h index 43a600e034..f7d61d3dd6 100644 --- a/plugins/sensors/maemo6/maemo6tapsensor.h +++ b/plugins/sensors/maemo6/maemo6tapsensor.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -44,10 +44,9 @@ #include "maemo6sensorbase.h" #include <qtapsensor.h> -#include <qsensorbackend.h> -#include <sensord/tapsensor_i.h> -#include <sensord/datatypes/tap.h> +#include <tapsensor_i.h> +#include <tap.h> QTM_USE_NAMESPACE @@ -63,7 +62,6 @@ public: private: QTapReading m_reading; static bool m_initDone; - QSensor *m_sensor; private slots: void slotDataAvailable(const Tap&); diff --git a/plugins/sensors/maemo6/main.cpp b/plugins/sensors/maemo6/main.cpp index 8f49969c45..aa1965744a 100644 --- a/plugins/sensors/maemo6/main.cpp +++ b/plugins/sensors/maemo6/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -67,7 +67,7 @@ public: QSensorManager::registerBackend(QProximitySensor::type, maemo6proximitysensor::id, this); QSensorManager::registerBackend(QRotationSensor::type, maemo6rotationsensor::id, this); QSensorManager::registerBackend(QTapSensor::type, maemo6tapsensor::id, this); - qDebug() << "loaded the Maemo 6 plugin"; + qDebug() << "Loaded the Maemo 6 plugin"; } QSensorBackend *createBackend(QSensor *sensor) diff --git a/plugins/sensors/n900/main.cpp b/plugins/sensors/n900/main.cpp index a37bbc2575..b3af05e488 100644 --- a/plugins/sensors/n900/main.cpp +++ b/plugins/sensors/n900/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/sensors/n900/n900.pro b/plugins/sensors/n900/n900.pro index d0792a8e3b..f97da72896 100644 --- a/plugins/sensors/n900/n900.pro +++ b/plugins/sensors/n900/n900.pro @@ -1,25 +1,21 @@ INCLUDEPATH+=../../../src/sensors -include(version.pri) -include(n900.pri) -include(../../../common.pri) - PLUGIN_TYPE = sensors TEMPLATE = lib CONFIG += plugin TARGET = $$qtLibraryTarget(qtsensors_n900) +include(version.pri) +include(n900.pri) +include(../../../common.pri) + QT=core CONFIG+=mobility MOBILITY+=sensors CONFIG+=strict_flags -target.path=$${QT_MOBILITY_PREFIX}/plugins/$${PLUGIN_TYPE} -maemo6:target.path=$$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE} -INSTALLS += target - BUILD_ALL_PLUGINS=$$(BUILD_ALL_PLUGINS) equals(BUILD_ALL_PLUGINS,1) { DEFINES+=BUILD_ALL_PLUGINS diff --git a/plugins/sensors/n900/n900accelerometer.cpp b/plugins/sensors/n900/n900accelerometer.cpp index 280b5d5c64..711ebb51d6 100644 --- a/plugins/sensors/n900/n900accelerometer.cpp +++ b/plugins/sensors/n900/n900accelerometer.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/sensors/n900/n900accelerometer.h b/plugins/sensors/n900/n900accelerometer.h index 4ea678fa89..0bf0cadf23 100644 --- a/plugins/sensors/n900/n900accelerometer.h +++ b/plugins/sensors/n900/n900accelerometer.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/sensors/n900/n900filebasedsensor.cpp b/plugins/sensors/n900/n900filebasedsensor.cpp index 1236d736c7..889006a593 100644 --- a/plugins/sensors/n900/n900filebasedsensor.cpp +++ b/plugins/sensors/n900/n900filebasedsensor.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/sensors/n900/n900filebasedsensor.h b/plugins/sensors/n900/n900filebasedsensor.h index 59dbee7457..7cd26ef329 100644 --- a/plugins/sensors/n900/n900filebasedsensor.h +++ b/plugins/sensors/n900/n900filebasedsensor.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/sensors/n900/n900lightsensor.cpp b/plugins/sensors/n900/n900lightsensor.cpp index f3a31979dc..e41a5aec0b 100644 --- a/plugins/sensors/n900/n900lightsensor.cpp +++ b/plugins/sensors/n900/n900lightsensor.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/sensors/n900/n900lightsensor.h b/plugins/sensors/n900/n900lightsensor.h index a9758579b1..99abbc4762 100644 --- a/plugins/sensors/n900/n900lightsensor.h +++ b/plugins/sensors/n900/n900lightsensor.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/sensors/n900/n900proximitysensor.cpp b/plugins/sensors/n900/n900proximitysensor.cpp index 1c44e4e7b5..2870b806ee 100644 --- a/plugins/sensors/n900/n900proximitysensor.cpp +++ b/plugins/sensors/n900/n900proximitysensor.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/sensors/n900/n900proximitysensor.h b/plugins/sensors/n900/n900proximitysensor.h index 831caa84b5..7bef25bd58 100644 --- a/plugins/sensors/n900/n900proximitysensor.h +++ b/plugins/sensors/n900/n900proximitysensor.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/sensors/s60_sensor_api/main.cpp b/plugins/sensors/s60_sensor_api/main.cpp index b67750c117..12dc47512b 100644 --- a/plugins/sensors/s60_sensor_api/main.cpp +++ b/plugins/sensors/s60_sensor_api/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/sensors/s60_sensor_api/qs60sensorapiaccelerometer.cpp b/plugins/sensors/s60_sensor_api/qs60sensorapiaccelerometer.cpp index 8676aa6972..c27d91d9f1 100644 --- a/plugins/sensors/s60_sensor_api/qs60sensorapiaccelerometer.cpp +++ b/plugins/sensors/s60_sensor_api/qs60sensorapiaccelerometer.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/sensors/s60_sensor_api/qs60sensorapiaccelerometer.h b/plugins/sensors/s60_sensor_api/qs60sensorapiaccelerometer.h index 626d170622..b2fe2ba27b 100644 --- a/plugins/sensors/s60_sensor_api/qs60sensorapiaccelerometer.h +++ b/plugins/sensors/s60_sensor_api/qs60sensorapiaccelerometer.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/sensors/s60_sensor_api/s60_sensor_api.pro b/plugins/sensors/s60_sensor_api/s60_sensor_api.pro index 2614df4784..a8364761bf 100644 --- a/plugins/sensors/s60_sensor_api/s60_sensor_api.pro +++ b/plugins/sensors/s60_sensor_api/s60_sensor_api.pro @@ -1,14 +1,14 @@ INCLUDEPATH+=../../../src/sensors -include(../../../common.pri) -include(s60_sensor_api.pri) -include(version.pri) - PLUGIN_TYPE = sensors TEMPLATE = lib CONFIG += plugin +include(../../../common.pri) +include(s60_sensor_api.pri) +include(version.pri) + TARGET = $$qtLibraryTarget(qtsensors_s60sensorapi) TARGET.EPOCALLOWDLLDATA = 1 TARGET.UID3 = 0x2002BFC1 @@ -22,7 +22,3 @@ MOBILITY+=sensors s60sensorapi.sources = $${TARGET}.dll s60sensorapi.path = $${QT_PLUGINS_BASE_DIR}/$${PLUGIN_TYPE} DEPLOYMENT += s60sensorapi - -target.path=$${QT_MOBILITY_PREFIX}/plugins/$${PLUGIN_TYPE} -maemo6:target.path=$$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE} -INSTALLS += target diff --git a/plugins/sensors/symbian/accelerometersym.cpp b/plugins/sensors/symbian/accelerometersym.cpp index d8538e6dd4..d8370cd8ec 100644 --- a/plugins/sensors/symbian/accelerometersym.cpp +++ b/plugins/sensors/symbian/accelerometersym.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -77,7 +77,7 @@ CAccelerometerSensorSym::~CAccelerometerSensorSym() * Default constructor */ CAccelerometerSensorSym::CAccelerometerSensorSym(QSensor *sensor):CSensorBackendSym(sensor), - iScale(0), + iScaleRange(0), iUnit(0) { setReading<QAccelerometerReading>(&iReading); @@ -86,6 +86,68 @@ CAccelerometerSensorSym::CAccelerometerSensorSym(QSensor *sensor):CSensorBackend SetListening(ETrue, EFalse); } +void CAccelerometerSensorSym::start() +{ + TSensrvProperty dataFormatProperty; + TInt err; + CSensorBackendSym::start(); + TRAP(err, iBackendData.iSensorChannel->GetPropertyL(KSensrvPropIdChannelDataFormat, ESensrvSingleProperty, dataFormatProperty)); + if(err == KErrNone) + { + TInt dataFormat; + dataFormatProperty.GetValue(dataFormat); + if(dataFormat == ESensrvChannelDataFormatScaled) + { + TSensrvProperty scaleRangeProperty; + TRAP(err, iBackendData.iSensorChannel->GetPropertyL(KSensrvPropIdScaledRange, KSensrvItemIndexNone, scaleRangeProperty)); + if(err == KErrNone) + { + if(scaleRangeProperty.GetArrayIndex() == ESensrvSingleProperty) + { + if(scaleRangeProperty.PropertyType() == ESensrvIntProperty) + { + scaleRangeProperty.GetMaxValue(iScaleRange); + } + else if(scaleRangeProperty.PropertyType() == ESensrvRealProperty) + { + TReal realScale; + scaleRangeProperty.GetMaxValue(realScale); + iScaleRange = realScale; + } + } + else if(scaleRangeProperty.GetArrayIndex() == ESensrvArrayPropertyInfo) + { + TInt index; + if(scaleRangeProperty.PropertyType() == ESensrvIntProperty) + { + scaleRangeProperty.GetValue(index); + } + else if(scaleRangeProperty.PropertyType() == ESensrvRealProperty) + { + TReal realIndex; + scaleRangeProperty.GetValue(realIndex); + index = realIndex; + } + TRAP(err, iBackendData.iSensorChannel->GetPropertyL(KSensrvPropIdScaledRange, KSensrvItemIndexNone, index, scaleRangeProperty)); + if(err == KErrNone) + { + if(scaleRangeProperty.PropertyType() == ESensrvIntProperty) + { + scaleRangeProperty.GetMaxValue(iScaleRange); + } + else if(scaleRangeProperty.PropertyType() == ESensrvRealProperty) + { + TReal realScaleRange; + scaleRangeProperty.GetMaxValue(realScaleRange); + iScaleRange = realScaleRange; + } + } + } + } + } + } +} + /* * RecvData is used to retrieve the sensor reading from sensor server * It is implemented here to handle accelerometer sensor specific @@ -104,13 +166,13 @@ void CAccelerometerSensorSym::RecvData(CSensrvChannel &aChannel) TReal y = iData.iAxisY; TReal z = iData.iAxisZ; //Converting unit to m/s^2 - qoutputrangelist rangeList = sensor()->outputRanges(); - TReal maxValue = rangeList[sensor()->outputRange()].maximum; - if(iScale && iUnit == ESensevChannelUnitAcceleration) + if(iScaleRange && iUnit == ESensevChannelUnitAcceleration) { - x = (x/iScale) * maxValue; - y = (y/iScale) * maxValue; - z = (z/iScale) * maxValue; + qoutputrangelist rangeList = sensor()->outputRanges(); + TReal maxValue = rangeList[sensor()->outputRange()].maximum; + x = (x/iScaleRange) * maxValue; + y = (y/iScaleRange) * maxValue; + z = (z/iScaleRange) * maxValue; } else if(iUnit == ESensrvChannelUnitGravityConstant) { @@ -137,22 +199,12 @@ void CAccelerometerSensorSym::ConstructL() //Initialize the backend resources InitializeL(); + TInt err; TSensrvProperty unitProperty; - TRAPD(err, iBackendData.iSensorChannel->GetPropertyL(KSensrvPropIdChannelUnit, ESensrvSingleProperty, unitProperty)); + TRAP(err, iBackendData.iSensorChannel->GetPropertyL(KSensrvPropIdChannelUnit, ESensrvSingleProperty, unitProperty)); if(err == KErrNone) { unitProperty.GetValue(iUnit); } - - TSensrvProperty dataFormatProperty; - iBackendData.iSensorChannel->GetPropertyL(KSensrvPropIdChannelDataFormat, ESensrvSingleProperty, dataFormatProperty); - TInt dataFormat; - dataFormatProperty.GetValue(dataFormat); - if(dataFormat == ESensrvChannelDataFormatScaled) - { - TSensrvProperty scaleRangeProperty; - TRAPD(err, iBackendData.iSensorChannel->GetPropertyL(KSensrvPropIdScaledRange, ESensrvSingleProperty, scaleRangeProperty)); //Slight confusion - scaleRangeProperty.GetMaxValue(iScale); - } } diff --git a/plugins/sensors/symbian/accelerometersym.h b/plugins/sensors/symbian/accelerometersym.h index e2ef1f6d49..ff69132fee 100644 --- a/plugins/sensors/symbian/accelerometersym.h +++ b/plugins/sensors/symbian/accelerometersym.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -70,6 +70,8 @@ public: */ ~CAccelerometerSensorSym(); + void start(); + private: /** * Default constructor @@ -87,7 +89,7 @@ private: * Second phase constructor * Initialize the backend resources */ - void ConstructL(); + void ConstructL(); public: /** @@ -98,7 +100,7 @@ public: private: QAccelerometerReading iReading; TSensrvAccelerometerAxisData iData; - TInt iScale, iUnit; + TInt iScaleRange, iUnit; }; #endif //ACCELEROMETERSYM_H diff --git a/plugins/sensors/symbian/ambientlightsensorsym.cpp b/plugins/sensors/symbian/ambientlightsensorsym.cpp index f8f60860ef..ab29e38ab0 100644 --- a/plugins/sensors/symbian/ambientlightsensorsym.cpp +++ b/plugins/sensors/symbian/ambientlightsensorsym.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/sensors/symbian/ambientlightsensorsym.h b/plugins/sensors/symbian/ambientlightsensorsym.h index f50d207656..329c6f5f8e 100644 --- a/plugins/sensors/symbian/ambientlightsensorsym.h +++ b/plugins/sensors/symbian/ambientlightsensorsym.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/sensors/symbian/compasssym.cpp b/plugins/sensors/symbian/compasssym.cpp index 52398db233..e2058c517f 100644 --- a/plugins/sensors/symbian/compasssym.cpp +++ b/plugins/sensors/symbian/compasssym.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/sensors/symbian/compasssym.h b/plugins/sensors/symbian/compasssym.h index a9390b7b99..0eca7ece96 100644 --- a/plugins/sensors/symbian/compasssym.h +++ b/plugins/sensors/symbian/compasssym.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/sensors/symbian/magnetometersensorsym.cpp b/plugins/sensors/symbian/magnetometersensorsym.cpp index 42665009a4..0fdedc06f7 100644 --- a/plugins/sensors/symbian/magnetometersensorsym.cpp +++ b/plugins/sensors/symbian/magnetometersensorsym.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -42,6 +42,8 @@ // Internal Headers #include "magnetometersensorsym.h" +#include <sensrvgeneralproperties.h> + /** * set the id of the magnetometer sensor */ @@ -74,7 +76,8 @@ CMagnetometerSensorSym::~CMagnetometerSensorSym() * Default constructor */ CMagnetometerSensorSym::CMagnetometerSensorSym(QSensor *sensor):CSensorBackendSym(sensor), - iCalibrationLevel(0.0) + iCalibrationLevel(0.0), + iScaleRange(0) { if(sensor) { @@ -101,9 +104,10 @@ void CMagnetometerSensorSym::start() QVariant v = sensor()->property("returnGeoValues"); iReturnGeoValues = (v.isValid() && v.toBool()); // if the property isn't set it's false } + TInt err; // get current property value for calibration and set it to reading TSensrvProperty calibration; - TRAPD(err, iBackendData.iSensorChannel->GetPropertyL(KSensrvPropCalibrationLevel,ESensrvSingleProperty, calibration)); + TRAP(err, iBackendData.iSensorChannel->GetPropertyL(KSensrvPropCalibrationLevel, ESensrvSingleProperty, calibration)); // If error in getting the calibration level, continue to start the sensor // as it is not a fatal error if ( err == KErrNone ) @@ -114,6 +118,64 @@ void CMagnetometerSensorSym::start() } // Call backend start CSensorBackendSym::start(); + + + TSensrvProperty dataFormatProperty; + TRAP(err, iBackendData.iSensorChannel->GetPropertyL(KSensrvPropIdChannelDataFormat, ESensrvSingleProperty, dataFormatProperty)); + if(err == KErrNone) + { + TInt dataFormat; + dataFormatProperty.GetValue(dataFormat); + if(dataFormat == ESensrvChannelDataFormatScaled) + { + TSensrvProperty scaleRangeProperty; + TRAP(err, iBackendData.iSensorChannel->GetPropertyL(KSensrvPropIdScaledRange, KSensrvItemIndexNone, scaleRangeProperty)); + if(err == KErrNone) + { + if(scaleRangeProperty.GetArrayIndex() == ESensrvSingleProperty) + { + if(scaleRangeProperty.PropertyType() == ESensrvIntProperty) + { + scaleRangeProperty.GetMaxValue(iScaleRange); + } + else if(scaleRangeProperty.PropertyType() == ESensrvRealProperty) + { + TReal realScale; + scaleRangeProperty.GetMaxValue(realScale); + iScaleRange = realScale; + } + } + else if(scaleRangeProperty.GetArrayIndex() == ESensrvArrayPropertyInfo) + { + TInt index; + if(scaleRangeProperty.PropertyType() == ESensrvIntProperty) + { + scaleRangeProperty.GetValue(index); + } + else if(scaleRangeProperty.PropertyType() == ESensrvRealProperty) + { + TReal realIndex; + scaleRangeProperty.GetValue(realIndex); + index = realIndex; + } + TRAP(err, iBackendData.iSensorChannel->GetPropertyL(KSensrvPropIdScaledRange, KSensrvItemIndexNone, index, scaleRangeProperty)); + if(err == KErrNone) + { + if(scaleRangeProperty.PropertyType() == ESensrvIntProperty) + { + scaleRangeProperty.GetMaxValue(iScaleRange); + } + else if(scaleRangeProperty.PropertyType() == ESensrvRealProperty) + { + TReal realScaleRange; + scaleRangeProperty.GetMaxValue(realScaleRange); + iScaleRange = realScaleRange; + } + } + } + } + } + } } /* @@ -130,22 +192,36 @@ void CMagnetometerSensorSym::RecvData(CSensrvChannel &aChannel) // If there is no reading available, return without setting return; } - // Get a lock on the reading data - iBackendData.iReadingLock.Wait(); + + TReal x, y, z; // If Geo values are requested set it if(iReturnGeoValues) { - iReading.setX(iData.iAxisXCalibrated); - iReading.setY(iData.iAxisYCalibrated); - iReading.setZ(iData.iAxisZCalibrated); + x = iData.iAxisXCalibrated; + y = iData.iAxisYCalibrated; + z = iData.iAxisZCalibrated; } // If Raw values are requested set it else { - iReading.setX(iData.iAxisXRaw); - iReading.setY(iData.iAxisYRaw); - iReading.setZ(iData.iAxisZRaw); - } + x = iData.iAxisXRaw; + y = iData.iAxisYRaw; + z = iData.iAxisZRaw; + } + // Scale adjustments + if(iScaleRange) + { + qoutputrangelist rangeList = sensor()->outputRanges(); + TReal maxValue = rangeList[sensor()->outputRange()].maximum; + x = (x/iScaleRange) * maxValue; + y = (y/iScaleRange) * maxValue; + z = (z/iScaleRange) * maxValue; + } + // Get a lock on the reading data + iBackendData.iReadingLock.Wait(); + iReading.setX(x); + iReading.setY(y); + iReading.setZ(z); // Set the timestamp iReading.setTimestamp(iData.iTimeStamp.Int64()); // Set the calibration level @@ -189,5 +265,6 @@ qreal CMagnetometerSensorSym::GetCalibrationLevel() void CMagnetometerSensorSym::ConstructL() { InitializeL(); + } diff --git a/plugins/sensors/symbian/magnetometersensorsym.h b/plugins/sensors/symbian/magnetometersensorsym.h index 2ee344cb94..c1510aced3 100644 --- a/plugins/sensors/symbian/magnetometersensorsym.h +++ b/plugins/sensors/symbian/magnetometersensorsym.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -118,6 +118,7 @@ private: TSensrvMagnetometerAxisData iData; qreal iCalibrationLevel; bool iReturnGeoValues; + TInt iScaleRange; }; #endif //MAGNETOMETERSENSORSYM_H diff --git a/plugins/sensors/symbian/main.cpp b/plugins/sensors/symbian/main.cpp index 8e534113b0..6680ce291d 100644 --- a/plugins/sensors/symbian/main.cpp +++ b/plugins/sensors/symbian/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/sensors/symbian/orientationsym.cpp b/plugins/sensors/symbian/orientationsym.cpp index c8e209e511..f5b1e617d1 100644 --- a/plugins/sensors/symbian/orientationsym.cpp +++ b/plugins/sensors/symbian/orientationsym.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/sensors/symbian/orientationsym.h b/plugins/sensors/symbian/orientationsym.h index 9a5915eee7..5e3b1ba721 100644 --- a/plugins/sensors/symbian/orientationsym.h +++ b/plugins/sensors/symbian/orientationsym.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/sensors/symbian/proximitysensorsym.cpp b/plugins/sensors/symbian/proximitysensorsym.cpp index 9a2694837e..4cd4de8e77 100644 --- a/plugins/sensors/symbian/proximitysensorsym.cpp +++ b/plugins/sensors/symbian/proximitysensorsym.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/sensors/symbian/proximitysensorsym.h b/plugins/sensors/symbian/proximitysensorsym.h index 4867e2262c..25285c8303 100644 --- a/plugins/sensors/symbian/proximitysensorsym.h +++ b/plugins/sensors/symbian/proximitysensorsym.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/sensors/symbian/rotationsensorsym.cpp b/plugins/sensors/symbian/rotationsensorsym.cpp index a242f17a6d..60a6c4f991 100644 --- a/plugins/sensors/symbian/rotationsensorsym.cpp +++ b/plugins/sensors/symbian/rotationsensorsym.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -42,11 +42,16 @@ // Internal Headers #include "rotationsensorsym.h" +#include <sensrvgeneralproperties.h> + /** * set the id of the proximity sensor */ const char *CRotationSensorSym::id("sym.rotation"); +const TInt KMinimumRange = -180; +const TInt KMaximumRange = 180; + /** * Factory function, this is used to create the rotation sensor object * @return CRotationSensorSym if successful, leaves on failure @@ -96,8 +101,33 @@ void CRotationSensorSym::RecvData(CSensrvChannel &aChannel) // Get a lock on the reading data iBackendData.iReadingLock.Wait(); // To Do verify with ds and ramsay - iReading.setX(iData.iDeviceRotationAboutXAxis); - iReading.setY(iData.iDeviceRotationAboutYAxis-180); + + // For x axis symbian provides reading from 0 to 359 range + // This logic maps value to Qt range -90 to 90 + if(iData.iDeviceRotationAboutXAxis >= 0 && iData.iDeviceRotationAboutXAxis <= 180) + { + iReading.setX(90 - iData.iDeviceRotationAboutXAxis); + } + else if(iData.iDeviceRotationAboutXAxis > 180 && iData.iDeviceRotationAboutXAxis <= 270) + { + iReading.setX(iData.iDeviceRotationAboutXAxis - 270); + } + else if(iData.iDeviceRotationAboutXAxis > 270 && iData.iDeviceRotationAboutXAxis < 360) + { + iReading.setX(iData.iDeviceRotationAboutXAxis - 270); + } + + // For y axis symbian provides reading from 0 to 359 range + // This logic maps value to Qt range -180 to 180 + if(iData.iDeviceRotationAboutYAxis >= 0 && iData.iDeviceRotationAboutYAxis <= 180) + { + iReading.setY(iData.iDeviceRotationAboutYAxis); + } + else if(iData.iDeviceRotationAboutYAxis > 180 && iData.iDeviceRotationAboutYAxis < 360) + { + iReading.setY(iData.iDeviceRotationAboutYAxis - 360); + } + if(iData.iDeviceRotationAboutZAxis == TSensrvRotationData::KSensrvRotationUndefined) { sensor()->setProperty("hasZ", QVariant(FALSE)); @@ -105,7 +135,16 @@ void CRotationSensorSym::RecvData(CSensrvChannel &aChannel) else { sensor()->setProperty("hasZ", QVariant(TRUE)); - iReading.setZ(iData.iDeviceRotationAboutZAxis-180); + // For z axis symbian provides reading from 0 to 359 range + // This logic maps value to Qt range -180 to 180 + if(iData.iDeviceRotationAboutZAxis >= 0 && iData.iDeviceRotationAboutZAxis <= 180) + { + iReading.setZ(iData.iDeviceRotationAboutZAxis); + } + else if(iData.iDeviceRotationAboutZAxis > 180 && iData.iDeviceRotationAboutZAxis < 360) + { + iReading.setZ(iData.iDeviceRotationAboutZAxis - 360); + } } // Set the timestamp iReading.setTimestamp(iData.iTimeStamp.Int64()); @@ -113,6 +152,25 @@ void CRotationSensorSym::RecvData(CSensrvChannel &aChannel) iBackendData.iReadingLock.Signal(); } +/** + * Overriding this method in rotation sensor to hard code value of + * mesurement range from -180 to 180 as Qt wants + * Symbian provides measurement range from 0 to 359 + */ +void CRotationSensorSym::GetMeasurementrangeAndAccuracy() + { + TReal accuracy = 0; + TSensrvProperty accuracyProperty; + TRAPD(err, iBackendData.iSensorChannel->GetPropertyL(KSensrvPropIdChannelAccuracy, ESensrvSingleProperty, accuracyProperty)); + if(err == KErrNone) + { + accuracyProperty.GetValue(accuracy); + } + // Hard coding values -180 and 180 as Qt expects y and z axis + // values range from -180 to 180. + addOutputRange(KMinimumRange, KMaximumRange, accuracy); + } + /** * Second phase constructor diff --git a/plugins/sensors/symbian/rotationsensorsym.h b/plugins/sensors/symbian/rotationsensorsym.h index a2a69f09b6..1b412bb4e0 100644 --- a/plugins/sensors/symbian/rotationsensorsym.h +++ b/plugins/sensors/symbian/rotationsensorsym.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -89,6 +89,13 @@ private: */ void ConstructL(); + /** + * Overriding this method in rotation sensor to hard code value of + * mesurement range from -180 to 180 as Qt want + * Symbian provides measurement range from 0 to 359 + */ + void GetMeasurementrangeAndAccuracy(); + public: /** * Holds the id of the proximity sensor diff --git a/plugins/sensors/symbian/sensorbackenddatasym.h b/plugins/sensors/symbian/sensorbackenddatasym.h index 02d48e5728..58d1dffe91 100644 --- a/plugins/sensors/symbian/sensorbackenddatasym.h +++ b/plugins/sensors/symbian/sensorbackenddatasym.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/sensors/symbian/sensorbackendsym.cpp b/plugins/sensors/symbian/sensorbackendsym.cpp index 64e66bfb12..3b2a38cc85 100644 --- a/plugins/sensors/symbian/sensorbackendsym.cpp +++ b/plugins/sensors/symbian/sensorbackendsym.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -42,6 +42,7 @@ #include "sensorbackendsym.h" #include <sensrvgeneralproperties.h> +#include <e32math.h> // Constants const TInt KDesiredReadingCount = 1; @@ -63,6 +64,7 @@ void CSensorBackendSym::FindSensorL() CSensrvChannelFinder* finder = CSensrvChannelFinder::NewLC(); RSensrvChannelInfoList channelList; TSensrvChannelInfo channelInfo; + channelInfo.iChannelType = iBackendData.iSensorType; // Retrieve the list of channels available finder->FindChannelsL( channelList, channelInfo ); CleanupStack::PopAndDestroy(finder); @@ -153,6 +155,19 @@ TInt CSensorBackendSym::SetProperty(TSensrvPropertyId aPropertyId, TSensrvProper return iBackendData.iSensorChannel->SetProperty(prop); } +TSensrvPropertyType CSensorBackendSym::propertyType(TSensrvPropertyId aPropertyId, TInt &errId) + { + TSensrvProperty propertyType; + //Getting the property to check the type + TRAPD(err, iBackendData.iSensorChannel->GetPropertyL(aPropertyId, ESensrvSingleProperty, propertyType)); + if(err != KErrNone) + { + errId = err; + } + //Find the type of property + return propertyType.PropertyType(); + } + TInt CSensorBackendSym::SetMeasurementRange() { //Setting measurement range @@ -161,15 +176,13 @@ TInt CSensorBackendSym::SetMeasurementRange() { return KErrNone; } - TSensrvProperty propertyType; - //Getting the property to check the type - TRAPD(err, iBackendData.iSensorChannel->GetPropertyL(KSensrvPropIdMeasureRange, ESensrvSingleProperty, propertyType)); + + TInt err = KErrNone; + TSensrvPropertyType type = propertyType(KSensrvPropIdMeasureRange, err); if(err != KErrNone) { return err; } - //Find the type of property - TSensrvPropertyType type = propertyType.PropertyType(); //If type is integer if(type == ESensrvRealProperty) { @@ -196,13 +209,41 @@ TInt CSensorBackendSym::SetDataRate() { return KErrNone; } - return SetProperty(KSensrvPropIdDataRate, ESensrvIntProperty,ESensrvArrayPropertyInfo, - availableDataRates.indexOf(qrange(sensor()->dataRate(),sensor()->dataRate()))); + TInt err = KErrNone; + TSensrvPropertyType type = propertyType(KSensrvPropIdDataRate, err); + if(err != KErrNone) + { + return err; + } + if(type == ESensrvIntProperty) + { + return SetProperty(KSensrvPropIdDataRate, ESensrvIntProperty, ESensrvArrayPropertyInfo, + availableDataRates.indexOf(qrange(sensor()->dataRate(),sensor()->dataRate()))); + } + else if(type == ESensrvRealProperty) + { + return SetProperty(KSensrvPropIdDataRate, ESensrvRealProperty, ESensrvArrayPropertyInfo, + availableDataRates.indexOf(qrange(sensor()->dataRate(),sensor()->dataRate()))); + } } else { - // Uses range value - return SetProperty(KSensrvPropIdDataRate, ESensrvIntProperty, ESensrvSingleProperty, sensor()->dataRate()); + TInt err = KErrNone; + TSensrvPropertyType type = propertyType(KSensrvPropIdDataRate, err); + if(err != KErrNone) + { + return err; + } + if(type == ESensrvIntProperty) + { + // Uses range value + return SetProperty(KSensrvPropIdDataRate, ESensrvIntProperty, ESensrvSingleProperty, sensor()->dataRate()); + } + else if(type == ESensrvRealProperty) + { + // Uses range value + return SetProperty(KSensrvPropIdDataRate, ESensrvIntProperty, ESensrvSingleProperty, sensor()->dataRate()); + } } } // No data rates available @@ -310,42 +351,74 @@ void CSensorBackendSym::GetDescription() void CSensorBackendSym::GetDataRate() { - RSensrvPropertyList list; - TRAPD(err, iBackendData.iSensorChannel->GetAllPropertiesL(KSensrvPropIdDataRate, list)); + TSensrvProperty datarate_prop; + TInt err; + TRAP(err, iBackendData.iSensorChannel->GetPropertyL(KSensrvPropIdDataRate, KSensrvItemIndexNone, datarate_prop)); if(err == KErrNone) { - //if list has only one item then it is range of values and not descrete values, agreed with DS team - if(list.Count() == 1) - { - TInt min, max, value; - list[0].GetMinValue(min); - list[0].GetMaxValue(max); + if(datarate_prop.GetArrayIndex() == ESensrvSingleProperty) + { + TReal min, max, value; + if(datarate_prop.PropertyType() == ESensrvIntProperty) + { + TInt intMin, intMax, intValue; + datarate_prop.GetMinValue(intMin); + datarate_prop.GetMaxValue(intMax); + datarate_prop.GetValue(intValue); + min = intMin; + max = intMax; + value = intValue; + } + else if(datarate_prop.PropertyType() == ESensrvRealProperty) + { + datarate_prop.GetMinValue(min); + datarate_prop.GetMaxValue(max); + datarate_prop.GetValue(value); + } //Set datarate as range addDataRate(min, max); - list[0].GetValue(value); //Set current datarate as default sensor()->setDataRate(value); - } + } //if list has more than one item, data rate will be having descrete values, agreed with DS team - else + else if(datarate_prop.GetArrayIndex() == ESensrvArrayPropertyInfo) { - TInt datarate, index; - for(int i=0; i<list.Count(); i++) + TReal datarate; + TInt min, max, index; + datarate_prop.GetMinValue(min); + datarate_prop.GetMaxValue(max); + datarate_prop.GetValue(index); + for(int i=min; i<=max; i++) { - if(list[i].GetArrayIndex() == ESensrvArrayPropertyInfo) + TRAP(err, iBackendData.iSensorChannel->GetPropertyL(KSensrvPropIdDataRate, KSensrvItemIndexNone, i, datarate_prop)); + if(err == KErrNone) { - //If array index is ESensrvArrayPropertyInfo, getting the value to get current datarate - list[i].GetValue(index); - list[index].GetValue(datarate); - //Setting current datarate as default - sensor()->setDataRate(datarate); - continue; - } - list[i].GetValue(datarate); - addDataRate(datarate, datarate); + if(datarate_prop.PropertyType() == ESensrvIntProperty) + { + TInt intDatarate; + datarate_prop.GetValue(intDatarate); + datarate = intDatarate; + } + else if(datarate_prop.PropertyType() == ESensrvRealProperty) + { + datarate_prop.GetValue(datarate); + } + addDataRate(datarate, datarate); + if(i == index) + { + //Setting current datarate as default + sensor()->setDataRate(datarate); + } + } } } } + // QT requires atleast one datarate to be available, Sensor server does not + // define a datarate for state based sensors, hence this hack + if(sensor()->availableDataRates().length() == 0) + { + addDataRate(KInvalidDataRate, KInvalidDataRate); + } } void CSensorBackendSym::GetMeasurementrangeAndAccuracy() @@ -362,73 +435,139 @@ void CSensorBackendSym::GetMeasurementrangeAndAccuracy() */ TReal accuracy = 0; RSensrvPropertyList accuracyList; - RSensrvPropertyList list; TInt err; TRAP(err, iBackendData.iSensorChannel->GetAllPropertiesL(KSensrvPropIdChannelAccuracy, accuracyList)); if(err == KErrNone) { + // If only one accuracy value present set value to accuracy if(accuracyList.Count() == 1) { - accuracyList[0].GetValue(accuracy); + if(accuracyList[0].PropertyType() == ESensrvIntProperty) + { + TInt intAccuracy; + accuracyList[0].GetValue(intAccuracy); + accuracy = intAccuracy; + } + else if(accuracyList[0].PropertyType() == ESensrvRealProperty) + { + accuracyList[0].GetValue(accuracy); + } } + // If more than one accuracy values present set accuracy to invalid else { accuracy = KAccuracyInvalid; } } - + + //Scale + TSensrvProperty scale_prop; + TReal scale=1; + TRAP(err, iBackendData.iSensorChannel->GetPropertyL(KSensrvPropIdChannelScale, KSensrvItemIndexNone, scale_prop)); + if(err == KErrNone) + { + if(scale_prop.PropertyType() == ESensrvIntProperty) + { + TInt intScale; + scale_prop.GetValue(intScale); + scale = intScale; + } + else if(scale_prop.PropertyType() == ESensrvRealProperty) + { + scale_prop.GetValue(scale); + } + TReal scaleMultiplier; + Math::Pow(scaleMultiplier, 10, scale); + scale = scaleMultiplier; + } + //measurement minimum & maximum - list.Reset(); - TRAP(err, iBackendData.iSensorChannel->GetAllPropertiesL(KSensrvPropIdMeasureRange, list)); + TSensrvProperty measurerange_prop; + TRAP(err, iBackendData.iSensorChannel->GetPropertyL(KSensrvPropIdMeasureRange, KSensrvItemIndexNone, measurerange_prop)); if(err == KErrNone) - { - for(int i=0; i<list.Count(); i++) + { + if(measurerange_prop.GetArrayIndex() == ESensrvSingleProperty) + { + TReal measureMin, measureMax, value; + if(measurerange_prop.PropertyType() == ESensrvIntProperty) + { + TInt intMin, intMax; + measurerange_prop.GetMinValue(intMin); + measurerange_prop.GetMaxValue(intMax); + measureMin = intMin; + measureMax = intMax; + } + else if(measurerange_prop.PropertyType() == ESensrvRealProperty) + { + measurerange_prop.GetMinValue(measureMin); + measurerange_prop.GetMaxValue(measureMax); + } + //Set output as range + addOutputRange(measureMin*scale, measureMax*scale, accuracy); + } + //if list has more than one item, data rate will be having descrete values, agreed with DS team + else if(measurerange_prop.GetArrayIndex() == ESensrvArrayPropertyInfo) { - if(list[i].GetArrayIndex() == ESensrvArrayPropertyInfo) + TReal measureMin, measureMax; + TInt min, max, index; + if(measurerange_prop.PropertyType() == ESensrvIntProperty) { - continue; + measurerange_prop.GetMinValue(min); + measurerange_prop.GetMaxValue(max); + measurerange_prop.GetValue(index); } - if(list[i].PropertyType() == ESensrvIntProperty ) + else if(measurerange_prop.PropertyType() == ESensrvRealProperty) { - TInt min, max; - list[i].GetMinValue(min); - list[i].GetMaxValue(max); - if(accuracy != KAccuracyInvalid) - { - addOutputRange(min, max, accuracy); - } - else + TReal realMin, realMax, realValue; + measurerange_prop.GetMinValue(realMin); + measurerange_prop.GetMaxValue(realMax); + measurerange_prop.GetValue(realValue); + min = realMin; + max = realMax; + index = realValue; + } + for(int i=min; i<=max; i++) + { + TRAP(err, iBackendData.iSensorChannel->GetPropertyL(KSensrvPropIdMeasureRange, KSensrvItemIndexNone, i, measurerange_prop)); + if(err == KErrNone) { - if(accuracyList.Count() > i) + if(measurerange_prop.PropertyType() == ESensrvIntProperty) { - accuracyList[i].GetValue(accuracy); - addOutputRange(min, max, accuracy); + TInt intMeasureMin, intMeasureMax; + measurerange_prop.GetMinValue(intMeasureMin); + measurerange_prop.GetMaxValue(intMeasureMax); + measureMin = intMeasureMin; + measureMax = intMeasureMax; } - else + else if(measurerange_prop.PropertyType() == ESensrvRealProperty) { - addOutputRange(min, max, KAccuracyInvalid); + measurerange_prop.GetMinValue(measureMin); + measurerange_prop.GetMaxValue(measureMax); } - } - } - else if(list[i].PropertyType() == ESensrvRealProperty ) - { - TReal min, max; - list[i].GetMinValue(min); - list[i].GetMaxValue(max); - if(accuracy != KAccuracyInvalid) - { - addOutputRange(min, max, accuracy); - } - else - { - if(accuracyList.Count() > i) + // If only one accuracy value is present set same accuracy for all + if(accuracy != KAccuracyInvalid) { - accuracyList[i].GetValue(accuracy); - addOutputRange(min, max, accuracy); + addOutputRange(measureMin*scale, measureMax*scale, accuracy); } + // If more than one accuracy values are there then map them linearly else { - addOutputRange(min, max, KAccuracyInvalid); + if(accuracyList.Count() > (i - min)) + { + accuracyList[i].GetValue(accuracy); + addOutputRange(measureMin*scale, measureMax*scale, accuracy); + } + else + { + // If less accuracy values are present than measurement ranges then + // set invalid accuracy for rest of measument ranges + addOutputRange(measureMin*scale, measureMax*scale, KAccuracyInvalid); + } + } + if(i == index) + { + //Setting current output range as default + sensor()->setOutputRange(i - min); } } } diff --git a/plugins/sensors/symbian/sensorbackendsym.h b/plugins/sensors/symbian/sensorbackendsym.h index 7e3ca97c2e..1f4caed326 100644 --- a/plugins/sensors/symbian/sensorbackendsym.h +++ b/plugins/sensors/symbian/sensorbackendsym.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -92,7 +92,7 @@ class CSensorBackendSym : public CBase, public QSensorBackend, public MSensrvDat void DataReceived(CSensrvChannel &aChannel, TInt aCount, TInt aDataLost); /** - * DataError is called to indicate an error, fatal errors are inrecoverable + * DataError is called to indicate an error, fatal errors are unrecoverable */ void DataError(CSensrvChannel &aChannel, TSensrvErrorSeverity aError); @@ -194,7 +194,7 @@ class CSensorBackendSym : public CBase, public QSensorBackend, public MSensrvDat * GetMeasurementrangeAndAccuracy used to get measurement ranges and accuracy from * symbian and set as outputRanges in Qt */ - void GetMeasurementrangeAndAccuracy(); + virtual void GetMeasurementrangeAndAccuracy(); /* * Close is used to release all the sensor server objects @@ -229,6 +229,9 @@ class CSensorBackendSym : public CBase, public QSensorBackend, public MSensrvDat * Used to stop listening to the sensor */ void StopListeningL(); + + private: + TSensrvPropertyType propertyType(TSensrvPropertyId, TInt&); protected: TSensorBackendDataSym iBackendData; diff --git a/plugins/sensors/symbian/symbian.pro b/plugins/sensors/symbian/symbian.pro index 140854fc81..c6dcd9ee80 100644 --- a/plugins/sensors/symbian/symbian.pro +++ b/plugins/sensors/symbian/symbian.pro @@ -1,16 +1,16 @@ INCLUDEPATH+=../../../src/sensors INCLUDEPATH+=../../sensors \epoc32\include\osextensions -include(version.pri) -#include(symbian.pri) -include(../../../common.pri) - PLUGIN_TYPE = sensors TEMPLATE = lib CONFIG += plugin TARGET = $$qtLibraryTarget(qtsensors_sym) +include(version.pri) +#include(symbian.pri) +include(../../../common.pri) + SOURCES += \ sensorbackendsym.cpp \ proximitysensorsym.cpp \ @@ -52,16 +52,11 @@ symbian { LIBS += -lsensrvutil } symbian: { -# Load predefined include paths (e.g. QT_PLUGINS_BASE_DIR) to be used in the pro-files -load(data_caging_paths) + # Load predefined include paths (e.g. QT_PLUGINS_BASE_DIR) to be used in the pro-files + load(data_caging_paths) -# Defines plugin files into Symbian .pkg package -pluginDep.sources = qtsensors_sym.dll -pluginDep.path = $${QT_PLUGINS_BASE_DIR}/$${PLUGIN_TYPE} -DEPLOYMENT += pluginDep + # Defines plugin files into Symbian .pkg package + pluginDep.sources = qtsensors_sym.dll + pluginDep.path = $${QT_PLUGINS_BASE_DIR}/$${PLUGIN_TYPE} + DEPLOYMENT += pluginDep } - -target.path=$${QT_MOBILITY_PREFIX}/plugins/$${PLUGIN_TYPE} -maemo6:target.path=$$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE} -INSTALLS += target - diff --git a/plugins/sensors/symbian/tapsensorsym.cpp b/plugins/sensors/symbian/tapsensorsym.cpp index bb10dd4f04..8b7c523cc7 100644 --- a/plugins/sensors/symbian/tapsensorsym.cpp +++ b/plugins/sensors/symbian/tapsensorsym.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/plugins/sensors/symbian/tapsensorsym.h b/plugins/sensors/symbian/tapsensorsym.h index 041312a976..4738828ac0 100644 --- a/plugins/sensors/symbian/tapsensorsym.h +++ b/plugins/sensors/symbian/tapsensorsym.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/qtmobility.pro b/qtmobility.pro index d53001d266..d3f379bb47 100644 --- a/qtmobility.pro +++ b/qtmobility.pro @@ -1,17 +1,4 @@ - -#This is a temporary workaround for internal Symbian builds -#QT_MAJOR_VERSION et al are not set -symbian { - isEmpty(QT_MAJOR_VERSION) { - exists($${EPOCROOT}epoc32/data/z/system/install/Series60v5.2.sis) { - QT_MAJOR_VERSION=4; - QT_MINOR_VERSION=6; - QT_PATCH_VERSION=0; - } - } -} - -# config.pri specifies the configure options +# config.pri specifies the configure options and is pulled in via staticconfig.pri include(staticconfig.pri) !include($$QT_MOBILITY_BUILD_TREE/config.pri) { error("Please run configure script"); diff --git a/src/bearer/qcorewlanengine_mac.mm b/src/bearer/qcorewlanengine_mac.mm index d4f88132f7..0469148bd9 100644 --- a/src/bearer/qcorewlanengine_mac.mm +++ b/src/bearer/qcorewlanengine_mac.mm @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -43,6 +43,7 @@ #include "qnetworkconfiguration_p.h" #include <QtCore/qthread.h> +#include <QThread> #include <QtCore/qmutex.h> #include <QtCore/qcoreapplication.h> #include <QtCore/qstringlist.h> @@ -105,6 +106,8 @@ QMap <QString, QString> networkInterfaces; QTM_NAMESPACE::QCoreWlanEngine::instance()->requestUpdate(); } @end + +QNSListener *listener = 0; #endif QTM_BEGIN_NAMESPACE @@ -143,11 +146,6 @@ inline QStringList nsarrayToQStringList(void *nsarray) return result; } -static QString qGetInterfaceType(const QString &interfaceString) -{ - return networkInterfaces.value(interfaceString, QLatin1String("Unknown")); -} - void networkChangeCallback(SCDynamicStoreRef/* store*/, CFArrayRef changedKeys, void *info) { for ( long i = 0; i < CFArrayGetCount(changedKeys); i++) { @@ -161,23 +159,314 @@ void networkChangeCallback(SCDynamicStoreRef/* store*/, CFArrayRef changedKeys, return; } -QCoreWlanEngine::QCoreWlanEngine(QObject *parent) -: QNetworkSessionEngine(parent) +QScanThread::QScanThread(QObject *parent) + :QThread(parent), interfaceName(nil) { +} + +QScanThread::~QScanThread() +{ +} + +void QScanThread::quit() +{ + wait(); +} + +void QScanThread::run() +{ +#if defined(MAC_SDK_10_6) + getUserProfiles(); NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - getAllScInterfaces(); - startNetworkChangeLoop(); -#ifdef MAC_SDK_10_6 - if([[CWInterface supportedInterfaces] count] > 0 ) { - QNSListener *listener; - listener = [[QNSListener alloc] init]; - hasWifi = true; + QStringList found; + mutex.lock(); + CWInterface *currentInterface; + if(interfaceName.isEmpty()) { + currentInterface = [CWInterface interfaceWithName:nil]; + interfaceName = nsstringToQString([currentInterface name]); } else { - hasWifi = false; + currentInterface = [CWInterface interfaceWithName:qstringToNSString(interfaceName)]; + } + mutex.unlock(); + + if([currentInterface power]) { + NSError *err = nil; + NSDictionary *parametersDict = [NSDictionary dictionaryWithObjectsAndKeys: + [NSNumber numberWithBool:YES], kCWScanKeyMerge, + [NSNumber numberWithInteger:100], kCWScanKeyRestTime, nil]; + + NSArray* apArray = [currentInterface scanForNetworksWithParameters:parametersDict error:&err]; + CWNetwork *apNetwork; + + if (!err) { + for(uint row=0; row < [apArray count]; row++ ) { + apNetwork = [apArray objectAtIndex:row]; + + const QString networkSsid = nsstringToQString([apNetwork ssid]); + found.append(networkSsid); + + QNetworkConfiguration::StateFlags state = QNetworkConfiguration::Undefined; + + bool known = isKnownSsid(networkSsid); + if( [currentInterface.interfaceState intValue] == kCWInterfaceStateRunning) { + if( networkSsid == nsstringToQString( [currentInterface ssid])) { + state = QNetworkConfiguration::Active; + } + } + if(state == QNetworkConfiguration::Undefined) { + if(known) { + state = QNetworkConfiguration::Discovered; + } else { + state = QNetworkConfiguration::Undefined; + } + } + + QNetworkConfiguration::Purpose purpose = QNetworkConfiguration::UnknownPurpose; + if([[apNetwork securityMode] intValue] == kCWSecurityModeOpen) { + purpose = QNetworkConfiguration::PublicPurpose; + } else { + purpose = QNetworkConfiguration::PrivatePurpose; + } + + found.append(foundNetwork(networkSsid, networkSsid, state, interfaceName, purpose)); + + } //end row + }//end error + }// endwifi power + +// add known configurations that are not around. + QMapIterator<QString, QMap<QString,QString> > i(userProfiles); + while (i.hasNext()) { + i.next(); + + QString networkName = i.key(); + const QString id = networkName; + + if(!found.contains(id)) { + QString networkSsid = getSsidFromNetworkName(networkName); + const QString ssidId = QString::number(qHash(QLatin1String("corewlan:") + networkSsid)); + QNetworkConfiguration::StateFlags state = QNetworkConfiguration::Undefined; + QString interfaceName; + QMapIterator<QString, QString> ij(i.value()); + while (ij.hasNext()) { + ij.next(); + interfaceName = ij.value(); + } + + if( [currentInterface.interfaceState intValue] == kCWInterfaceStateRunning) { + if( networkSsid == nsstringToQString([currentInterface ssid])) { + state = QNetworkConfiguration::Active; + } + } + if(state == QNetworkConfiguration::Undefined) { + if( userProfiles.contains(networkName) + && found.contains(ssidId)) { + state = QNetworkConfiguration::Discovered; + } + } + + if(state == QNetworkConfiguration::Undefined) { + state = QNetworkConfiguration::Defined; + } + + found.append(foundNetwork(id, networkName, state, interfaceName, QNetworkConfiguration::UnknownPurpose)); + } } + emit networksChanged(); + [pool release]; #endif - getUserConfigurations(); - requestUpdate(); +} + +QStringList QScanThread::foundNetwork(const QString &id, const QString &name, const QNetworkConfiguration::StateFlags state, const QString &interfaceName, const QNetworkConfiguration::Purpose purpose) +{ + QStringList found; + QMutexLocker locker(&mutex); + QNetworkConfigurationPrivate *ptr = new QNetworkConfigurationPrivate; + + ptr->name = name; + ptr->isValid = true; + ptr->id = id; + ptr->state = state; + ptr->type = QNetworkConfiguration::InternetAccessPoint; + ptr->bearer = QLatin1String("WLAN"); + ptr->purpose = purpose; + ptr->internet = true; + ptr->serviceInterface = QNetworkInterface::interfaceFromName(interfaceName); + + fetchedConfigurations.append( ptr); + configurationInterface[name] = interfaceName; + + locker.unlock(); + locker.relock(); + found.append(id); + return found; +} + +QList<QNetworkConfigurationPrivate *> QScanThread::getConfigurations() +{ + QMutexLocker locker(&mutex); + + QList<QNetworkConfigurationPrivate *> foundConfigurations; + + for (int i = 0; i < fetchedConfigurations.count(); ++i) { + QNetworkConfigurationPrivate *config = new QNetworkConfigurationPrivate; + config->name = fetchedConfigurations.at(i)->name; + config->isValid = fetchedConfigurations.at(i)->isValid; + config->id = fetchedConfigurations.at(i)->id; + config->state = fetchedConfigurations.at(i)->state; + + config->type = fetchedConfigurations.at(i)->type; + config->roamingSupported = fetchedConfigurations.at(i)->roamingSupported; + config->purpose = fetchedConfigurations.at(i)->purpose; + config->internet = fetchedConfigurations.at(i)->internet; + foundConfigurations.append(config); + } + + return foundConfigurations; +} + +void QScanThread::getUserProfiles() +{ +#if defined(MAC_SDK_10_6) + QMutexLocker locker(&mutex); + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + userProfiles.clear(); + + NSArray *wifiInterfaces = [CWInterface supportedInterfaces]; + for(uint row=0; row < [wifiInterfaces count]; row++ ) { + + CWInterface *wifiInterface = [CWInterface interfaceWithName: [wifiInterfaces objectAtIndex:row]]; + NSString *nsInterfaceName = [wifiInterface name]; +// add user configured system networks + SCDynamicStoreRef dynRef = SCDynamicStoreCreate(kCFAllocatorSystemDefault, (CFStringRef)@"Qt corewlan", nil, nil); + NSDictionary * airportPlist = (NSDictionary *)SCDynamicStoreCopyValue(dynRef, (CFStringRef)[NSString stringWithFormat:@"Setup:/Network/Interface/%@/AirPort", nsInterfaceName]); + CFRelease(dynRef); + + NSDictionary *prefNetDict = [airportPlist objectForKey:@"PreferredNetworks"]; + + NSArray *thisSsidarray = [prefNetDict valueForKey:@"SSID_STR"]; + NSEnumerator *ssidEnumerator = [thisSsidarray objectEnumerator]; + NSString *ssidkey; + while ((ssidkey = [ssidEnumerator nextObject])) { + QString thisSsid = nsstringToQString(ssidkey); + if(!userProfiles.contains(thisSsid)) { + QMap <QString,QString> map; + map.insert(thisSsid, nsstringToQString(nsInterfaceName)); + userProfiles.insert(thisSsid, map); + } + } + CFRelease(airportPlist); + + // 802.1X user profiles + QString userProfilePath = QDir::homePath() + "/Library/Preferences/com.apple.eap.profiles.plist"; + NSDictionary* eapDict = [[[NSDictionary alloc] initWithContentsOfFile:qstringToNSString(userProfilePath)] autorelease]; + NSString *profileStr= @"Profiles"; + NSString *nameStr = @"UserDefinedName"; + NSString *networkSsidStr = @"Wireless Network"; + + id profileKey; + NSEnumerator *dictEnumerator = [eapDict objectEnumerator]; + while ((profileKey = [dictEnumerator nextObject])) { + + if ([profileStr isEqualToString:profileKey]) { + NSDictionary *itemDict = [eapDict objectForKey:profileKey]; + id itemKey; + NSEnumerator *dictEnumerator = [thisSsidarray objectEnumerator]; + while ((itemKey = [dictEnumerator nextObject])) { + + NSInteger dictSize = [itemKey count]; + id objects[dictSize]; + id keys[dictSize]; + + [itemKey getObjects:objects andKeys:keys]; + QString networkName; + QString ssid; + for(int i = 0; i < dictSize; i++) { + if([nameStr isEqualToString:keys[i]]) { + networkName = nsstringToQString(objects[i]); + } + if([networkSsidStr isEqualToString:keys[i]]) { + ssid = nsstringToQString(objects[i]); + } + if(!userProfiles.contains(networkName) + && !ssid.isEmpty()) { + QMap<QString,QString> map; + map.insert(ssid, nsstringToQString(nsInterfaceName)); + userProfiles.insert(networkName, map); + } + } + } + } + } + } + + [pool release]; +#endif +} + +QString QScanThread::getSsidFromNetworkName(const QString &name) +{ + QMutexLocker locker(&mutex); + QMapIterator<QString, QMap<QString,QString> > i(userProfiles); + while (i.hasNext()) { + i.next(); + QMap<QString,QString> map = i.value(); + QMapIterator<QString, QString> ij(i.value()); + while (ij.hasNext()) { + ij.next(); + const QString networkNameHash = QString::number(qHash(QLatin1String("corewlan:") +i.key())); + if(name == i.key() || name == networkNameHash) { + return ij.key(); + } + } + } + return QString(); +} + +QString QScanThread::getNetworkNameFromSsid(const QString &ssid) +{ + QMutexLocker locker(&mutex); + QMapIterator<QString, QMap<QString,QString> > i(userProfiles); + while (i.hasNext()) { + i.next(); + QMap<QString,QString> map = i.value(); + QMapIterator<QString, QString> ij(i.value()); + while (ij.hasNext()) { + ij.next(); + if(ij.key() == ssid) { + return i.key(); + } + } + } + return QString(); +} + +bool QScanThread::isKnownSsid(const QString &ssid) +{ + QMutexLocker locker(&mutex); + + QMapIterator<QString, QMap<QString,QString> > i(userProfiles); + while (i.hasNext()) { + i.next(); + QMap<QString,QString> map = i.value(); + if(map.keys().contains(ssid)) { + return true; + } + } + return false; +} + + +QCoreWlanEngine::QCoreWlanEngine(QObject *parent) +: QNetworkSessionEngine(parent) +{ + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + getAllScInterfaces(); + scanThread = new QScanThread(this); + connect(scanThread, SIGNAL(networksChanged()), + this, SIGNAL(configurationsChanged())); + + QTimer::singleShot(0,this,SLOT(init())); [pool release]; } @@ -191,82 +480,65 @@ QCoreWlanEngine::~QCoreWlanEngine() } } +void QCoreWlanEngine::init() +{ +#ifdef MAC_SDK_10_6 + if([[CWInterface supportedInterfaces] count] > 0 && !listener) { + listener = [[QNSListener alloc] init]; + hasWifi = true; + } else { + hasWifi = false; + } +#endif + storeSession = NULL; + scanThread->start(); + + startNetworkChangeLoop(); +} + + QList<QNetworkConfigurationPrivate *> QCoreWlanEngine::getConfigurations(bool *ok) { if (ok) *ok = true; foundConfigurations.clear(); - uint identifier; - QMapIterator<QString, QString> i(networkInterfaces); QNetworkConfigurationPrivate* cpPriv = 0; - while (i.hasNext()) { - i.next(); - if (i.value() == "WLAN") { - QList<QNetworkConfigurationPrivate *> fetchedConfigurations = scanForSsids(i.key()); - for (int i = 0; i < fetchedConfigurations.count(); ++i) { - - QNetworkConfigurationPrivate *config = new QNetworkConfigurationPrivate(); - cpPriv = fetchedConfigurations.at(i); - config->name = cpPriv->name; - config->isValid = cpPriv->isValid; - config->id = cpPriv->id; - - config->state = cpPriv->state; - config->type = cpPriv->type; - config->roamingSupported = cpPriv->roamingSupported; - config->purpose = cpPriv->purpose; - config->internet = cpPriv->internet; - config->serviceInterface = cpPriv->serviceInterface; - config->bearer = cpPriv->bearer; - - identifier = config->name.toUInt(); - configurationInterface[identifier] = config->serviceInterface.name(); - foundConfigurations.append(config); - delete cpPriv; - } - } - - QNetworkInterface interface = QNetworkInterface::interfaceFromName(i.key()); - QNetworkConfigurationPrivate *cpPriv = new QNetworkConfigurationPrivate(); - const QString humanReadableName = interface.humanReadableName(); - cpPriv->name = humanReadableName.isEmpty() ? interface.name() : humanReadableName; - cpPriv->isValid = true; - - if (interface.index()) - identifier = interface.index(); - else - identifier = qHash(interface.hardwareAddress()); - - cpPriv->id = QString::number(identifier); - cpPriv->type = QNetworkConfiguration::InternetAccessPoint; - cpPriv->state = QNetworkConfiguration::Undefined; - - if (interface.flags() & QNetworkInterface::IsRunning) { - cpPriv->state = QNetworkConfiguration::Defined; - cpPriv->internet = true; - } - if ( !interface.addressEntries().isEmpty()) { - cpPriv->state |= QNetworkConfiguration::Active; - cpPriv->internet = true; - } - configurationInterface[identifier] = interface.name(); - cpPriv->bearer = interface.name().isEmpty()? QLatin1String("Unknown") : qGetInterfaceType(interface.name()); - foundConfigurations.append(cpPriv); - } - - pollTimer.start(); - return foundConfigurations; + QMutexLocker locker(&mutex); + QList<QNetworkConfigurationPrivate *> fetchedConfigurations = scanThread->getConfigurations(); +locker.unlock(); + + for (int i = 0; i < fetchedConfigurations.count(); ++i) { + + QNetworkConfigurationPrivate *config = new QNetworkConfigurationPrivate(); + cpPriv = fetchedConfigurations.at(i); + config->name = cpPriv->name; + config->isValid = cpPriv->isValid; + config->id = cpPriv->id; + config->state = cpPriv->state; + config->type = cpPriv->type; + config->roamingSupported = cpPriv->roamingSupported; + config->purpose = cpPriv->purpose; + config->internet = cpPriv->internet; + config->serviceInterface = cpPriv->serviceInterface; + config->bearer = cpPriv->bearer; + + foundConfigurations.append(config); + delete cpPriv; + } + + + return foundConfigurations; } QString QCoreWlanEngine::getInterfaceFromId(const QString &id) { - return configurationInterface.value(id.toUInt()); + return scanThread->configurationInterface.value(id); } bool QCoreWlanEngine::hasIdentifier(const QString &id) { - return configurationInterface.contains(id.toUInt()); + return scanThread->configurationInterface.contains(id); } void QCoreWlanEngine::connectToId(const QString &id) @@ -285,13 +557,13 @@ void QCoreWlanEngine::connectToId(const QString &id) QString wantedSsid = 0; bool using8021X = false; - if(getNetworkNameFromSsid(id) != id) { + if(scanThread->getNetworkNameFromSsid(id) != id) { NSArray *array = [CW8021XProfile allUser8021XProfiles]; for (NSUInteger i=0; i<[array count]; ++i) { if(id == nsstringToQString([[array objectAtIndex:i] userDefinedName]) || id == nsstringToQString([[array objectAtIndex:i] ssid]) ) { - QString thisName = getSsidFromNetworkName(id); + QString thisName = scanThread->getSsidFromNetworkName(id); if(thisName.isEmpty()) { wantedSsid = id; } else { @@ -306,12 +578,12 @@ void QCoreWlanEngine::connectToId(const QString &id) if(!using8021X) { QString wantedNetwork; - QMapIterator<QString, QMap<QString,QString> > i(userProfiles); + QMapIterator<QString, QMap<QString,QString> > i(scanThread->userProfiles); while (i.hasNext()) { i.next(); wantedNetwork = i.key(); if(id == wantedNetwork) { - wantedSsid = getSsidFromNetworkName(wantedNetwork); + wantedSsid = scanThread->getSsidFromNetworkName(wantedNetwork); break; } } @@ -319,12 +591,12 @@ void QCoreWlanEngine::connectToId(const QString &id) NSDictionary *parametersDict = [NSDictionary dictionaryWithObjectsAndKeys: [NSNumber numberWithBool:YES], kCWScanKeyMerge, + [NSNumber numberWithInt:kCWScanTypeFast], kCWScanKeyScanType, [NSNumber numberWithInteger:100], kCWScanKeyRestTime, qstringToNSString(wantedSsid), kCWScanKeySSID, nil]; - - NSArray *scanArray = [NSMutableArray arrayWithArray:[wifiInterface scanForNetworksWithParameters:parametersDict error:&err]]; + NSArray *scanArray = [wifiInterface scanForNetworksWithParameters:parametersDict error:&err]; if(!err) { for(uint row=0; row < [scanArray count]; row++ ) { CWNetwork *apNetwork = [scanArray objectAtIndex:row]; @@ -353,11 +625,13 @@ void QCoreWlanEngine::connectToId(const QString &id) SecKeychainSearchRef searchRef; OSErr result = SecKeychainSearchCreateFromAttributes(NULL, kSecGenericPasswordItemClass, &attributeList, &searchRef); - +Q_UNUSED(result); NSString *password = @""; SecKeychainItemRef searchItem; + OSStatus resultStatus; + resultStatus = SecKeychainSearchCopyNext(searchRef, &searchItem); - if (SecKeychainSearchCopyNext(searchRef, &searchItem) == noErr) { + if (resultStatus == errSecSuccess) { UInt32 realPasswordLength; SecKeychainAttribute attributesW[8]; attributesW[0].tag = kSecAccountItemAttr; @@ -380,7 +654,7 @@ void QCoreWlanEngine::connectToId(const QString &id) CFRelease(searchItem); SecKeychainItemFreeContent(&listW, realPassword); } else { - qDebug() << "SecKeychainSearchCopyNext error"; + qDebug() << "SecKeychainSearchCopyNext error" << cfstringRefToQstring(SecCopyErrorMessageString(resultStatus, NULL)); } [params setValue: password forKey: kCWAssocKeyPassphrase]; } // end using8021X @@ -403,6 +677,7 @@ void QCoreWlanEngine::connectToId(const QString &id) [autoreleasepool release]; } else { + qDebug() << "wifi power off"; // not wifi } #endif @@ -433,8 +708,8 @@ void QCoreWlanEngine::disconnectFromId(const QString &id) void QCoreWlanEngine::requestUpdate() { getAllScInterfaces(); - getUserConfigurations(); - emit configurationsChanged(); + scanThread->getUserProfiles(); + scanThread->start(); } QCoreWlanEngine *QCoreWlanEngine::instance() @@ -442,148 +717,6 @@ QCoreWlanEngine *QCoreWlanEngine::instance() return coreWlanEngine(); } -QString QCoreWlanEngine::getSsidFromNetworkName(const QString &name) -{ - QMapIterator<QString, QMap<QString,QString> > i(userProfiles); - while (i.hasNext()) { - i.next(); - QMap<QString,QString> map = i.value(); - QMapIterator<QString, QString> ij(i.value()); - while (ij.hasNext()) { - ij.next(); - if(name == i.key()) { - return ij.key(); - } - } - } - return QString(); -} - -QString QCoreWlanEngine::getNetworkNameFromSsid(const QString &ssid) -{ - QMapIterator<QString, QMap<QString,QString> > i(userProfiles); - while (i.hasNext()) { - i.next(); - QMap<QString,QString> map = i.value(); - QMapIterator<QString, QString> ij(i.value()); - while (ij.hasNext()) { - ij.next(); - if(ij.key() == ssid) { - return i.key(); - } - } - } - return QString(); -} - -QList<QNetworkConfigurationPrivate *> QCoreWlanEngine::scanForSsids(const QString &interfaceName) -{ - QList<QNetworkConfigurationPrivate *> foundConfigs; - if(!hasWifi) { - return foundConfigs; - } -#if defined(MAC_SDK_10_6) - NSAutoreleasePool *autoreleasepool = [[NSAutoreleasePool alloc] init]; - CWInterface *currentInterface = [CWInterface interfaceWithName:qstringToNSString(interfaceName)]; - QStringList addedConfigs; - - if([currentInterface power]) { - NSError *err = nil; - NSDictionary *parametersDict = [NSDictionary dictionaryWithObjectsAndKeys: - [NSNumber numberWithBool:YES], kCWScanKeyMerge, - [NSNumber numberWithInt:kCWScanTypeFast], kCWScanKeyScanType, // get the networks in the scan cache - [NSNumber numberWithInteger:100], kCWScanKeyRestTime, nil]; - NSArray* apArray = [currentInterface scanForNetworksWithParameters:parametersDict error:&err]; - CWNetwork *apNetwork; - if(!err) { - for(uint row=0; row < [apArray count]; row++ ) { - apNetwork = [apArray objectAtIndex:row]; - - QString networkSsid = nsstringToQString([apNetwork ssid]); - - QNetworkConfigurationPrivate* cpPriv = new QNetworkConfigurationPrivate(); - cpPriv->name = networkSsid; - cpPriv->isValid = true; - cpPriv->id = networkSsid; - cpPriv->internet = true; - cpPriv->bearer = QLatin1String("WLAN"); - cpPriv->type = QNetworkConfiguration::InternetAccessPoint; - cpPriv->serviceInterface = QNetworkInterface::interfaceFromName(interfaceName); - bool known = isKnownSsid(networkSsid); - if( [currentInterface.interfaceState intValue] == kCWInterfaceStateRunning) { - if( cpPriv->name == nsstringToQString( [currentInterface ssid])) { - cpPriv->state |= QNetworkConfiguration::Active; - } - } - - if(!cpPriv->state) { - if(known) { - cpPriv->state = QNetworkConfiguration::Discovered; - } else { - cpPriv->state = QNetworkConfiguration::Undefined; - } - } - if([[apNetwork securityMode ] intValue]== kCWSecurityModeOpen) - cpPriv->purpose = QNetworkConfiguration::PublicPurpose; - else - cpPriv->purpose = QNetworkConfiguration::PrivatePurpose; - - foundConfigs.append(cpPriv); - addedConfigs << networkSsid; - - } //end scanned row - } - } //end power - - - // add known configurations that are not around. - QMapIterator<QString, QMap<QString,QString> > i(userProfiles); - while (i.hasNext()) { - i.next(); - QString networkName = i.key(); - - if(!addedConfigs.contains(networkName)) { - QString interfaceName; - QMapIterator<QString, QString> ij(i.value()); - while (ij.hasNext()) { - ij.next(); - interfaceName = ij.value(); - } - - QNetworkConfigurationPrivate* cpPriv = new QNetworkConfigurationPrivate(); - cpPriv->name = networkName; - cpPriv->isValid = true; - cpPriv->id = networkName; - cpPriv->internet = true; - cpPriv->bearer = QLatin1String("WLAN"); - cpPriv->type = QNetworkConfiguration::InternetAccessPoint; - cpPriv->serviceInterface = QNetworkInterface::interfaceFromName(interfaceName); - QString ssid = getSsidFromNetworkName(networkName); - if( [currentInterface.interfaceState intValue] == kCWInterfaceStateRunning) { - if( ssid == nsstringToQString( [currentInterface ssid])) { - cpPriv->state |= QNetworkConfiguration::Active; - } - } - - if( addedConfigs.contains(ssid)) { - cpPriv->state |= QNetworkConfiguration::Discovered; - } - - if(!cpPriv->state) { - cpPriv->state = QNetworkConfiguration::Defined; - } - - foundConfigs.append(cpPriv); - } - } - - [autoreleasepool drain]; -#else - Q_UNUSED(interfaceName); -#endif - return foundConfigs; -} - bool QCoreWlanEngine::isWifiReady(const QString &wifiDeviceName) { #if defined(MAC_SDK_10_6) @@ -598,23 +731,6 @@ bool QCoreWlanEngine::isWifiReady(const QString &wifiDeviceName) return false; } -bool QCoreWlanEngine::isKnownSsid( const QString &ssid) -{ -#if defined(MAC_SDK_10_6) - QMapIterator<QString, QMap<QString,QString> > i(userProfiles); - while (i.hasNext()) { - i.next(); - QMap<QString,QString> map = i.value(); - if(map.keys().contains(ssid)) { - return true; - } - } -#else - Q_UNUSED(ssid); -#endif - return false; -} - bool QCoreWlanEngine::getAllScInterfaces() { networkInterfaces.clear(); @@ -665,7 +781,7 @@ void QCoreWlanEngine::startNetworkChangeLoop() networkChangeCallback, &dynStoreContext); if (!storeSession ) { - qWarning() << "could not open dynamic store: error:" << SCErrorString(SCError()); + qDebug() << "could not open dynamic store: error:" << SCErrorString(SCError()); return; } @@ -689,7 +805,7 @@ void QCoreWlanEngine::startNetworkChangeLoop() CFRelease(storeKey); if (!SCDynamicStoreSetNotificationKeys(storeSession , notificationKeys, patternsArray)) { - qWarning() << "register notification error:"<< SCErrorString(SCError()); + qDebug() << "register notification error:"<< SCErrorString(SCError()); CFRelease(storeSession ); CFRelease(notificationKeys); CFRelease(patternsArray); @@ -700,7 +816,7 @@ void QCoreWlanEngine::startNetworkChangeLoop() runloopSource = SCDynamicStoreCreateRunLoopSource(NULL, storeSession , 0); if (!runloopSource) { - qWarning() << "runloop source error:"<< SCErrorString(SCError()); + qDebug() << "runloop source error:"<< SCErrorString(SCError()); CFRelease(storeSession ); return; } @@ -708,79 +824,6 @@ void QCoreWlanEngine::startNetworkChangeLoop() CFRunLoopAddSource(CFRunLoopGetCurrent(), runloopSource, kCFRunLoopDefaultMode); return; } - -void QCoreWlanEngine::getUserConfigurations() -{ -#ifdef MAC_SDK_10_6 - NSAutoreleasePool *autoreleasepool = [[NSAutoreleasePool alloc] init]; - userProfiles.clear(); - - NSArray *wifiInterfaces = [CWInterface supportedInterfaces]; - for(uint row=0; row < [wifiInterfaces count]; row++ ) { - - CWInterface *wifiInterface = [CWInterface interfaceWithName: [wifiInterfaces objectAtIndex:row]]; - NSString *nsInterfaceName = [wifiInterface name]; -// add user configured system networks - SCDynamicStoreRef dynRef = SCDynamicStoreCreate(kCFAllocatorSystemDefault, (CFStringRef)@"Qt corewlan", nil, nil); - NSDictionary *airportPlist = (NSDictionary *)SCDynamicStoreCopyValue(dynRef, (CFStringRef)[[NSString stringWithFormat:@"Setup:/Network/Interface/%@/AirPort", nsInterfaceName] autorelease]); - CFRelease(dynRef); - - NSDictionary *prefNetDict = [airportPlist objectForKey:@"PreferredNetworks"]; - - NSArray *thisSsidarray = [prefNetDict valueForKey:@"SSID_STR"]; - for(NSString *ssidkey in thisSsidarray) { - QString thisSsid = nsstringToQString(ssidkey); - if(!userProfiles.contains(thisSsid)) { - QMap <QString,QString> map; - map.insert(thisSsid, nsstringToQString(nsInterfaceName)); - userProfiles.insert(thisSsid, map); - } - } - CFRelease(airportPlist); - - // 802.1X user profiles - QString userProfilePath = QDir::homePath() + "/Library/Preferences/com.apple.eap.profiles.plist"; - NSDictionary* eapDict = [[NSDictionary alloc] initWithContentsOfFile:qstringToNSString(userProfilePath)]; - NSString *profileStr= @"Profiles"; - NSString *nameStr = @"UserDefinedName"; - NSString *networkSsidStr = @"Wireless Network"; - for (id profileKey in eapDict) { - if ([profileStr isEqualToString:profileKey]) { - NSDictionary *itemDict = [eapDict objectForKey:profileKey]; - for (id itemKey in itemDict) { - - NSInteger dictSize = [itemKey count]; - id objects[dictSize]; - id keys[dictSize]; - - [itemKey getObjects:objects andKeys:keys]; - QString networkName; - QString ssid; - for(int i = 0; i < dictSize; i++) { - if([nameStr isEqualToString:keys[i]]) { - networkName = nsstringToQString(objects[i]); - } - if([networkSsidStr isEqualToString:keys[i]]) { - ssid = nsstringToQString(objects[i]); - } - if(!userProfiles.contains(networkName) - && !ssid.isEmpty()) { - QMap<QString,QString> map; - map.insert(ssid, nsstringToQString(nsInterfaceName)); - userProfiles.insert(networkName, map); - } - } - } - [itemDict release]; - } - } - [eapDict release]; - } - [autoreleasepool release]; -#endif - -} - #include "moc_qcorewlanengine_mac_p.cpp" QTM_END_NAMESPACE diff --git a/src/bearer/qcorewlanengine_mac_p.h b/src/bearer/qcorewlanengine_mac_p.h index bc28acdbfe..fdc2cc0c0d 100644 --- a/src/bearer/qcorewlanengine_mac_p.h +++ b/src/bearer/qcorewlanengine_mac_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -54,17 +54,23 @@ // #include "qnetworksessionengine_p.h" +#include "qnetworkconfiguration.h" + #include <QMap> #include <QTimer> #include <SystemConfiguration/SystemConfiguration.h> +#include <QThread> +#include <QMutex> QTM_BEGIN_NAMESPACE class QNetworkConfigurationPrivate; +class QScanThread; class QCoreWlanEngine : public QNetworkSessionEngine { Q_OBJECT + friend class QScanThread; public: QCoreWlanEngine(QObject *parent = 0); @@ -82,30 +88,62 @@ public: void requestUpdate(); static QCoreWlanEngine *instance(); - static bool getAllScInterfaces(); + QString interfaceName; private: bool isWifiReady(const QString &dev); - QMap<uint, QString> configurationInterface; QTimer pollTimer; - QList<QNetworkConfigurationPrivate *> scanForSsids(const QString &interfaceName); - - bool isKnownSsid(const QString &ssid); QList<QNetworkConfigurationPrivate *> foundConfigurations; SCDynamicStoreRef storeSession; CFRunLoopSourceRef runloopSource; bool hasWifi; + QScanThread *scanThread; + QMutex mutex; + static bool getAllScInterfaces(); -protected: - QMap<QString, QMap<QString,QString> > userProfiles; +private Q_SLOTS: + void init(); +protected: void startNetworkChangeLoop(); - void getUserConfigurations(); +}; + +class QScanThread : public QThread +{ + Q_OBJECT + +public: + QScanThread(QObject *parent = 0); + ~QScanThread(); + + void quit(); + QList<QNetworkConfigurationPrivate *> getConfigurations(); + QString interfaceName; + QMap<QString, QString> configurationInterface; + void getUserProfiles(); QString getNetworkNameFromSsid(const QString &ssid); QString getSsidFromNetworkName(const QString &name); + bool isKnownSsid(const QString &ssid); + QMap<QString, QMap<QString,QString> > userProfiles; + +signals: + void networksChanged(); + +protected: + void run(); + +private: + QList<QNetworkConfigurationPrivate *> fetchedConfigurations; + QMutex mutex; + QStringList foundNetwork(const QString &id, const QString &ssid, + const QNetworkConfiguration::StateFlags state, + const QString &interfaceName, + const QNetworkConfiguration::Purpose purpose); + }; + QTM_END_NAMESPACE #endif diff --git a/src/bearer/qgenericengine.cpp b/src/bearer/qgenericengine.cpp index 35e78791e3..dc9bb306bb 100644 --- a/src/bearer/qgenericengine.cpp +++ b/src/bearer/qgenericengine.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/bearer/qgenericengine_p.h b/src/bearer/qgenericengine_p.h index 5c08aa229e..ade485596e 100644 --- a/src/bearer/qgenericengine_p.h +++ b/src/bearer/qgenericengine_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/bearer/qnativewifiengine_win.cpp b/src/bearer/qnativewifiengine_win.cpp index 20db09307a..758e54821c 100644 --- a/src/bearer/qnativewifiengine_win.cpp +++ b/src/bearer/qnativewifiengine_win.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/bearer/qnativewifiengine_win_p.h b/src/bearer/qnativewifiengine_win_p.h index e911746cc3..7f835f12c3 100644 --- a/src/bearer/qnativewifiengine_win_p.h +++ b/src/bearer/qnativewifiengine_win_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/bearer/qnetworkconfigmanager_p.cpp b/src/bearer/qnetworkconfigmanager_p.cpp index 39426d0b96..fcab31579c 100644 --- a/src/bearer/qnetworkconfigmanager_p.cpp +++ b/src/bearer/qnetworkconfigmanager_p.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/bearer/qnetworkconfigmanager_p.h b/src/bearer/qnetworkconfigmanager_p.h index 0c42f9b58e..ac9a269aef 100644 --- a/src/bearer/qnetworkconfigmanager_p.h +++ b/src/bearer/qnetworkconfigmanager_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/bearer/qnetworkconfigmanager_s60_p.cpp b/src/bearer/qnetworkconfigmanager_s60_p.cpp index 2540e99d95..16e3926f85 100644 --- a/src/bearer/qnetworkconfigmanager_s60_p.cpp +++ b/src/bearer/qnetworkconfigmanager_s60_p.cpp @@ -44,14 +44,14 @@ #include <commdb.h> #include <cdbcols.h> #include <d32dbms.h> +#include <nifvar.h> #include <QEventLoop> #include <QTimer> #include <QTime> // For randgen seeding #include <QtCore> // For randgen seeding -// #define QT_BEARERMGMT_CONFIGMGR_DEBUG -#ifdef QT_BEARERMGMT_CONFIGMGR_DEBUG +#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG #include <QDebug> #endif @@ -70,7 +70,9 @@ QTM_BEGIN_NAMESPACE -static const int KValueThatWillBeAddedToSNAPId = 1000; +#ifdef SNAP_FUNCTIONALITY_AVAILABLE + static const int KValueThatWillBeAddedToSNAPId = 1000; +#endif static const int KUserChoiceIAPId = 0; QNetworkConfigurationManagerPrivate::QNetworkConfigurationManagerPrivate() @@ -607,10 +609,14 @@ void QNetworkConfigurationManagerPrivate::updateActiveAccessPoints() iConnectionMonitor.GetConnectionCount(connectionCount, status); User::WaitForRequest(status); - // Go through all connections and set state of related IAPs to Active + // Go through all connections and set state of related IAPs to Active. + // Status needs to be checked carefully, because ConnMon lists also e.g. + // WLAN connections that are being currently tried --> we don't want to + // state these as active. TUint connectionId; TUint subConnectionCount; TUint apId; + TInt connectionStatus; if (status.Int() == KErrNone) { for (TUint i = 1; i <= connectionCount; i++) { iConnectionMonitor.GetConnectionInfo(i, connectionId, subConnectionCount); @@ -619,11 +625,15 @@ void QNetworkConfigurationManagerPrivate::updateActiveAccessPoints() QString ident = QString::number(qHash(apId)); QExplicitlySharedDataPointer<QNetworkConfigurationPrivate> priv = accessPointConfigurations.value(ident); if (priv.data()) { - online = true; - inactiveConfigs.removeOne(ident); - priv.data()->connectionId = connectionId; - // Configuration is Active - changeConfigurationStateTo(priv, QNetworkConfiguration::Active); + iConnectionMonitor.GetIntAttribute(connectionId, subConnectionCount, KConnectionStatus, connectionStatus, status); + User::WaitForRequest(status); + if (connectionStatus == KLinkLayerOpen) { + online = true; + inactiveConfigs.removeOne(ident); + priv.data()->connectionId = connectionId; + // Configuration is Active + changeConfigurationStateTo(priv, QNetworkConfiguration::Active); + } } } } @@ -674,12 +684,12 @@ void QNetworkConfigurationManagerPrivate::accessPointScanningReady(TBool scanSuc } } - // Make sure that state of rest of the IAPs won't be Discovered or Active + // Make sure that state of rest of the IAPs won't be Active foreach (const QString &iface, unavailableConfigs) { QExplicitlySharedDataPointer<QNetworkConfigurationPrivate> priv = accessPointConfigurations.value(iface); if (priv.data()) { // Configuration is Defined - changeConfigurationStateAtMaxTo(priv, QNetworkConfiguration::Defined); + changeConfigurationStateAtMaxTo(priv, QNetworkConfiguration::Discovered); } } } @@ -808,20 +818,21 @@ void QNetworkConfigurationManagerPrivate::stopCommsDatabaseNotifications() void QNetworkConfigurationManagerPrivate::RunL() { if (iIgnoringUpdates) { -#ifdef QT_BEARERMGMT_CONFIGMGR_DEBUG - qDebug("CommsDB event handling postponed (postpone-timer running because IAPs/SNAPs were updated very recently)."); +#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG + qDebug("QNCM CommsDB event handling postponed (postpone-timer running because IAPs/SNAPs were updated very recently)."); #endif return; } if (iStatus != KErrCancel) { RDbNotifier::TEvent event = STATIC_CAST(RDbNotifier::TEvent, iStatus.Int()); + switch (event) { case RDbNotifier::EUnlock: /** All read locks have been removed. */ case RDbNotifier::ECommit: /** A transaction has been committed. */ case RDbNotifier::ERollback: /** A transaction has been rolled back */ case RDbNotifier::ERecover: /** The database has been recovered */ -#ifdef QT_BEARERMGMT_CONFIGMGR_DEBUG - qDebug("CommsDB event (of type RDbNotifier::TEvent) received: %d", iStatus.Int()); +#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG + qDebug("QNCM CommsDB event (of type RDbNotifier::TEvent) received: %d", iStatus.Int()); #endif iIgnoringUpdates = true; // Other events than ECommit get lower priority. In practice with those events, @@ -867,64 +878,87 @@ void QNetworkConfigurationManagerPrivate::DoCancel() ipCommsDB->CancelRequestNotification(); } - void QNetworkConfigurationManagerPrivate::EventL(const CConnMonEventBase& aEvent) { switch (aEvent.EventType()) { - case EConnMonCreateConnection: + case EConnMonConnectionStatusChange: { - CConnMonCreateConnection* realEvent; - realEvent = (CConnMonCreateConnection*) &aEvent; - TUint subConnectionCount = 0; - TUint apId; - TUint connectionId = realEvent->ConnectionId(); - TRequestStatus status; - iConnectionMonitor.GetUintAttribute(connectionId, subConnectionCount, KIAPId, apId, status); - User::WaitForRequest(status); - QString ident = QString::number(qHash(apId)); - QExplicitlySharedDataPointer<QNetworkConfigurationPrivate> priv = accessPointConfigurations.value(ident); - if (priv.data()) { - priv.data()->connectionId = connectionId; - // Configuration is Active - if (changeConfigurationStateTo(priv, QNetworkConfiguration::Active)) { - updateStatesToSnaps(); + CConnMonConnectionStatusChange* realEvent; + realEvent = (CConnMonConnectionStatusChange*) &aEvent; + TInt connectionStatus = realEvent->ConnectionStatus(); +#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG + qDebug() << "QNCM Connection status : " << QString::number(connectionStatus) << " , connection monitor Id : " << realEvent->ConnectionId(); +#endif + if (connectionStatus == KConfigDaemonStartingRegistration) { + TUint connectionId = realEvent->ConnectionId(); + TUint subConnectionCount = 0; + TUint apId; + TRequestStatus status; + iConnectionMonitor.GetUintAttribute(connectionId, subConnectionCount, KIAPId, apId, status); + User::WaitForRequest(status); + QString ident = QString::number(qHash(apId)); + QExplicitlySharedDataPointer<QNetworkConfigurationPrivate> priv = accessPointConfigurations.value(ident); + if (priv.data()) { + priv.data()->connectionId = connectionId; + emit this->configurationStateChanged(priv.data()->numericId, connectionId, QNetworkSession::Connecting); } - if (!iOnline) { - iOnline = true; - emit this->onlineStateChanged(iOnline); + } else if (connectionStatus == KLinkLayerOpen) { + // Connection has been successfully opened + TUint connectionId = realEvent->ConnectionId(); + TUint subConnectionCount = 0; + TUint apId; + TRequestStatus status; + iConnectionMonitor.GetUintAttribute(connectionId, subConnectionCount, KIAPId, apId, status); + User::WaitForRequest(status); + QString ident = QString::number(qHash(apId)); + QExplicitlySharedDataPointer<QNetworkConfigurationPrivate> priv = accessPointConfigurations.value(ident); + if (priv.data()) { + priv.data()->connectionId = connectionId; + // Configuration is Active + if (changeConfigurationStateTo(priv, QNetworkConfiguration::Active)) { + updateStatesToSnaps(); + } + emit this->configurationStateChanged(priv.data()->numericId, connectionId, QNetworkSession::Connected); + if (!iOnline) { + iOnline = true; + emit this->onlineStateChanged(iOnline); + } } - } - } - break; - - case EConnMonDeleteConnection: - { - CConnMonDeleteConnection* realEvent; - realEvent = (CConnMonDeleteConnection*) &aEvent; - TUint connectionId = realEvent->ConnectionId(); - QExplicitlySharedDataPointer<QNetworkConfigurationPrivate> priv = dataByConnectionId(connectionId); - if (priv.data()) { - priv.data()->connectionId = 0; - // Configuration is either Defined or Discovered - if (changeConfigurationStateAtMaxTo(priv, QNetworkConfiguration::Discovered)) { - updateStatesToSnaps(); + } else if (connectionStatus == KConfigDaemonStartingDeregistration) { + TUint connectionId = realEvent->ConnectionId(); + QExplicitlySharedDataPointer<QNetworkConfigurationPrivate> priv = dataByConnectionId(connectionId); + if (priv.data()) { + emit this->configurationStateChanged(priv.data()->numericId, connectionId, QNetworkSession::Closing); } - } - - bool online = false; - foreach (const QString &iface, accessPointConfigurations.keys()) { - QExplicitlySharedDataPointer<QNetworkConfigurationPrivate> priv = accessPointConfigurations.value(iface); - if (priv.data()->state == QNetworkConfiguration::Active) { - online = true; - break; + } else if (connectionStatus == KLinkLayerClosed || + connectionStatus == KConnectionClosed) { + // Connection has been closed. Which of the above events is reported, depends on the Symbian + // platform. + TUint connectionId = realEvent->ConnectionId(); + QExplicitlySharedDataPointer<QNetworkConfigurationPrivate> priv = dataByConnectionId(connectionId); + if (priv.data()) { + // Configuration is either Defined or Discovered + if (changeConfigurationStateAtMaxTo(priv, QNetworkConfiguration::Discovered)) { + updateStatesToSnaps(); + } + emit this->configurationStateChanged(priv.data()->numericId, connectionId, QNetworkSession::Disconnected); + } + + bool online = false; + foreach (const QString &iface, accessPointConfigurations.keys()) { + QExplicitlySharedDataPointer<QNetworkConfigurationPrivate> priv = accessPointConfigurations.value(iface); + if (priv.data()->state == QNetworkConfiguration::Active) { + online = true; + break; + } + } + if (iOnline != online) { + iOnline = online; + emit this->onlineStateChanged(iOnline); } - } - if (iOnline != online) { - iOnline = online; - emit this->onlineStateChanged(iOnline); } } - break; + break; case EConnMonIapAvailabilityChange: { @@ -951,21 +985,74 @@ void QNetworkConfigurationManagerPrivate::EventL(const CConnMonEventBase& aEvent } break; + case EConnMonCreateConnection: + { + // This event is caught to keep connection monitor IDs up-to-date. + CConnMonCreateConnection* realEvent; + realEvent = (CConnMonCreateConnection*) &aEvent; + TUint subConnectionCount = 0; + TUint apId; + TUint connectionId = realEvent->ConnectionId(); + TRequestStatus status; + iConnectionMonitor.GetUintAttribute(connectionId, subConnectionCount, KIAPId, apId, status); + User::WaitForRequest(status); + QString ident = QString::number(qHash(apId)); + QExplicitlySharedDataPointer<QNetworkConfigurationPrivate> priv = accessPointConfigurations.value(ident); + if (priv.data()) { +#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG + qDebug() << "QNCM updating connection monitor ID : from, to, whose: " << priv.data()->connectionId << connectionId << priv->name; +#endif + priv.data()->connectionId = connectionId; + } + } + break; default: // For unrecognized events break; } } -// Waits for 1..4 seconds. +// Sessions may use this function to report configuration state changes, +// because on some Symbian platforms (especially Symbian^3) all state changes are not +// reported by the RConnectionMonitor, in particular in relation to stop() call, +// whereas they _are_ reported on RConnection progress notifier used by sessions --> centralize +// this data here so that other sessions may benefit from it too (not all sessions necessarily have +// RConnection progress notifiers available but they relay on having e.g. disconnected information from +// manager). Currently only 'Disconnected' state is of interest because it has proven to be troublesome. +void QNetworkConfigurationManagerPrivate::configurationStateChangeReport(TUint32 accessPointId, QNetworkSession::State newState) +{ +#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG + qDebug() << "QNCM A session reported state change for IAP ID: " << accessPointId << " whose new state is: " << newState; +#endif + switch (newState) { + case QNetworkSession::Disconnected: + { + QString ident = QString::number(qHash(accessPointId)); + QExplicitlySharedDataPointer<QNetworkConfigurationPrivate> priv = accessPointConfigurations.value(ident); + if (priv.data()) { + // Configuration is either Defined or Discovered + if (changeConfigurationStateAtMaxTo(priv, QNetworkConfiguration::Discovered)) { + updateStatesToSnaps(); + } + emit this->configurationStateChanged( + priv.data()->numericId, priv.data()->connectionId, QNetworkSession::Disconnected); + } + } + break; + default: + break; + } +} + +// Waits for 2..6 seconds. void QNetworkConfigurationManagerPrivate::waitRandomTime() { - iTimeToWait = (qAbs(qrand()) % 5) * 1000; - if (iTimeToWait < 1000) { - iTimeToWait = 1000; + iTimeToWait = (qAbs(qrand()) % 7) * 1000; + if (iTimeToWait < 2000) { + iTimeToWait = 2000; } -#ifdef QT_BEARERMGMT_CONFIGMGR_DEBUG - qDebug("QNetworkConfigurationManager waiting random time: %d ms", iTimeToWait); +#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG + qDebug("QNCM waiting random time: %d ms", iTimeToWait); #endif QTimer::singleShot(iTimeToWait, iIgnoreEventLoop, SLOT(quit())); iIgnoreEventLoop->exec(); @@ -974,7 +1061,6 @@ void QNetworkConfigurationManagerPrivate::waitRandomTime() QExplicitlySharedDataPointer<QNetworkConfigurationPrivate> QNetworkConfigurationManagerPrivate::dataByConnectionId(TUint aConnectionId) { QNetworkConfiguration item; - QHash<QString, QExplicitlySharedDataPointer<QNetworkConfigurationPrivate> >::const_iterator i = accessPointConfigurations.constBegin(); while (i != accessPointConfigurations.constEnd()) { diff --git a/src/bearer/qnetworkconfigmanager_s60_p.h b/src/bearer/qnetworkconfigmanager_s60_p.h index 50b23b0f51..a5c7a9aa1e 100644 --- a/src/bearer/qnetworkconfigmanager_s60_p.h +++ b/src/bearer/qnetworkconfigmanager_s60_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -55,6 +55,7 @@ #include <qnetworkconfigmanager.h> #include <qnetworkconfiguration_s60_p.h> +#include <qnetworksession.h> #include <QHash> #include <rconnmon.h> @@ -62,6 +63,9 @@ #include <cmmanager.h> #endif +// Uncomment and compile QtBearer to gain detailed state tracing +// #define QT_BEARERMGMT_SYMBIAN_DEBUG + class CCommsDatabase; class QEventLoop; @@ -92,6 +96,9 @@ Q_SIGNALS: void configurationChanged(const QNetworkConfiguration& config); void onlineStateChanged(bool isOnline); + void configurationStateChanged(TUint32 accessPointId, TUint32 connMonId, + QNetworkSession::State newState); + public Q_SLOTS: void updateConfigurations(); @@ -126,12 +133,17 @@ private: void startMonitoringIAPData(TUint32 aIapId); QExplicitlySharedDataPointer<QNetworkConfigurationPrivate> dataByConnectionId(TUint aConnectionId); -protected: // From CActive +protected: + // From CActive void RunL(); void DoCancel(); -private: // MConnectionMonitorObserver +private: + // MConnectionMonitorObserver void EventL(const CConnMonEventBase& aEvent); + // For QNetworkSessionPrivate to indicate about state changes + void configurationStateChangeReport(TUint32 accessPointId, + QNetworkSession::State newState); public: // Data //this table contains an up to date list of all configs at any time. diff --git a/src/bearer/qnetworkconfiguration.cpp b/src/bearer/qnetworkconfiguration.cpp index 1fc0582610..933b8b5684 100644 --- a/src/bearer/qnetworkconfiguration.cpp +++ b/src/bearer/qnetworkconfiguration.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/bearer/qnetworkconfiguration.h b/src/bearer/qnetworkconfiguration.h index 860be4b0ec..a050a28a43 100644 --- a/src/bearer/qnetworkconfiguration.h +++ b/src/bearer/qnetworkconfiguration.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/bearer/qnetworkconfiguration_maemo_p.h b/src/bearer/qnetworkconfiguration_maemo_p.h index d912b904b5..7e54f0ef22 100644 --- a/src/bearer/qnetworkconfiguration_maemo_p.h +++ b/src/bearer/qnetworkconfiguration_maemo_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/bearer/qnetworkconfiguration_p.h b/src/bearer/qnetworkconfiguration_p.h index c2834e6d94..28c5ade4b5 100644 --- a/src/bearer/qnetworkconfiguration_p.h +++ b/src/bearer/qnetworkconfiguration_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/bearer/qnetworkconfiguration_s60_p.cpp b/src/bearer/qnetworkconfiguration_s60_p.cpp index ee50bd5b5d..316030b5db 100644 --- a/src/bearer/qnetworkconfiguration_s60_p.cpp +++ b/src/bearer/qnetworkconfiguration_s60_p.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/bearer/qnetworkconfiguration_s60_p.h b/src/bearer/qnetworkconfiguration_s60_p.h index 6c8720026e..add0e97c05 100644 --- a/src/bearer/qnetworkconfiguration_s60_p.h +++ b/src/bearer/qnetworkconfiguration_s60_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -88,7 +88,18 @@ public: QNetworkConfigurationPrivate::Bearer bearer; QString bearerName() const; + // So called IAP id from the platform. Remains constant as long as the + // platform is aware of the configuration ie. it is stored in the databases + // --> does not depend on whether connections are currently open or not. + // In practice is the same for the lifetime of the QNetworkConfiguration. TUint32 numericId; + // So called connection id, or connection monitor ID. A dynamic ID assigned + // by RConnectionMonitor whenever a new connection is opened. ConnectionID and + // numericId/IAP id have 1-to-1 mapping during the lifetime of the connection at + // connection monitor. Notably however it changes whenever a new connection to + // a given IAP is created. In a sense it is constant during the time the + // configuration remains between states Discovered..Active..Discovered, do not + // however relay on this. TUint connectionId; TAny* manager; diff --git a/src/bearer/qnetworkmanagerservice_p.cpp b/src/bearer/qnetworkmanagerservice_p.cpp index aedb11982c..60126a54f2 100644 --- a/src/bearer/qnetworkmanagerservice_p.cpp +++ b/src/bearer/qnetworkmanagerservice_p.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/bearer/qnetworkmanagerservice_p.h b/src/bearer/qnetworkmanagerservice_p.h index 11c04caf0c..1dcd2848b3 100644 --- a/src/bearer/qnetworkmanagerservice_p.h +++ b/src/bearer/qnetworkmanagerservice_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/bearer/qnetworksession.cpp b/src/bearer/qnetworksession.cpp index 66ee3c328e..c066553b97 100644 --- a/src/bearer/qnetworksession.cpp +++ b/src/bearer/qnetworksession.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/bearer/qnetworksession.h b/src/bearer/qnetworksession.h index ee52c8fc0e..39a0ed7082 100644 --- a/src/bearer/qnetworksession.h +++ b/src/bearer/qnetworksession.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/bearer/qnetworksession_maemo.cpp b/src/bearer/qnetworksession_maemo.cpp index 1942de41c6..28f4ebbac4 100644 --- a/src/bearer/qnetworksession_maemo.cpp +++ b/src/bearer/qnetworksession_maemo.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/bearer/qnetworksession_maemo_p.h b/src/bearer/qnetworksession_maemo_p.h index 56e63e5403..170c3e0375 100644 --- a/src/bearer/qnetworksession_maemo_p.h +++ b/src/bearer/qnetworksession_maemo_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/bearer/qnetworksession_p.cpp b/src/bearer/qnetworksession_p.cpp index 76ea95eb56..795fee7ce1 100644 --- a/src/bearer/qnetworksession_p.cpp +++ b/src/bearer/qnetworksession_p.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/bearer/qnetworksession_p.h b/src/bearer/qnetworksession_p.h index 09fcfca241..1a8fdb4b51 100644 --- a/src/bearer/qnetworksession_p.h +++ b/src/bearer/qnetworksession_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/bearer/qnetworksession_s60_p.cpp b/src/bearer/qnetworksession_s60_p.cpp index 2f857cc4d2..0531f135fb 100644 --- a/src/bearer/qnetworksession_s60_p.cpp +++ b/src/bearer/qnetworksession_s60_p.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -52,15 +52,17 @@ QTM_BEGIN_NAMESPACE QNetworkSessionPrivate::QNetworkSessionPrivate() - : CActive(CActive::EPriorityStandard), state(QNetworkSession::Invalid), - isOpen(false), ipConnectionNotifier(0), iError(QNetworkSession::UnknownSessionError), - iALREnabled(0), iConnectInBackground(false) + : CActive(CActive::EPriorityUserInput), state(QNetworkSession::Invalid), + isOpen(false), ipConnectionNotifier(0), iHandleStateNotificationsFromManager(false), + iFirstSync(true), iStoppedByUser(false), iClosedByUser(false), iDeprecatedConnectionId(0), + iError(QNetworkSession::UnknownSessionError), iALREnabled(0), iConnectInBackground(false) { CActiveScheduler::Add(this); #ifdef SNAP_FUNCTIONALITY_AVAILABLE iMobility = NULL; #endif + TRAP_IGNORE(iConnectionMonitor.ConnectL()); } @@ -89,19 +91,62 @@ QNetworkSessionPrivate::~QNetworkSessionPrivate() // Close global 'Open C' RConnection setdefaultif(0); - - iConnectionMonitor.CancelNotifications(); + iConnectionMonitor.Close(); } +void QNetworkSessionPrivate::configurationStateChanged(TUint32 accessPointId, TUint32 connMonId, QNetworkSession::State newState) +{ + if (iHandleStateNotificationsFromManager) { +#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG + qDebug() << "QNS this : " << QString::number((uint)this) << " - " + << "configurationStateChanged from manager for IAP : " << QString::number(accessPointId) + << "configurationStateChanged connMon ID : " << QString::number(connMonId) + << " : to a state: " << newState + << " whereas my current state is: " << state; +#endif + if (connMonId == iDeprecatedConnectionId) { +#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG + qDebug() << "QNS this : " << QString::number((uint)this) << " - " + << "however status update from manager ignored because it related to already closed connection."; +#endif + return; + } + this->newState(newState, accessPointId); + } +} + +void QNetworkSessionPrivate::configurationRemoved(const QNetworkConfiguration& config) +{ + if (!publicConfig.d.data()) { + return; + } + if (config.d.data()->numericId == publicConfig.d.data()->numericId) { +#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG + qDebug() << "QNS this : " << QString::number((uint)this) << " - " + << "configurationRemoved IAP: " << QString::number(publicConfig.d.data()->numericId) << " : going to State: Invalid"; +#endif + this->newState(QNetworkSession::Invalid, publicConfig.d.data()->numericId); + } +} + void QNetworkSessionPrivate::syncStateWithInterface() { if (!publicConfig.d) { return; } - // Start monitoring changes in IAP states - TRAP_IGNORE(iConnectionMonitor.NotifyEventL(*this)); + if (iFirstSync && publicConfig.d.data()) { + QObject::connect(((QNetworkConfigurationManagerPrivate*)publicConfig.d.data()->manager), SIGNAL(configurationStateChanged(TUint32, TUint32, QNetworkSession::State)), + this, SLOT(configurationStateChanged(TUint32, TUint32, QNetworkSession::State))); + // Listen to configuration removals, so that in case the configuration + // this session is based on is removed, session knows to enter Invalid -state. + QObject::connect(((QNetworkConfigurationManagerPrivate*)publicConfig.d.data()->manager), + SIGNAL(configurationRemoved(QNetworkConfiguration)), + this, SLOT(configurationRemoved(QNetworkConfiguration))); + } + // Start listening IAP state changes from QNetworkConfigurationManagerPrivate + iHandleStateNotificationsFromManager = true; // Check open connections to see if there is already // an open connection to selected IAP or SNAP @@ -137,11 +182,7 @@ void QNetworkSessionPrivate::syncStateWithInterface() } if (state != QNetworkSession::Connected) { - // There were no open connections to used IAP or SNAP - if (iError == QNetworkSession::InvalidConfigurationError) { - newState(QNetworkSession::Invalid); - } - else if ((publicConfig.d.data()->state & QNetworkConfiguration::Discovered) == + if ((publicConfig.d.data()->state & QNetworkConfiguration::Discovered) == QNetworkConfiguration::Discovered) { newState(QNetworkSession::Disconnected); } else { @@ -242,13 +283,18 @@ QNetworkSession::SessionError QNetworkSessionPrivate::error() const void QNetworkSessionPrivate::open() { +#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG + qDebug() << "QNS this : " << QString::number((uint)this) << " - " + << "open() called, session state is: " << state << " and isOpen is: " + << isOpen; +#endif if (isOpen || (state == QNetworkSession::Connecting)) { return; } - - // Cancel notifications from RConnectionMonitor + + // Stop handling IAP state change signals from QNetworkConfigurationManagerPrivate // => RConnection::ProgressNotification will be used for IAP/SNAP monitoring - iConnectionMonitor.CancelNotifications(); + iHandleStateNotificationsFromManager = false; // Configuration may have been invalidated after session creation by platform // (e.g. configuration has been deleted). @@ -256,19 +302,25 @@ void QNetworkSessionPrivate::open() newState(QNetworkSession::Invalid); iError = QNetworkSession::InvalidConfigurationError; emit q->error(iError); - syncStateWithInterface(); return; } - // If opening a (un)defined configuration, session emits error and enters - // NotAvailable -state. - if (publicConfig.state() == QNetworkConfiguration::Undefined || - publicConfig.state() == QNetworkConfiguration::Defined) { + // If opening a undefined configuration, session emits error and enters + // NotAvailable -state. Note that we will try ones in 'defined' state to avoid excessive + // need for WLAN scans (via updateConfigurations()), because user may have walked + // into a WLAN range, but periodic background scan has not occurred yet --> + // we don't want to force application to make frequent updateConfigurations() calls + // to be able to try if e.g. home WLAN is available. + if (publicConfig.state() == QNetworkConfiguration::Undefined) { newState(QNetworkSession::NotAvailable); iError = QNetworkSession::InvalidConfigurationError; emit q->error(iError); return; } - + // Clear possible previous states + iStoppedByUser = false; + iClosedByUser = false; + iDeprecatedConnectionId = 0; + TInt error = iSocketServ.Connect(); if (error != KErrNone) { // Could not open RSocketServ @@ -420,9 +472,18 @@ TUint QNetworkSessionPrivate::iapClientCount(TUint aIAPId) const void QNetworkSessionPrivate::close(bool allowSignals) { +#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG + qDebug() << "QNS this : " << QString::number((uint)this) << " - " + << "close() called, session state is: " << state << " and isOpen is : " + << isOpen; +#endif if (!isOpen) { return; } + // Mark this session as closed-by-user so that we are able to report + // distinguish between stop() and close() state transitions + // when reporting. + iClosedByUser = true; TUint activeIap = activeConfig.d.data()->numericId; isOpen = false; @@ -437,8 +498,10 @@ void QNetworkSessionPrivate::close(bool allowSignals) } #endif - if (ipConnectionNotifier) { + if (ipConnectionNotifier && !iHandleStateNotificationsFromManager) { ipConnectionNotifier->StopNotifications(); + // Start handling IAP state change signals from QNetworkConfigurationManagerPrivate + iHandleStateNotificationsFromManager = true; } iConnection.Close(); @@ -456,7 +519,6 @@ void QNetworkSessionPrivate::close(bool allowSignals) newState(QNetworkSession::Closing); } - syncStateWithInterface(); if (allowSignals) { if (publicConfig.type() == QNetworkConfiguration::UserChoice) { newState(QNetworkSession::Disconnected); @@ -467,9 +529,19 @@ void QNetworkSessionPrivate::close(bool allowSignals) void QNetworkSessionPrivate::stop() { +#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG + qDebug() << "QNS this : " << QString::number((uint)this) << " - " + << "stop() called, session state is: " << state << " and isOpen is : " + << isOpen; +#endif if (!isOpen && publicConfig.isValid() && publicConfig.type() == QNetworkConfiguration::InternetAccessPoint) { +#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG + qDebug() << "QNS this : " << QString::number((uint)this) << " - " + << "since session is not open, using RConnectionMonitor to stop() the interface"; +#endif + iStoppedByUser = true; // If the publicConfig is type of IAP, enumerate through connections at // connection monitor. If publicConfig is active in that list, stop it. // Otherwise there is nothing to stop. Note: because this QNetworkSession is not open, @@ -495,11 +567,25 @@ void QNetworkSessionPrivate::stop() ETrue); } } + // Enter disconnected state right away since the session is not even open. + // Symbian^3 connection monitor does not emit KLinkLayerClosed when + // connection is stopped via connection monitor. + newState(QNetworkSession::Disconnected); } } else if (isOpen) { +#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG + qDebug() << "QNS this : " << QString::number((uint)this) << " - " + << "since session is open, using RConnection to stop() the interface"; +#endif // Since we are open, use RConnection to stop the interface isOpen = false; + iStoppedByUser = true; newState(QNetworkSession::Closing); + if (ipConnectionNotifier) { + ipConnectionNotifier->StopNotifications(); + // Start handling IAP state change signals from QNetworkConfigurationManagerPrivate + iHandleStateNotificationsFromManager = true; + } iConnection.Stop(RConnection::EStopAuthoritative); isOpen = true; close(false); @@ -611,6 +697,10 @@ void QNetworkSessionPrivate::NewCarrierActive(TAccessPointInfo /*aNewAPInfo*/, T void QNetworkSessionPrivate::Error(TInt /*aError*/) { +#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG + qDebug() << "QNS this : " << QString::number((uint)this) << " - " + << "roaming Error() occured"; +#endif if (isOpen) { isOpen = false; activeConfig = QNetworkConfiguration(); @@ -628,6 +718,11 @@ void QNetworkSessionPrivate::Error(TInt /*aError*/) // changes immediately to Disconnected. newState(QNetworkSession::Disconnected); emit q->closed(); + } else if (iStoppedByUser) { + // If the user of this session has called the stop() and + // configuration is based on internet SNAP, this needs to be + // done here because platform might roam. + newState(QNetworkSession::Disconnected); } } #endif @@ -902,7 +997,12 @@ void QNetworkSessionPrivate::RunL() isOpen = false; activeConfig = QNetworkConfiguration(); serviceConfig = QNetworkConfiguration(); - iError = QNetworkSession::UnknownSessionError; + if (publicConfig.state() == QNetworkConfiguration::Undefined || + publicConfig.state() == QNetworkConfiguration::Defined) { + iError = QNetworkSession::InvalidConfigurationError; + } else { + iError = QNetworkSession::UnknownSessionError; + } emit q->error(iError); Cancel(); if (ipConnectionNotifier) { @@ -918,8 +1018,16 @@ void QNetworkSessionPrivate::DoCancel() iConnection.Close(); } +// Enters newState if feasible according to current state. +// AccessPointId may be given as parameter. If it is zero, state-change is assumed to +// concern this session's configuration. If non-zero, the configuration is looked up +// and checked if it matches the configuration this session is based on. bool QNetworkSessionPrivate::newState(QNetworkSession::State newState, TUint accessPointId) { +#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG + qDebug() << "QNS this : " << QString::number((uint)this) << " - " + << "NEW STATE, IAP ID : " << QString::number(accessPointId) << " , newState : " << QString::number(newState); +#endif // Make sure that activeConfig is always updated when SNAP is signaled to be // connected. if (isOpen && publicConfig.type() == QNetworkConfiguration::ServiceNetwork && @@ -937,9 +1045,29 @@ bool QNetworkSessionPrivate::newState(QNetworkSession::State newState, TUint acc if (state == QNetworkSession::Roaming && newState == QNetworkSession::Connecting) { return false; } + + // Make sure that Connected state is not reported when Connection is + // already Closing. + // Note: Stopping connection results sometimes KLinkLayerOpen + // to be reported first (just before KLinkLayerClosed). + if (state == QNetworkSession::Closing && newState == QNetworkSession::Connected) { + return false; + } + + // Make sure that some lagging 'closing' state-changes do not overwrite + // if we are already disconnected or closed. + if (state == QNetworkSession::Disconnected && newState == QNetworkSession::Closing) { + return false; + } bool emitSessionClosed = false; - if (isOpen && state == QNetworkSession::Connected && newState == QNetworkSession::Disconnected) { + + // If we abruptly go down and user hasn't closed the session, we've been aborted. + // Note that session may be in 'closing' state and not in 'connected' state, because + // depending on platform the platform may report KConfigDaemonStartingDeregistration + // event before KLinkLayerClosed + if ((isOpen && state == QNetworkSession::Connected && newState == QNetworkSession::Disconnected) || + (isOpen && !iClosedByUser && newState == QNetworkSession::Disconnected)) { // Active & Connected state should change directly to Disconnected state // only when something forces connection to close (eg. when another // application or session stops connection or when network drops @@ -953,26 +1081,35 @@ bool QNetworkSessionPrivate::newState(QNetworkSession::State newState, TUint acc if (ipConnectionNotifier) { ipConnectionNotifier->StopNotifications(); } - // Start monitoring changes in IAP states - TRAP_IGNORE(iConnectionMonitor.NotifyEventL(*this)); + // Start handling IAP state change signals from QNetworkConfigurationManagerPrivate + iHandleStateNotificationsFromManager = true; emitSessionClosed = true; // Emit SessionClosed after state change has been reported } bool retVal = false; if (accessPointId == 0) { state = newState; +#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG + qDebug() << "QNS this : " << QString::number((uint)this) << " - " << "===> EMIT State changed A to: " << state; +#endif emit q->stateChanged(state); retVal = true; } else { if (publicConfig.type() == QNetworkConfiguration::InternetAccessPoint) { if (publicConfig.d.data()->numericId == accessPointId) { state = newState; +#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG + qDebug() << "QNS this : " << QString::number((uint)this) << " - " << "===> EMIT State changed B to: " << state; +#endif emit q->stateChanged(state); retVal = true; } } else if (publicConfig.type() == QNetworkConfiguration::UserChoice && isOpen) { if (activeConfig.d.data()->numericId == accessPointId) { state = newState; +#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG + qDebug() << "QNS this : " << QString::number((uint)this) << " - " << "===> EMIT State changed C to: " << state; +#endif emit q->stateChanged(state); retVal = true; } @@ -981,23 +1118,20 @@ bool QNetworkSessionPrivate::newState(QNetworkSession::State newState, TUint acc for (int i = 0; i < subConfigurations.count(); i++) { if (subConfigurations[i].d.data()->numericId == accessPointId) { if (newState == QNetworkSession::Connected) { - // Make sure that when AccessPoint is reported to be Connected - // also state of the related configuration changes to Active. - subConfigurations[i].d.data()->state = QNetworkConfiguration::Active; - state = newState; +#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG + qDebug() << "QNS this : " << QString::number((uint)this) << " - " << "===> EMIT State changed D to: " << state; +#endif emit q->stateChanged(state); retVal = true; } else { - if (newState == QNetworkSession::Disconnected) { - // Make sure that when AccessPoint is reported to be disconnected - // also state of the related configuration changes from Active to Defined. - subConfigurations[i].d.data()->state = QNetworkConfiguration::Defined; - } QNetworkConfiguration config = bestConfigFromSNAP(publicConfig); if ((config.state() == QNetworkConfiguration::Defined) || (config.state() == QNetworkConfiguration::Discovered)) { state = newState; +#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG + qDebug() << "QNS this : " << QString::number((uint)this) << " - " << "===> EMIT State changed E to: " << state; +#endif emit q->stateChanged(state); retVal = true; } @@ -1010,6 +1144,13 @@ bool QNetworkSessionPrivate::newState(QNetworkSession::State newState, TUint acc if (emitSessionClosed) { emit q->closed(); } + if (state == QNetworkSession::Disconnected) { + // The connection has gone down, and processing of status updates must be + // stopped. Depending on platform, there may come 'connecting/connected' states + // considerably later (almost a second). Connection id is an increasing + // number, so this does not affect next _real_ 'conneting/connected' states. + iDeprecatedConnectionId = publicConfig.d.data()->connectionId; + } return retVal; } @@ -1018,6 +1159,9 @@ void QNetworkSessionPrivate::handleSymbianConnectionStatusChange(TInt aConnectio TInt aError, TUint accessPointId) { +#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG + qDebug() << "QNS this : " << QString::number((uint)this) << " - " << QString::number(accessPointId) << " , status : " << QString::number(aConnectionStatus); +#endif switch (aConnectionStatus) { // Connection unitialised @@ -1056,6 +1200,7 @@ void QNetworkSessionPrivate::handleSymbianConnectionStatusChange(TInt aConnectio case KCsdGotLoginInfo: break; + case KConfigDaemonStartingRegistration: // Creating connection (e.g. GPRS activation) case KCsdStartingConnect: case KCsdFinishedConnect: @@ -1082,6 +1227,7 @@ void QNetworkSessionPrivate::handleSymbianConnectionStatusChange(TInt aConnectio case KDataTransferTemporarilyBlocked: break; + case KConfigDaemonStartingDeregistration: // Hangup or GRPS deactivation case KConnectionStartingClose: newState(QNetworkSession::Closing,accessPointId); @@ -1089,110 +1235,27 @@ void QNetworkSessionPrivate::handleSymbianConnectionStatusChange(TInt aConnectio // Connection closed case KConnectionClosed: - break; - case KLinkLayerClosed: newState(QNetworkSession::Disconnected,accessPointId); + // Report manager about this to make sure this event + // is received by all interseted parties (mediated by + // manager because it does always receive all events from + // connection monitor). +#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG + qDebug() << "QNS this : " << QString::number((uint)this) << " - " << "reporting disconnection to manager."; +#endif + if (publicConfig.d.data()) { + ((QNetworkConfigurationManagerPrivate*)publicConfig.d.data()->manager)->configurationStateChangeReport(publicConfig.d.data()->numericId, QNetworkSession::Disconnected); + } break; - // Unhandled state default: break; } } -void QNetworkSessionPrivate::EventL(const CConnMonEventBase& aEvent) -{ - switch (aEvent.EventType()) - { - case EConnMonConnectionStatusChange: - { - CConnMonConnectionStatusChange* realEvent; - realEvent = (CConnMonConnectionStatusChange*) &aEvent; - - TUint connectionId = realEvent->ConnectionId(); - TInt connectionStatus = realEvent->ConnectionStatus(); - - // Try to Find IAP Id using connection Id - TUint apId = 0; - if (publicConfig.type() == QNetworkConfiguration::ServiceNetwork) { - QList<QNetworkConfiguration> subConfigurations = publicConfig.children(); - for (int i = 0; i < subConfigurations.count(); i++ ) { - if (subConfigurations[i].d.data()->connectionId == connectionId) { - apId = subConfigurations[i].d.data()->numericId; - break; - } - } - } else if (publicConfig.type() == QNetworkConfiguration::InternetAccessPoint) { - if (publicConfig.d.data()->connectionId == connectionId) { - apId = publicConfig.d.data()->numericId; - } - } - - if (apId > 0) { - handleSymbianConnectionStatusChange(connectionStatus, KErrNone, apId); - } - } - break; - - case EConnMonCreateConnection: - { - CConnMonCreateConnection* realEvent; - realEvent = (CConnMonCreateConnection*) &aEvent; - TUint apId; - TUint connectionId = realEvent->ConnectionId(); - TRequestStatus status; - iConnectionMonitor.GetUintAttribute(connectionId, 0, KIAPId, apId, status); - User::WaitForRequest(status); - if (status.Int() == KErrNone) { - // Store connection id to related AccessPoint Configuration - if (publicConfig.type() == QNetworkConfiguration::ServiceNetwork) { - QList<QNetworkConfiguration> subConfigurations = publicConfig.children(); - for (int i = 0; i < subConfigurations.count(); i++ ) { - if (subConfigurations[i].d.data()->numericId == apId) { - subConfigurations[i].d.data()->connectionId = connectionId; - break; - } - } - } else if (publicConfig.type() == QNetworkConfiguration::InternetAccessPoint) { - if (publicConfig.d.data()->numericId == apId) { - publicConfig.d.data()->connectionId = connectionId; - } - } - } - } - break; - - case EConnMonDeleteConnection: - { - CConnMonDeleteConnection* realEvent; - realEvent = (CConnMonDeleteConnection*) &aEvent; - TUint connectionId = realEvent->ConnectionId(); - // Remove connection id from related AccessPoint Configuration - if (publicConfig.type() == QNetworkConfiguration::ServiceNetwork) { - QList<QNetworkConfiguration> subConfigurations = publicConfig.children(); - for (int i = 0; i < subConfigurations.count(); i++ ) { - if (subConfigurations[i].d.data()->connectionId == connectionId) { - subConfigurations[i].d.data()->connectionId = 0; - break; - } - } - } else if (publicConfig.type() == QNetworkConfiguration::InternetAccessPoint) { - if (publicConfig.d.data()->connectionId == connectionId) { - publicConfig.d.data()->connectionId = 0; - } - } - } - break; - - default: - // For unrecognized events - break; - } -} - ConnectionProgressNotifier::ConnectionProgressNotifier(QNetworkSessionPrivate& owner, RConnection& connection) - : CActive(CActive::EPriorityStandard), iOwner(owner), iConnection(connection) + : CActive(CActive::EPriorityUserInput), iOwner(owner), iConnection(connection) { CActiveScheduler::Add(this); } diff --git a/src/bearer/qnetworksession_s60_p.h b/src/bearer/qnetworksession_s60_p.h index 48e69f044c..6d6b695571 100644 --- a/src/bearer/qnetworksession_s60_p.h +++ b/src/bearer/qnetworksession_s60_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -72,11 +72,10 @@ QTM_BEGIN_NAMESPACE class ConnectionProgressNotifier; -class QNetworkSessionPrivate : public QObject, public CActive, +class QNetworkSessionPrivate : public QObject, public CActive #ifdef SNAP_FUNCTIONALITY_AVAILABLE - public MMobilityProtocolResp, + , public MMobilityProtocolResp #endif - public MConnectionMonitorObserver { Q_OBJECT public: @@ -129,8 +128,9 @@ protected: // From CActive void RunL(); void DoCancel(); -private: // MConnectionMonitorObserver - void EventL(const CConnMonEventBase& aEvent); +private Q_SLOTS: + void configurationStateChanged(TUint32 accessPointId, TUint32 connMonId, QNetworkSession::State newState); + void configurationRemoved(const QNetworkConfiguration& config); private: TUint iapClientCount(TUint aIAPId) const; @@ -166,6 +166,13 @@ private: // data mutable RConnection iConnection; mutable RConnectionMonitor iConnectionMonitor; ConnectionProgressNotifier* ipConnectionNotifier; + + bool iHandleStateNotificationsFromManager; + bool iFirstSync; + bool iStoppedByUser; + bool iClosedByUser; + TUint32 iDeprecatedConnectionId; + #ifdef SNAP_FUNCTIONALITY_AVAILABLE CActiveCommsMobilityApiExt* iMobility; #endif diff --git a/src/bearer/qnetworksessionengine.cpp b/src/bearer/qnetworksessionengine.cpp index 55fc4f3934..51dc4c0b04 100644 --- a/src/bearer/qnetworksessionengine.cpp +++ b/src/bearer/qnetworksessionengine.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/bearer/qnetworksessionengine_p.h b/src/bearer/qnetworksessionengine_p.h index 3977b15fbf..b82a4a6132 100644 --- a/src/bearer/qnetworksessionengine_p.h +++ b/src/bearer/qnetworksessionengine_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/bearer/qnetworksessionengine_win_p.h b/src/bearer/qnetworksessionengine_win_p.h index cf01719296..a7fd36a6a7 100644 --- a/src/bearer/qnetworksessionengine_win_p.h +++ b/src/bearer/qnetworksessionengine_win_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/bearer/qnlaengine_win.cpp b/src/bearer/qnlaengine_win.cpp index a3f60176ba..4386b9136f 100644 --- a/src/bearer/qnlaengine_win.cpp +++ b/src/bearer/qnlaengine_win.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/bearer/qnlaengine_win_p.h b/src/bearer/qnlaengine_win_p.h index 394b8cfdf2..ea3a2f3528 100644 --- a/src/bearer/qnlaengine_win_p.h +++ b/src/bearer/qnlaengine_win_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/bearer/qnmdbushelper.cpp b/src/bearer/qnmdbushelper.cpp index 4a1f9971d8..fd98f1575f 100644 --- a/src/bearer/qnmdbushelper.cpp +++ b/src/bearer/qnmdbushelper.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/bearer/qnmdbushelper_p.h b/src/bearer/qnmdbushelper_p.h index d527b68974..0e5e291638 100644 --- a/src/bearer/qnmdbushelper_p.h +++ b/src/bearer/qnmdbushelper_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/bearer/qnmwifiengine_unix.cpp b/src/bearer/qnmwifiengine_unix.cpp index ef133a8f3b..e15336b0aa 100644 --- a/src/bearer/qnmwifiengine_unix.cpp +++ b/src/bearer/qnmwifiengine_unix.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/bearer/qnmwifiengine_unix_p.h b/src/bearer/qnmwifiengine_unix_p.h index 164a8e513a..c4571d9af7 100644 --- a/src/bearer/qnmwifiengine_unix_p.h +++ b/src/bearer/qnmwifiengine_unix_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/details/qcontactaddress.h b/src/contacts/details/qcontactaddress.h index 41538baeb6..b30a8511fe 100644 --- a/src/contacts/details/qcontactaddress.h +++ b/src/contacts/details/qcontactaddress.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/details/qcontactanniversary.h b/src/contacts/details/qcontactanniversary.h index 11fa0b55ac..e30e2fbcac 100644 --- a/src/contacts/details/qcontactanniversary.h +++ b/src/contacts/details/qcontactanniversary.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/details/qcontactavatar.h b/src/contacts/details/qcontactavatar.h index 97891099f9..882e4e3e1a 100644 --- a/src/contacts/details/qcontactavatar.h +++ b/src/contacts/details/qcontactavatar.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/details/qcontactbirthday.h b/src/contacts/details/qcontactbirthday.h index 4aa250ec61..8b64f3e589 100644 --- a/src/contacts/details/qcontactbirthday.h +++ b/src/contacts/details/qcontactbirthday.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/details/qcontactdetails.cpp b/src/contacts/details/qcontactdetails.cpp index 609a20a362..64341e05c8 100644 --- a/src/contacts/details/qcontactdetails.cpp +++ b/src/contacts/details/qcontactdetails.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/details/qcontactdetails.h b/src/contacts/details/qcontactdetails.h index da7ac89c0f..504b5294ef 100644 --- a/src/contacts/details/qcontactdetails.h +++ b/src/contacts/details/qcontactdetails.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/details/qcontactdisplaylabel.h b/src/contacts/details/qcontactdisplaylabel.h index 7b2986db7b..0404424d89 100644 --- a/src/contacts/details/qcontactdisplaylabel.h +++ b/src/contacts/details/qcontactdisplaylabel.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/details/qcontactemailaddress.h b/src/contacts/details/qcontactemailaddress.h index 5fde1b3295..8f7b7208f4 100644 --- a/src/contacts/details/qcontactemailaddress.h +++ b/src/contacts/details/qcontactemailaddress.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/details/qcontactfamily.h b/src/contacts/details/qcontactfamily.h index 5df55aa456..2e0f628e61 100644 --- a/src/contacts/details/qcontactfamily.h +++ b/src/contacts/details/qcontactfamily.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/details/qcontactgender.h b/src/contacts/details/qcontactgender.h index 32077da33d..7292e619b0 100644 --- a/src/contacts/details/qcontactgender.h +++ b/src/contacts/details/qcontactgender.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/details/qcontactgeolocation.h b/src/contacts/details/qcontactgeolocation.h index 016ebabcca..2fd8957914 100644 --- a/src/contacts/details/qcontactgeolocation.h +++ b/src/contacts/details/qcontactgeolocation.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/details/qcontactglobalpresence.h b/src/contacts/details/qcontactglobalpresence.h index b32cd7ee88..6ffd8990c3 100644 --- a/src/contacts/details/qcontactglobalpresence.h +++ b/src/contacts/details/qcontactglobalpresence.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/details/qcontactguid.h b/src/contacts/details/qcontactguid.h index ad037af14e..15bc2ed2dc 100644 --- a/src/contacts/details/qcontactguid.h +++ b/src/contacts/details/qcontactguid.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/details/qcontactname.h b/src/contacts/details/qcontactname.h index fd2a2d37b6..a7d2920b7e 100644 --- a/src/contacts/details/qcontactname.h +++ b/src/contacts/details/qcontactname.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/details/qcontactnickname.h b/src/contacts/details/qcontactnickname.h index 57d42ceb66..8e9d656686 100644 --- a/src/contacts/details/qcontactnickname.h +++ b/src/contacts/details/qcontactnickname.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/details/qcontactnote.h b/src/contacts/details/qcontactnote.h index 7a9fc96bc1..29ebfb8905 100644 --- a/src/contacts/details/qcontactnote.h +++ b/src/contacts/details/qcontactnote.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/details/qcontactonlineaccount.h b/src/contacts/details/qcontactonlineaccount.h index 73c33323f1..f6c0aaa31b 100644 --- a/src/contacts/details/qcontactonlineaccount.h +++ b/src/contacts/details/qcontactonlineaccount.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/details/qcontactorganization.h b/src/contacts/details/qcontactorganization.h index bb4cd08dd5..1f362f89f9 100644 --- a/src/contacts/details/qcontactorganization.h +++ b/src/contacts/details/qcontactorganization.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/details/qcontactphonenumber.h b/src/contacts/details/qcontactphonenumber.h index 3a89fdf340..14e526d785 100644 --- a/src/contacts/details/qcontactphonenumber.h +++ b/src/contacts/details/qcontactphonenumber.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/details/qcontactpresence.h b/src/contacts/details/qcontactpresence.h index 6373081565..97e99b6e94 100644 --- a/src/contacts/details/qcontactpresence.h +++ b/src/contacts/details/qcontactpresence.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/details/qcontactringtone.h b/src/contacts/details/qcontactringtone.h index 699a76b223..001d371633 100644 --- a/src/contacts/details/qcontactringtone.h +++ b/src/contacts/details/qcontactringtone.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/details/qcontactsynctarget.h b/src/contacts/details/qcontactsynctarget.h index 03466ddd43..562fcfdaa4 100644 --- a/src/contacts/details/qcontactsynctarget.h +++ b/src/contacts/details/qcontactsynctarget.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/details/qcontactthumbnail.h b/src/contacts/details/qcontactthumbnail.h index a424f61320..ae141eb924 100644 --- a/src/contacts/details/qcontactthumbnail.h +++ b/src/contacts/details/qcontactthumbnail.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/details/qcontacttimestamp.h b/src/contacts/details/qcontacttimestamp.h index 28059e2a89..3258a8e8c1 100644 --- a/src/contacts/details/qcontacttimestamp.h +++ b/src/contacts/details/qcontacttimestamp.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/details/qcontacttype.h b/src/contacts/details/qcontacttype.h index a290a0a0ae..b2d8cb9098 100644 --- a/src/contacts/details/qcontacttype.h +++ b/src/contacts/details/qcontacttype.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/details/qcontacturl.h b/src/contacts/details/qcontacturl.h index afedce561e..d4452e4a09 100644 --- a/src/contacts/details/qcontacturl.h +++ b/src/contacts/details/qcontacturl.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/engines/qcontactinvalidbackend.cpp b/src/contacts/engines/qcontactinvalidbackend.cpp index 673845bbf0..cf9552c03c 100644 --- a/src/contacts/engines/qcontactinvalidbackend.cpp +++ b/src/contacts/engines/qcontactinvalidbackend.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/engines/qcontactinvalidbackend_p.h b/src/contacts/engines/qcontactinvalidbackend_p.h index a2354e6462..dfba7d1b7d 100644 --- a/src/contacts/engines/qcontactinvalidbackend_p.h +++ b/src/contacts/engines/qcontactinvalidbackend_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/engines/qcontactmemorybackend.cpp b/src/contacts/engines/qcontactmemorybackend.cpp index 5d1b90e38f..882a1bb0f3 100644 --- a/src/contacts/engines/qcontactmemorybackend.cpp +++ b/src/contacts/engines/qcontactmemorybackend.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/engines/qcontactmemorybackend_p.h b/src/contacts/engines/qcontactmemorybackend_p.h index 424e06a84d..fafdbee6cd 100644 --- a/src/contacts/engines/qcontactmemorybackend_p.h +++ b/src/contacts/engines/qcontactmemorybackend_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/filters/qcontactchangelogfilter.cpp b/src/contacts/filters/qcontactchangelogfilter.cpp index 141eb9572a..4216d057ff 100644 --- a/src/contacts/filters/qcontactchangelogfilter.cpp +++ b/src/contacts/filters/qcontactchangelogfilter.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/filters/qcontactchangelogfilter.h b/src/contacts/filters/qcontactchangelogfilter.h index 53d92f9f42..bd89db94f5 100644 --- a/src/contacts/filters/qcontactchangelogfilter.h +++ b/src/contacts/filters/qcontactchangelogfilter.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/filters/qcontactchangelogfilter_p.h b/src/contacts/filters/qcontactchangelogfilter_p.h index 4b28aad1fa..7722e8ea36 100644 --- a/src/contacts/filters/qcontactchangelogfilter_p.h +++ b/src/contacts/filters/qcontactchangelogfilter_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/filters/qcontactdetailfilter.cpp b/src/contacts/filters/qcontactdetailfilter.cpp index af7a3a3585..c1ff3c1a85 100644 --- a/src/contacts/filters/qcontactdetailfilter.cpp +++ b/src/contacts/filters/qcontactdetailfilter.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/filters/qcontactdetailfilter.h b/src/contacts/filters/qcontactdetailfilter.h index 64a6c8185c..8dc74df023 100644 --- a/src/contacts/filters/qcontactdetailfilter.h +++ b/src/contacts/filters/qcontactdetailfilter.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/filters/qcontactdetailfilter_p.h b/src/contacts/filters/qcontactdetailfilter_p.h index 725183016d..cca7274e9b 100644 --- a/src/contacts/filters/qcontactdetailfilter_p.h +++ b/src/contacts/filters/qcontactdetailfilter_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/filters/qcontactdetailrangefilter.cpp b/src/contacts/filters/qcontactdetailrangefilter.cpp index 3f20b5d882..e8780b7a57 100644 --- a/src/contacts/filters/qcontactdetailrangefilter.cpp +++ b/src/contacts/filters/qcontactdetailrangefilter.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/filters/qcontactdetailrangefilter.h b/src/contacts/filters/qcontactdetailrangefilter.h index 2101c5ea7b..6dfd85dce7 100644 --- a/src/contacts/filters/qcontactdetailrangefilter.h +++ b/src/contacts/filters/qcontactdetailrangefilter.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/filters/qcontactdetailrangefilter_p.h b/src/contacts/filters/qcontactdetailrangefilter_p.h index b582844b98..8bde2cfe7f 100644 --- a/src/contacts/filters/qcontactdetailrangefilter_p.h +++ b/src/contacts/filters/qcontactdetailrangefilter_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/filters/qcontactfilters.h b/src/contacts/filters/qcontactfilters.h index 3378bba93a..5fdf1e6689 100644 --- a/src/contacts/filters/qcontactfilters.h +++ b/src/contacts/filters/qcontactfilters.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/filters/qcontactintersectionfilter.cpp b/src/contacts/filters/qcontactintersectionfilter.cpp index 67dccd5c7a..9ebce85a1d 100644 --- a/src/contacts/filters/qcontactintersectionfilter.cpp +++ b/src/contacts/filters/qcontactintersectionfilter.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/filters/qcontactintersectionfilter.h b/src/contacts/filters/qcontactintersectionfilter.h index b53d7a4f54..9b205ae01f 100644 --- a/src/contacts/filters/qcontactintersectionfilter.h +++ b/src/contacts/filters/qcontactintersectionfilter.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/filters/qcontactintersectionfilter_p.h b/src/contacts/filters/qcontactintersectionfilter_p.h index c27b3197b6..5e3c751eea 100644 --- a/src/contacts/filters/qcontactintersectionfilter_p.h +++ b/src/contacts/filters/qcontactintersectionfilter_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/filters/qcontactinvalidfilter.cpp b/src/contacts/filters/qcontactinvalidfilter.cpp index 3216b48053..d3515da154 100644 --- a/src/contacts/filters/qcontactinvalidfilter.cpp +++ b/src/contacts/filters/qcontactinvalidfilter.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/filters/qcontactinvalidfilter.h b/src/contacts/filters/qcontactinvalidfilter.h index 899c3c89c7..7eaf862d3f 100644 --- a/src/contacts/filters/qcontactinvalidfilter.h +++ b/src/contacts/filters/qcontactinvalidfilter.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/filters/qcontactlocalidfilter.cpp b/src/contacts/filters/qcontactlocalidfilter.cpp index 854c1f6db8..0a918c9a4a 100644 --- a/src/contacts/filters/qcontactlocalidfilter.cpp +++ b/src/contacts/filters/qcontactlocalidfilter.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/filters/qcontactlocalidfilter.h b/src/contacts/filters/qcontactlocalidfilter.h index 7aff186363..0cf2bb8dca 100644 --- a/src/contacts/filters/qcontactlocalidfilter.h +++ b/src/contacts/filters/qcontactlocalidfilter.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/filters/qcontactlocalidfilter_p.h b/src/contacts/filters/qcontactlocalidfilter_p.h index 25ea7c15e7..dfd6b6f610 100644 --- a/src/contacts/filters/qcontactlocalidfilter_p.h +++ b/src/contacts/filters/qcontactlocalidfilter_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/filters/qcontactrelationshipfilter.cpp b/src/contacts/filters/qcontactrelationshipfilter.cpp index 51a31de165..3d35395b88 100644 --- a/src/contacts/filters/qcontactrelationshipfilter.cpp +++ b/src/contacts/filters/qcontactrelationshipfilter.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/filters/qcontactrelationshipfilter.h b/src/contacts/filters/qcontactrelationshipfilter.h index 0380e55c8f..1bd392d97e 100644 --- a/src/contacts/filters/qcontactrelationshipfilter.h +++ b/src/contacts/filters/qcontactrelationshipfilter.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/filters/qcontactrelationshipfilter_p.h b/src/contacts/filters/qcontactrelationshipfilter_p.h index 5372e4a030..e67fa281e2 100644 --- a/src/contacts/filters/qcontactrelationshipfilter_p.h +++ b/src/contacts/filters/qcontactrelationshipfilter_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/filters/qcontactunionfilter.cpp b/src/contacts/filters/qcontactunionfilter.cpp index bf45f7fd45..84aa4c327b 100644 --- a/src/contacts/filters/qcontactunionfilter.cpp +++ b/src/contacts/filters/qcontactunionfilter.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/filters/qcontactunionfilter.h b/src/contacts/filters/qcontactunionfilter.h index f69e4fb313..46aaca2d03 100644 --- a/src/contacts/filters/qcontactunionfilter.h +++ b/src/contacts/filters/qcontactunionfilter.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/filters/qcontactunionfilter_p.h b/src/contacts/filters/qcontactunionfilter_p.h index c412d51dcb..9eca4a691d 100644 --- a/src/contacts/filters/qcontactunionfilter_p.h +++ b/src/contacts/filters/qcontactunionfilter_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/qcontact.cpp b/src/contacts/qcontact.cpp index 1a2cab6c02..317821fbae 100644 --- a/src/contacts/qcontact.cpp +++ b/src/contacts/qcontact.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/qcontact.h b/src/contacts/qcontact.h index b2cf4830ce..9780ef03e0 100644 --- a/src/contacts/qcontact.h +++ b/src/contacts/qcontact.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/qcontact_p.h b/src/contacts/qcontact_p.h index 4d14f511fc..fd864485a8 100644 --- a/src/contacts/qcontact_p.h +++ b/src/contacts/qcontact_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/qcontactabstractrequest.cpp b/src/contacts/qcontactabstractrequest.cpp index 66d0f59215..39f9b8acff 100644 --- a/src/contacts/qcontactabstractrequest.cpp +++ b/src/contacts/qcontactabstractrequest.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/qcontactabstractrequest.h b/src/contacts/qcontactabstractrequest.h index 637c22b922..d23cb9e568 100644 --- a/src/contacts/qcontactabstractrequest.h +++ b/src/contacts/qcontactabstractrequest.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/qcontactabstractrequest_p.h b/src/contacts/qcontactabstractrequest_p.h index b32b22899e..4af4a95e70 100644 --- a/src/contacts/qcontactabstractrequest_p.h +++ b/src/contacts/qcontactabstractrequest_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/qcontactchangeset.cpp b/src/contacts/qcontactchangeset.cpp index 5e5fe5ac86..0c94239ae7 100644 --- a/src/contacts/qcontactchangeset.cpp +++ b/src/contacts/qcontactchangeset.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/qcontactchangeset.h b/src/contacts/qcontactchangeset.h index aa716cbd62..c3162bf2b2 100644 --- a/src/contacts/qcontactchangeset.h +++ b/src/contacts/qcontactchangeset.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/qcontactchangeset_p.h b/src/contacts/qcontactchangeset_p.h index 08ecc79950..4f2f41e425 100644 --- a/src/contacts/qcontactchangeset_p.h +++ b/src/contacts/qcontactchangeset_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/qcontactdetail.cpp b/src/contacts/qcontactdetail.cpp index d25250b10e..5ef476b306 100644 --- a/src/contacts/qcontactdetail.cpp +++ b/src/contacts/qcontactdetail.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/qcontactdetail.h b/src/contacts/qcontactdetail.h index 84fbf03dcb..e42e3456cb 100644 --- a/src/contacts/qcontactdetail.h +++ b/src/contacts/qcontactdetail.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/qcontactdetail_p.h b/src/contacts/qcontactdetail_p.h index 867f34a831..3bf8f98d6e 100644 --- a/src/contacts/qcontactdetail_p.h +++ b/src/contacts/qcontactdetail_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/qcontactdetaildefinition.cpp b/src/contacts/qcontactdetaildefinition.cpp index 51797701bc..9e608a38f1 100644 --- a/src/contacts/qcontactdetaildefinition.cpp +++ b/src/contacts/qcontactdetaildefinition.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/qcontactdetaildefinition.h b/src/contacts/qcontactdetaildefinition.h index 0f8eb630b5..005c0030ba 100644 --- a/src/contacts/qcontactdetaildefinition.h +++ b/src/contacts/qcontactdetaildefinition.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/qcontactdetaildefinition_p.h b/src/contacts/qcontactdetaildefinition_p.h index 3607e4fb97..909f9687d5 100644 --- a/src/contacts/qcontactdetaildefinition_p.h +++ b/src/contacts/qcontactdetaildefinition_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/qcontactdetailfielddefinition.cpp b/src/contacts/qcontactdetailfielddefinition.cpp index 52456c58c0..bfad66871b 100644 --- a/src/contacts/qcontactdetailfielddefinition.cpp +++ b/src/contacts/qcontactdetailfielddefinition.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/qcontactdetailfielddefinition.h b/src/contacts/qcontactdetailfielddefinition.h index 541893eca5..aaf2e2853d 100644 --- a/src/contacts/qcontactdetailfielddefinition.h +++ b/src/contacts/qcontactdetailfielddefinition.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/qcontactdetailfielddefinition_p.h b/src/contacts/qcontactdetailfielddefinition_p.h index dccc871ce8..84fe648692 100644 --- a/src/contacts/qcontactdetailfielddefinition_p.h +++ b/src/contacts/qcontactdetailfielddefinition_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/qcontactfetchhint.cpp b/src/contacts/qcontactfetchhint.cpp index b633ad59ff..1c950b69fb 100644 --- a/src/contacts/qcontactfetchhint.cpp +++ b/src/contacts/qcontactfetchhint.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/qcontactfetchhint.h b/src/contacts/qcontactfetchhint.h index 044d6e4e69..a9e4f53021 100644 --- a/src/contacts/qcontactfetchhint.h +++ b/src/contacts/qcontactfetchhint.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/qcontactfetchhint_p.h b/src/contacts/qcontactfetchhint_p.h index d88a4a2a85..4f6f1e3e2d 100644 --- a/src/contacts/qcontactfetchhint_p.h +++ b/src/contacts/qcontactfetchhint_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/qcontactfilter.cpp b/src/contacts/qcontactfilter.cpp index de844cec0d..e04e3f6a14 100644 --- a/src/contacts/qcontactfilter.cpp +++ b/src/contacts/qcontactfilter.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/qcontactfilter.h b/src/contacts/qcontactfilter.h index 9c136813f0..158a405425 100644 --- a/src/contacts/qcontactfilter.h +++ b/src/contacts/qcontactfilter.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/qcontactfilter_p.h b/src/contacts/qcontactfilter_p.h index 58e14ff89b..e38c269ce9 100644 --- a/src/contacts/qcontactfilter_p.h +++ b/src/contacts/qcontactfilter_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/qcontactid.cpp b/src/contacts/qcontactid.cpp index 629a09b155..0d9002196e 100644 --- a/src/contacts/qcontactid.cpp +++ b/src/contacts/qcontactid.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/qcontactid.h b/src/contacts/qcontactid.h index dbad4cffc3..a229eb903c 100644 --- a/src/contacts/qcontactid.h +++ b/src/contacts/qcontactid.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/qcontactid_p.h b/src/contacts/qcontactid_p.h index b6a56c1c2c..5f847e97f8 100644 --- a/src/contacts/qcontactid_p.h +++ b/src/contacts/qcontactid_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/qcontactmanager.cpp b/src/contacts/qcontactmanager.cpp index a3c680b370..e965ea117b 100644 --- a/src/contacts/qcontactmanager.cpp +++ b/src/contacts/qcontactmanager.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/qcontactmanager.h b/src/contacts/qcontactmanager.h index e40524eec0..cd07d666a0 100644 --- a/src/contacts/qcontactmanager.h +++ b/src/contacts/qcontactmanager.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/qcontactmanager_p.cpp b/src/contacts/qcontactmanager_p.cpp index aa3d2eea81..358e4b2973 100644 --- a/src/contacts/qcontactmanager_p.cpp +++ b/src/contacts/qcontactmanager_p.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/qcontactmanager_p.h b/src/contacts/qcontactmanager_p.h index 3717d6b31e..d23d54449e 100644 --- a/src/contacts/qcontactmanager_p.h +++ b/src/contacts/qcontactmanager_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/qcontactmanagerengine.cpp b/src/contacts/qcontactmanagerengine.cpp index 61bf11e4e1..e3c3f7720b 100644 --- a/src/contacts/qcontactmanagerengine.cpp +++ b/src/contacts/qcontactmanagerengine.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/qcontactmanagerengine.h b/src/contacts/qcontactmanagerengine.h index e7335a6219..a894ed7505 100644 --- a/src/contacts/qcontactmanagerengine.h +++ b/src/contacts/qcontactmanagerengine.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/qcontactmanagerenginefactory.cpp b/src/contacts/qcontactmanagerenginefactory.cpp index a5e6f64d4a..cf01278e34 100644 --- a/src/contacts/qcontactmanagerenginefactory.cpp +++ b/src/contacts/qcontactmanagerenginefactory.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/qcontactmanagerenginefactory.h b/src/contacts/qcontactmanagerenginefactory.h index d964c1fc11..9801b96013 100644 --- a/src/contacts/qcontactmanagerenginefactory.h +++ b/src/contacts/qcontactmanagerenginefactory.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/qcontactrelationship.cpp b/src/contacts/qcontactrelationship.cpp index 1c9113c3c5..97eda5d7ec 100644 --- a/src/contacts/qcontactrelationship.cpp +++ b/src/contacts/qcontactrelationship.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/qcontactrelationship.h b/src/contacts/qcontactrelationship.h index d4226fa2aa..a0aed12520 100644 --- a/src/contacts/qcontactrelationship.h +++ b/src/contacts/qcontactrelationship.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/qcontactrelationship_p.h b/src/contacts/qcontactrelationship_p.h index 57d4136429..7fd66513b9 100644 --- a/src/contacts/qcontactrelationship_p.h +++ b/src/contacts/qcontactrelationship_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/qcontactsortorder.cpp b/src/contacts/qcontactsortorder.cpp index 05834a83a2..749f536111 100644 --- a/src/contacts/qcontactsortorder.cpp +++ b/src/contacts/qcontactsortorder.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/qcontactsortorder.h b/src/contacts/qcontactsortorder.h index 2b2dba2e6b..e0e251fca8 100644 --- a/src/contacts/qcontactsortorder.h +++ b/src/contacts/qcontactsortorder.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/qcontactsortorder_p.h b/src/contacts/qcontactsortorder_p.h index 80a51762bc..de009960b2 100644 --- a/src/contacts/qcontactsortorder_p.h +++ b/src/contacts/qcontactsortorder_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/qtcontacts.h b/src/contacts/qtcontacts.h index 11c4d59d2f..c2d06ce37a 100644 --- a/src/contacts/qtcontacts.h +++ b/src/contacts/qtcontacts.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/qtcontactsglobal.h b/src/contacts/qtcontactsglobal.h index 5fe4749e69..3e63a03dcc 100644 --- a/src/contacts/qtcontactsglobal.h +++ b/src/contacts/qtcontactsglobal.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/requests/qcontactdetaildefinitionfetchrequest.cpp b/src/contacts/requests/qcontactdetaildefinitionfetchrequest.cpp index 8e64f47d23..8f467652ed 100644 --- a/src/contacts/requests/qcontactdetaildefinitionfetchrequest.cpp +++ b/src/contacts/requests/qcontactdetaildefinitionfetchrequest.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/requests/qcontactdetaildefinitionfetchrequest.h b/src/contacts/requests/qcontactdetaildefinitionfetchrequest.h index 63089b6ecf..2316ff6079 100644 --- a/src/contacts/requests/qcontactdetaildefinitionfetchrequest.h +++ b/src/contacts/requests/qcontactdetaildefinitionfetchrequest.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/requests/qcontactdetaildefinitionremoverequest.cpp b/src/contacts/requests/qcontactdetaildefinitionremoverequest.cpp index a60b4a7eab..577f77d77c 100644 --- a/src/contacts/requests/qcontactdetaildefinitionremoverequest.cpp +++ b/src/contacts/requests/qcontactdetaildefinitionremoverequest.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/requests/qcontactdetaildefinitionremoverequest.h b/src/contacts/requests/qcontactdetaildefinitionremoverequest.h index b74b51ffb9..e6879df40d 100644 --- a/src/contacts/requests/qcontactdetaildefinitionremoverequest.h +++ b/src/contacts/requests/qcontactdetaildefinitionremoverequest.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/requests/qcontactdetaildefinitionsaverequest.cpp b/src/contacts/requests/qcontactdetaildefinitionsaverequest.cpp index aaf1dc8f92..1a81ece4f1 100644 --- a/src/contacts/requests/qcontactdetaildefinitionsaverequest.cpp +++ b/src/contacts/requests/qcontactdetaildefinitionsaverequest.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/requests/qcontactdetaildefinitionsaverequest.h b/src/contacts/requests/qcontactdetaildefinitionsaverequest.h index ea695a1443..f5c9e21f96 100644 --- a/src/contacts/requests/qcontactdetaildefinitionsaverequest.h +++ b/src/contacts/requests/qcontactdetaildefinitionsaverequest.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/requests/qcontactfetchrequest.cpp b/src/contacts/requests/qcontactfetchrequest.cpp index 5ed347335a..446e4032ba 100644 --- a/src/contacts/requests/qcontactfetchrequest.cpp +++ b/src/contacts/requests/qcontactfetchrequest.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/requests/qcontactfetchrequest.h b/src/contacts/requests/qcontactfetchrequest.h index 5ab2b1d480..4cc67dadb6 100644 --- a/src/contacts/requests/qcontactfetchrequest.h +++ b/src/contacts/requests/qcontactfetchrequest.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/requests/qcontactlocalidfetchrequest.cpp b/src/contacts/requests/qcontactlocalidfetchrequest.cpp index fef8a14aad..6a8533155b 100644 --- a/src/contacts/requests/qcontactlocalidfetchrequest.cpp +++ b/src/contacts/requests/qcontactlocalidfetchrequest.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/requests/qcontactlocalidfetchrequest.h b/src/contacts/requests/qcontactlocalidfetchrequest.h index b65e4c862b..1ebabe430c 100644 --- a/src/contacts/requests/qcontactlocalidfetchrequest.h +++ b/src/contacts/requests/qcontactlocalidfetchrequest.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/requests/qcontactrelationshipfetchrequest.cpp b/src/contacts/requests/qcontactrelationshipfetchrequest.cpp index d904f2b489..0675b1054b 100644 --- a/src/contacts/requests/qcontactrelationshipfetchrequest.cpp +++ b/src/contacts/requests/qcontactrelationshipfetchrequest.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/requests/qcontactrelationshipfetchrequest.h b/src/contacts/requests/qcontactrelationshipfetchrequest.h index 0b02a67a0f..b86f6ff372 100644 --- a/src/contacts/requests/qcontactrelationshipfetchrequest.h +++ b/src/contacts/requests/qcontactrelationshipfetchrequest.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/requests/qcontactrelationshipremoverequest.cpp b/src/contacts/requests/qcontactrelationshipremoverequest.cpp index 96997de1fb..3754d95d44 100644 --- a/src/contacts/requests/qcontactrelationshipremoverequest.cpp +++ b/src/contacts/requests/qcontactrelationshipremoverequest.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/requests/qcontactrelationshipremoverequest.h b/src/contacts/requests/qcontactrelationshipremoverequest.h index e02e2022cb..8e9fbccaa5 100644 --- a/src/contacts/requests/qcontactrelationshipremoverequest.h +++ b/src/contacts/requests/qcontactrelationshipremoverequest.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/requests/qcontactrelationshipsaverequest.cpp b/src/contacts/requests/qcontactrelationshipsaverequest.cpp index 0ea60accf3..2635426754 100644 --- a/src/contacts/requests/qcontactrelationshipsaverequest.cpp +++ b/src/contacts/requests/qcontactrelationshipsaverequest.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/requests/qcontactrelationshipsaverequest.h b/src/contacts/requests/qcontactrelationshipsaverequest.h index 532f389302..f6358910b0 100644 --- a/src/contacts/requests/qcontactrelationshipsaverequest.h +++ b/src/contacts/requests/qcontactrelationshipsaverequest.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/requests/qcontactremoverequest.cpp b/src/contacts/requests/qcontactremoverequest.cpp index 2ccd1f4fb6..ca6f775757 100644 --- a/src/contacts/requests/qcontactremoverequest.cpp +++ b/src/contacts/requests/qcontactremoverequest.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/requests/qcontactremoverequest.h b/src/contacts/requests/qcontactremoverequest.h index 6ae080dbef..cfab8b6706 100644 --- a/src/contacts/requests/qcontactremoverequest.h +++ b/src/contacts/requests/qcontactremoverequest.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/requests/qcontactrequests.h b/src/contacts/requests/qcontactrequests.h index db6a5051cf..25890c5e1e 100644 --- a/src/contacts/requests/qcontactrequests.h +++ b/src/contacts/requests/qcontactrequests.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/requests/qcontactrequests_p.h b/src/contacts/requests/qcontactrequests_p.h index 4ce9962258..5fb2f99dca 100644 --- a/src/contacts/requests/qcontactrequests_p.h +++ b/src/contacts/requests/qcontactrequests_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/requests/qcontactsaverequest.cpp b/src/contacts/requests/qcontactsaverequest.cpp index 99b1abce78..d0f61932cb 100644 --- a/src/contacts/requests/qcontactsaverequest.cpp +++ b/src/contacts/requests/qcontactsaverequest.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/contacts/requests/qcontactsaverequest.h b/src/contacts/requests/qcontactsaverequest.h index 2e0a39278b..99a97191cf 100644 --- a/src/contacts/requests/qcontactsaverequest.h +++ b/src/contacts/requests/qcontactsaverequest.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/global/qmobilityglobal.h b/src/global/qmobilityglobal.h index aeb263b47d..bd5cf5a68a 100644 --- a/src/global/qmobilityglobal.h +++ b/src/global/qmobilityglobal.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -42,13 +42,13 @@ #define QMOBILITYGLOBAL_H -#define QTM_VERSION_STR "1.0.0" +#define QTM_VERSION_STR "1.1.0" /* QTM_VERSION is (major << 16) + (minor << 8) + patch. */ -#define QTM_VERSION 0x010000 +#define QTM_VERSION 0x010100 /* - can be used like #if (QTM_VERSION >= QTM_VERSION_CHECK(1, 0, 0)) + can be used like #if (QTM_VERSION >= QTM_VERSION_CHECK(1, 1, 0)) */ #define QTM_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch)) diff --git a/src/global/qmobilitypluginsearch.h b/src/global/qmobilitypluginsearch.h index fb512c7eb9..81efe37a94 100644 --- a/src/global/qmobilitypluginsearch.h +++ b/src/global/qmobilitypluginsearch.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/location/dbuscomm_maemo.cpp b/src/location/dbuscomm_maemo.cpp index 10f147b2a4..ec045f4651 100644 --- a/src/location/dbuscomm_maemo.cpp +++ b/src/location/dbuscomm_maemo.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/location/dbuscomm_maemo_p.h b/src/location/dbuscomm_maemo_p.h index 4fbdee621e..be45fa98e0 100644 --- a/src/location/dbuscomm_maemo_p.h +++ b/src/location/dbuscomm_maemo_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/location/dbusserver_maemo.cpp b/src/location/dbusserver_maemo.cpp index 0c94550fbd..24a9a09044 100644 --- a/src/location/dbusserver_maemo.cpp +++ b/src/location/dbusserver_maemo.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/location/dbusserver_maemo_p.h b/src/location/dbusserver_maemo_p.h index 171e324b44..fa534a9413 100644 --- a/src/location/dbusserver_maemo_p.h +++ b/src/location/dbusserver_maemo_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/location/liblocationwrapper.cpp b/src/location/liblocationwrapper.cpp index 192390a6be..c811e501e3 100644 --- a/src/location/liblocationwrapper.cpp +++ b/src/location/liblocationwrapper.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/location/liblocationwrapper_p.h b/src/location/liblocationwrapper_p.h index 10e8aaac50..1c5e34a77c 100644 --- a/src/location/liblocationwrapper_p.h +++ b/src/location/liblocationwrapper_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/location/notificationcallback_s60_p.h b/src/location/notificationcallback_s60_p.h index 9ee8dd94bc..fd357330c4 100644 --- a/src/location/notificationcallback_s60_p.h +++ b/src/location/notificationcallback_s60_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/location/notificationmonitorcallback_s60_p.h b/src/location/notificationmonitorcallback_s60_p.h index a919e584a3..42bc1dc37e 100644 --- a/src/location/notificationmonitorcallback_s60_p.h +++ b/src/location/notificationmonitorcallback_s60_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/location/notificationsatellitecallback_s60_p.h b/src/location/notificationsatellitecallback_s60_p.h index db03c9b415..dda8922a1e 100644 --- a/src/location/notificationsatellitecallback_s60_p.h +++ b/src/location/notificationsatellitecallback_s60_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/location/qgeoareamonitor.cpp b/src/location/qgeoareamonitor.cpp index edf66d7a27..331bdfcbfb 100644 --- a/src/location/qgeoareamonitor.cpp +++ b/src/location/qgeoareamonitor.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/location/qgeoareamonitor.h b/src/location/qgeoareamonitor.h index fda59291ce..54737f6859 100644 --- a/src/location/qgeoareamonitor.h +++ b/src/location/qgeoareamonitor.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/location/qgeoareamonitor_maemo.cpp b/src/location/qgeoareamonitor_maemo.cpp index 9caab6c83b..f210c345e6 100644 --- a/src/location/qgeoareamonitor_maemo.cpp +++ b/src/location/qgeoareamonitor_maemo.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/location/qgeoareamonitor_maemo_p.h b/src/location/qgeoareamonitor_maemo_p.h index 33e055dc94..7e9692ddbe 100644 --- a/src/location/qgeoareamonitor_maemo_p.h +++ b/src/location/qgeoareamonitor_maemo_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/location/qgeoareamonitor_s60.cpp b/src/location/qgeoareamonitor_s60.cpp index fde8cc1cc1..353366f82a 100644 --- a/src/location/qgeoareamonitor_s60.cpp +++ b/src/location/qgeoareamonitor_s60.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/location/qgeoareamonitor_s60_p.h b/src/location/qgeoareamonitor_s60_p.h index a2d75d6984..a2be5d3571 100644 --- a/src/location/qgeoareamonitor_s60_p.h +++ b/src/location/qgeoareamonitor_s60_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/location/qgeocoordinate.cpp b/src/location/qgeocoordinate.cpp index 4df934627b..57831a87f3 100644 --- a/src/location/qgeocoordinate.cpp +++ b/src/location/qgeocoordinate.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/location/qgeocoordinate.h b/src/location/qgeocoordinate.h index 9a4902a0b8..97764a38ba 100644 --- a/src/location/qgeocoordinate.h +++ b/src/location/qgeocoordinate.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/location/qgeoinfothread_wince.cpp b/src/location/qgeoinfothread_wince.cpp index f27b376c38..84bf3ef225 100644 --- a/src/location/qgeoinfothread_wince.cpp +++ b/src/location/qgeoinfothread_wince.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/location/qgeoinfothread_wince_p.h b/src/location/qgeoinfothread_wince_p.h index c6782cb8e5..49f1b76b4f 100644 --- a/src/location/qgeoinfothread_wince_p.h +++ b/src/location/qgeoinfothread_wince_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/location/qgeopositioninfo.cpp b/src/location/qgeopositioninfo.cpp index c8ed15aacb..b4c262a1e0 100644 --- a/src/location/qgeopositioninfo.cpp +++ b/src/location/qgeopositioninfo.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/location/qgeopositioninfo.h b/src/location/qgeopositioninfo.h index 52cf78d241..79ef9ad127 100644 --- a/src/location/qgeopositioninfo.h +++ b/src/location/qgeopositioninfo.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/location/qgeopositioninfosource.cpp b/src/location/qgeopositioninfosource.cpp index 20b61bfcdf..b59038c99d 100644 --- a/src/location/qgeopositioninfosource.cpp +++ b/src/location/qgeopositioninfosource.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/location/qgeopositioninfosource.h b/src/location/qgeopositioninfosource.h index 359302d1ce..a3e447deb6 100644 --- a/src/location/qgeopositioninfosource.h +++ b/src/location/qgeopositioninfosource.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/location/qgeopositioninfosource_maemo.cpp b/src/location/qgeopositioninfosource_maemo.cpp index dd190b70e6..7f94d360ff 100644 --- a/src/location/qgeopositioninfosource_maemo.cpp +++ b/src/location/qgeopositioninfosource_maemo.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/location/qgeopositioninfosource_maemo5.cpp b/src/location/qgeopositioninfosource_maemo5.cpp index 14bf301c9e..f1b70b168d 100644 --- a/src/location/qgeopositioninfosource_maemo5.cpp +++ b/src/location/qgeopositioninfosource_maemo5.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/location/qgeopositioninfosource_maemo5_p.h b/src/location/qgeopositioninfosource_maemo5_p.h index fbe42e92bc..a47e63e2ae 100644 --- a/src/location/qgeopositioninfosource_maemo5_p.h +++ b/src/location/qgeopositioninfosource_maemo5_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/location/qgeopositioninfosource_maemo_p.h b/src/location/qgeopositioninfosource_maemo_p.h index 5bc06749f7..4e70f3e0b1 100644 --- a/src/location/qgeopositioninfosource_maemo_p.h +++ b/src/location/qgeopositioninfosource_maemo_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/location/qgeopositioninfosource_s60.cpp b/src/location/qgeopositioninfosource_s60.cpp index 12f120bd3a..ba5180eeac 100644 --- a/src/location/qgeopositioninfosource_s60.cpp +++ b/src/location/qgeopositioninfosource_s60.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/location/qgeopositioninfosource_s60_p.h b/src/location/qgeopositioninfosource_s60_p.h index cd84bda171..19196aa787 100644 --- a/src/location/qgeopositioninfosource_s60_p.h +++ b/src/location/qgeopositioninfosource_s60_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/location/qgeopositioninfosource_wince.cpp b/src/location/qgeopositioninfosource_wince.cpp index 98cfd5ae24..19451e60a5 100644 --- a/src/location/qgeopositioninfosource_wince.cpp +++ b/src/location/qgeopositioninfosource_wince.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/location/qgeopositioninfosource_wince_p.h b/src/location/qgeopositioninfosource_wince_p.h index b365a06424..c3da32a57d 100644 --- a/src/location/qgeopositioninfosource_wince_p.h +++ b/src/location/qgeopositioninfosource_wince_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/location/qgeosatelliteinfo.cpp b/src/location/qgeosatelliteinfo.cpp index 08233ac7e8..eb00aaf079 100644 --- a/src/location/qgeosatelliteinfo.cpp +++ b/src/location/qgeosatelliteinfo.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/location/qgeosatelliteinfo.h b/src/location/qgeosatelliteinfo.h index b925731760..bce8dfb1d8 100644 --- a/src/location/qgeosatelliteinfo.h +++ b/src/location/qgeosatelliteinfo.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/location/qgeosatelliteinfosource.cpp b/src/location/qgeosatelliteinfosource.cpp index 376e6c0ab8..3e8fe511d1 100644 --- a/src/location/qgeosatelliteinfosource.cpp +++ b/src/location/qgeosatelliteinfosource.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/location/qgeosatelliteinfosource.h b/src/location/qgeosatelliteinfosource.h index c51f29c941..cdd16621b8 100644 --- a/src/location/qgeosatelliteinfosource.h +++ b/src/location/qgeosatelliteinfosource.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/location/qgeosatelliteinfosource_maemo.cpp b/src/location/qgeosatelliteinfosource_maemo.cpp index 3a848fb059..240650bedf 100644 --- a/src/location/qgeosatelliteinfosource_maemo.cpp +++ b/src/location/qgeosatelliteinfosource_maemo.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/location/qgeosatelliteinfosource_maemo5.cpp b/src/location/qgeosatelliteinfosource_maemo5.cpp index ea3bea5723..13a9f26cec 100644 --- a/src/location/qgeosatelliteinfosource_maemo5.cpp +++ b/src/location/qgeosatelliteinfosource_maemo5.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/location/qgeosatelliteinfosource_maemo5_p.h b/src/location/qgeosatelliteinfosource_maemo5_p.h index 9548ec6c32..0cb8be4e8f 100644 --- a/src/location/qgeosatelliteinfosource_maemo5_p.h +++ b/src/location/qgeosatelliteinfosource_maemo5_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/location/qgeosatelliteinfosource_maemo_p.h b/src/location/qgeosatelliteinfosource_maemo_p.h index f14e14cee8..0337300469 100644 --- a/src/location/qgeosatelliteinfosource_maemo_p.h +++ b/src/location/qgeosatelliteinfosource_maemo_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/location/qgeosatelliteinfosource_s60.cpp b/src/location/qgeosatelliteinfosource_s60.cpp index 2c28897a96..d3c07b9dfb 100644 --- a/src/location/qgeosatelliteinfosource_s60.cpp +++ b/src/location/qgeosatelliteinfosource_s60.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/location/qgeosatelliteinfosource_s60_p.h b/src/location/qgeosatelliteinfosource_s60_p.h index 2baf5b224a..3bfd07c5cd 100644 --- a/src/location/qgeosatelliteinfosource_s60_p.h +++ b/src/location/qgeosatelliteinfosource_s60_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/location/qgeosatelliteinfosource_wince.cpp b/src/location/qgeosatelliteinfosource_wince.cpp index e143598611..5b5ae48c09 100644 --- a/src/location/qgeosatelliteinfosource_wince.cpp +++ b/src/location/qgeosatelliteinfosource_wince.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/location/qgeosatelliteinfosource_wince_p.h b/src/location/qgeosatelliteinfosource_wince_p.h index bb3dc6ce7f..8fc1bd28c2 100644 --- a/src/location/qgeosatelliteinfosource_wince_p.h +++ b/src/location/qgeosatelliteinfosource_wince_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/location/qlocationutils.cpp b/src/location/qlocationutils.cpp index 69f086bb94..8b9bb91249 100644 --- a/src/location/qlocationutils.cpp +++ b/src/location/qlocationutils.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/location/qlocationutils_p.h b/src/location/qlocationutils_p.h index 48acf4d0df..16d6dd8c6b 100644 --- a/src/location/qlocationutils_p.h +++ b/src/location/qlocationutils_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/location/qmlbackendao_s60.cpp b/src/location/qmlbackendao_s60.cpp index fefa4ae812..1f29b61d30 100644 --- a/src/location/qmlbackendao_s60.cpp +++ b/src/location/qmlbackendao_s60.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/location/qmlbackendao_s60_p.h b/src/location/qmlbackendao_s60_p.h index d8a71773f4..a96188866a 100644 --- a/src/location/qmlbackendao_s60_p.h +++ b/src/location/qmlbackendao_s60_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/location/qmlbackendmonitorao_s60.cpp b/src/location/qmlbackendmonitorao_s60.cpp index ece36a6305..809f404cc4 100644 --- a/src/location/qmlbackendmonitorao_s60.cpp +++ b/src/location/qmlbackendmonitorao_s60.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/location/qmlbackendmonitorao_s60_p.h b/src/location/qmlbackendmonitorao_s60_p.h index 3c67485b48..2a73a41e04 100644 --- a/src/location/qmlbackendmonitorao_s60_p.h +++ b/src/location/qmlbackendmonitorao_s60_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/location/qmlbackendmonitorcreatetriggerao_s60.cpp b/src/location/qmlbackendmonitorcreatetriggerao_s60.cpp index 802dfc0703..9a6514fff8 100644 --- a/src/location/qmlbackendmonitorcreatetriggerao_s60.cpp +++ b/src/location/qmlbackendmonitorcreatetriggerao_s60.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/location/qmlbackendmonitorcreatetriggerao_s60_p.h b/src/location/qmlbackendmonitorcreatetriggerao_s60_p.h index 7726d2872a..b3cd29f073 100644 --- a/src/location/qmlbackendmonitorcreatetriggerao_s60_p.h +++ b/src/location/qmlbackendmonitorcreatetriggerao_s60_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/location/qmlbackendmonitorinfo_s60.cpp b/src/location/qmlbackendmonitorinfo_s60.cpp index f9fc4fafaa..ede9408c77 100644 --- a/src/location/qmlbackendmonitorinfo_s60.cpp +++ b/src/location/qmlbackendmonitorinfo_s60.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/location/qmlbackendmonitorinfo_s60_p.h b/src/location/qmlbackendmonitorinfo_s60_p.h index b3af101776..e137fa6002 100644 --- a/src/location/qmlbackendmonitorinfo_s60_p.h +++ b/src/location/qmlbackendmonitorinfo_s60_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/location/qmlbackendtriggerchangeao_s60.cpp b/src/location/qmlbackendtriggerchangeao_s60.cpp index 821d1c4d1f..2523cb7df4 100644 --- a/src/location/qmlbackendtriggerchangeao_s60.cpp +++ b/src/location/qmlbackendtriggerchangeao_s60.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/location/qmlbackendtriggerchangeao_s60_p.h b/src/location/qmlbackendtriggerchangeao_s60_p.h index 8e7b8813da..a0d0f8d083 100644 --- a/src/location/qmlbackendtriggerchangeao_s60_p.h +++ b/src/location/qmlbackendtriggerchangeao_s60_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/location/qnmeapositioninfosource.cpp b/src/location/qnmeapositioninfosource.cpp index 4dbf2b3bff..30b714b176 100644 --- a/src/location/qnmeapositioninfosource.cpp +++ b/src/location/qnmeapositioninfosource.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/location/qnmeapositioninfosource.h b/src/location/qnmeapositioninfosource.h index 25fef129e6..bad84719d9 100644 --- a/src/location/qnmeapositioninfosource.h +++ b/src/location/qnmeapositioninfosource.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/location/qnmeapositioninfosource_p.h b/src/location/qnmeapositioninfosource_p.h index 6efd7a568b..f69ff868d1 100644 --- a/src/location/qnmeapositioninfosource_p.h +++ b/src/location/qnmeapositioninfosource_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/addresshelper.cpp b/src/messaging/addresshelper.cpp index b78d35c2e7..dc689bbc75 100644 --- a/src/messaging/addresshelper.cpp +++ b/src/messaging/addresshelper.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/addresshelper_p.h b/src/messaging/addresshelper_p.h index 9ce341c4cb..a6b5190104 100644 --- a/src/messaging/addresshelper_p.h +++ b/src/messaging/addresshelper_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/eventloggerengine_maemo.cpp b/src/messaging/eventloggerengine_maemo.cpp index a60f42be0f..d5bbed19c7 100644 --- a/src/messaging/eventloggerengine_maemo.cpp +++ b/src/messaging/eventloggerengine_maemo.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/eventloggerengine_maemo_p.h b/src/messaging/eventloggerengine_maemo_p.h index 7f8282757d..e46e931e89 100644 --- a/src/messaging/eventloggerengine_maemo_p.h +++ b/src/messaging/eventloggerengine_maemo_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/maemohelpers.cpp b/src/messaging/maemohelpers.cpp index 86ad8b260e..3e3c798ee0 100644 --- a/src/messaging/maemohelpers.cpp +++ b/src/messaging/maemohelpers.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/maemohelpers_p.h b/src/messaging/maemohelpers_p.h index 80f20cc0d7..57aa57afc7 100644 --- a/src/messaging/maemohelpers_p.h +++ b/src/messaging/maemohelpers_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/messagingutil.cpp b/src/messaging/messagingutil.cpp index 415838434c..fce5798b1a 100644 --- a/src/messaging/messagingutil.cpp +++ b/src/messaging/messagingutil.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/messagingutil_p.h b/src/messaging/messagingutil_p.h index 0ffea84124..337706bfcb 100644 --- a/src/messaging/messagingutil_p.h +++ b/src/messaging/messagingutil_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/modestengine_maemo.cpp b/src/messaging/modestengine_maemo.cpp index 2bea806c07..68f63b3b49 100644 --- a/src/messaging/modestengine_maemo.cpp +++ b/src/messaging/modestengine_maemo.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/modestengine_maemo_p.h b/src/messaging/modestengine_maemo_p.h index 6a054455dc..30afc0aff7 100644 --- a/src/messaging/modestengine_maemo_p.h +++ b/src/messaging/modestengine_maemo_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessage.cpp b/src/messaging/qmessage.cpp index 2d2a2d8c3f..b05c473bb1 100644 --- a/src/messaging/qmessage.cpp +++ b/src/messaging/qmessage.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessage.h b/src/messaging/qmessage.h index 9beab2f961..bb645a50e7 100644 --- a/src/messaging/qmessage.h +++ b/src/messaging/qmessage.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessage_maemo.cpp b/src/messaging/qmessage_maemo.cpp index e70f7fdd06..b7c882e472 100644 --- a/src/messaging/qmessage_maemo.cpp +++ b/src/messaging/qmessage_maemo.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessage_p.h b/src/messaging/qmessage_p.h index 9822c6c3ff..f46f0bacb9 100644 --- a/src/messaging/qmessage_p.h +++ b/src/messaging/qmessage_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessage_qmf.cpp b/src/messaging/qmessage_qmf.cpp index 4281075694..b928832577 100644 --- a/src/messaging/qmessage_qmf.cpp +++ b/src/messaging/qmessage_qmf.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessage_stub.cpp b/src/messaging/qmessage_stub.cpp index 102d623ef6..5706be8718 100644 --- a/src/messaging/qmessage_stub.cpp +++ b/src/messaging/qmessage_stub.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessage_symbian.cpp b/src/messaging/qmessage_symbian.cpp index b29bdd761f..01b6dc49f4 100644 --- a/src/messaging/qmessage_symbian.cpp +++ b/src/messaging/qmessage_symbian.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessage_symbian_p.h b/src/messaging/qmessage_symbian_p.h index 4a9f8a8591..b616fec2aa 100644 --- a/src/messaging/qmessage_symbian_p.h +++ b/src/messaging/qmessage_symbian_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessage_win.cpp b/src/messaging/qmessage_win.cpp index 40bcfdb4ce..a7da312d65 100644 --- a/src/messaging/qmessage_win.cpp +++ b/src/messaging/qmessage_win.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessageaccount.cpp b/src/messaging/qmessageaccount.cpp index 7b8b6fdba2..5f82b37884 100644 --- a/src/messaging/qmessageaccount.cpp +++ b/src/messaging/qmessageaccount.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessageaccount.h b/src/messaging/qmessageaccount.h index c9548eac04..707eb27b76 100644 --- a/src/messaging/qmessageaccount.h +++ b/src/messaging/qmessageaccount.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessageaccount_maemo.cpp b/src/messaging/qmessageaccount_maemo.cpp index 677bbc04ef..58cceb718e 100644 --- a/src/messaging/qmessageaccount_maemo.cpp +++ b/src/messaging/qmessageaccount_maemo.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessageaccount_p.h b/src/messaging/qmessageaccount_p.h index 3d3f389807..7b101cd2ca 100644 --- a/src/messaging/qmessageaccount_p.h +++ b/src/messaging/qmessageaccount_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessageaccount_qmf.cpp b/src/messaging/qmessageaccount_qmf.cpp index 707841a927..0a156598df 100644 --- a/src/messaging/qmessageaccount_qmf.cpp +++ b/src/messaging/qmessageaccount_qmf.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessageaccount_stub.cpp b/src/messaging/qmessageaccount_stub.cpp index 5af6ffc2bf..46dbe712e9 100644 --- a/src/messaging/qmessageaccount_stub.cpp +++ b/src/messaging/qmessageaccount_stub.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessageaccount_symbian.cpp b/src/messaging/qmessageaccount_symbian.cpp index 0375c5288f..cade56f9a9 100644 --- a/src/messaging/qmessageaccount_symbian.cpp +++ b/src/messaging/qmessageaccount_symbian.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessageaccount_win.cpp b/src/messaging/qmessageaccount_win.cpp index 7b640bb3f9..2b6a9f190a 100644 --- a/src/messaging/qmessageaccount_win.cpp +++ b/src/messaging/qmessageaccount_win.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessageaccountfilter.cpp b/src/messaging/qmessageaccountfilter.cpp index 5a3e50b48c..ed3f195cbf 100644 --- a/src/messaging/qmessageaccountfilter.cpp +++ b/src/messaging/qmessageaccountfilter.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessageaccountfilter.h b/src/messaging/qmessageaccountfilter.h index 31db5294f3..30498ab61d 100644 --- a/src/messaging/qmessageaccountfilter.h +++ b/src/messaging/qmessageaccountfilter.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessageaccountfilter_maemo.cpp b/src/messaging/qmessageaccountfilter_maemo.cpp index 820060515f..f33563cf06 100644 --- a/src/messaging/qmessageaccountfilter_maemo.cpp +++ b/src/messaging/qmessageaccountfilter_maemo.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessageaccountfilter_p.h b/src/messaging/qmessageaccountfilter_p.h index 3c8532b173..a346a8832e 100644 --- a/src/messaging/qmessageaccountfilter_p.h +++ b/src/messaging/qmessageaccountfilter_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessageaccountfilter_qmf.cpp b/src/messaging/qmessageaccountfilter_qmf.cpp index ccb9553d9e..796ccc208c 100644 --- a/src/messaging/qmessageaccountfilter_qmf.cpp +++ b/src/messaging/qmessageaccountfilter_qmf.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessageaccountfilter_stub.cpp b/src/messaging/qmessageaccountfilter_stub.cpp index 1b1057bde5..32cfc3821b 100644 --- a/src/messaging/qmessageaccountfilter_stub.cpp +++ b/src/messaging/qmessageaccountfilter_stub.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessageaccountfilter_symbian.cpp b/src/messaging/qmessageaccountfilter_symbian.cpp index 4b38b8ab99..87a4eea1c9 100644 --- a/src/messaging/qmessageaccountfilter_symbian.cpp +++ b/src/messaging/qmessageaccountfilter_symbian.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessageaccountfilter_win.cpp b/src/messaging/qmessageaccountfilter_win.cpp index d4c7f423e5..dbb895896d 100644 --- a/src/messaging/qmessageaccountfilter_win.cpp +++ b/src/messaging/qmessageaccountfilter_win.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessageaccountid.cpp b/src/messaging/qmessageaccountid.cpp index 27aff77c4b..568600dbc8 100644 --- a/src/messaging/qmessageaccountid.cpp +++ b/src/messaging/qmessageaccountid.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessageaccountid.h b/src/messaging/qmessageaccountid.h index 7257fe0ae9..197c6e89ff 100644 --- a/src/messaging/qmessageaccountid.h +++ b/src/messaging/qmessageaccountid.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessageaccountid_maemo.cpp b/src/messaging/qmessageaccountid_maemo.cpp index 4b2bda39cd..14904a7e0d 100644 --- a/src/messaging/qmessageaccountid_maemo.cpp +++ b/src/messaging/qmessageaccountid_maemo.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessageaccountid_p.h b/src/messaging/qmessageaccountid_p.h index c5ace3d5bd..f88cbef95c 100644 --- a/src/messaging/qmessageaccountid_p.h +++ b/src/messaging/qmessageaccountid_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessageaccountid_qmf.cpp b/src/messaging/qmessageaccountid_qmf.cpp index 93589f9fb2..7d5ff89595 100644 --- a/src/messaging/qmessageaccountid_qmf.cpp +++ b/src/messaging/qmessageaccountid_qmf.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessageaccountid_stub.cpp b/src/messaging/qmessageaccountid_stub.cpp index b700edcd16..eee406880e 100644 --- a/src/messaging/qmessageaccountid_stub.cpp +++ b/src/messaging/qmessageaccountid_stub.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessageaccountid_symbian.cpp b/src/messaging/qmessageaccountid_symbian.cpp index 79136daa96..6c5bfbc969 100644 --- a/src/messaging/qmessageaccountid_symbian.cpp +++ b/src/messaging/qmessageaccountid_symbian.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessageaccountid_win.cpp b/src/messaging/qmessageaccountid_win.cpp index d901a6f14c..531b756c7f 100644 --- a/src/messaging/qmessageaccountid_win.cpp +++ b/src/messaging/qmessageaccountid_win.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessageaccountsortorder.cpp b/src/messaging/qmessageaccountsortorder.cpp index ec9aaed114..a937b01fe2 100644 --- a/src/messaging/qmessageaccountsortorder.cpp +++ b/src/messaging/qmessageaccountsortorder.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessageaccountsortorder.h b/src/messaging/qmessageaccountsortorder.h index 5896baca71..6deef21bc7 100644 --- a/src/messaging/qmessageaccountsortorder.h +++ b/src/messaging/qmessageaccountsortorder.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessageaccountsortorder_maemo.cpp b/src/messaging/qmessageaccountsortorder_maemo.cpp index 3c3bc74be6..7dc6d4019f 100644 --- a/src/messaging/qmessageaccountsortorder_maemo.cpp +++ b/src/messaging/qmessageaccountsortorder_maemo.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessageaccountsortorder_p.h b/src/messaging/qmessageaccountsortorder_p.h index 09acf2de92..573bc50345 100644 --- a/src/messaging/qmessageaccountsortorder_p.h +++ b/src/messaging/qmessageaccountsortorder_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessageaccountsortorder_qmf.cpp b/src/messaging/qmessageaccountsortorder_qmf.cpp index c14f8d9a38..55b8ff9231 100644 --- a/src/messaging/qmessageaccountsortorder_qmf.cpp +++ b/src/messaging/qmessageaccountsortorder_qmf.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessageaccountsortorder_stub.cpp b/src/messaging/qmessageaccountsortorder_stub.cpp index 8e5fb8cf6a..f7bac94988 100644 --- a/src/messaging/qmessageaccountsortorder_stub.cpp +++ b/src/messaging/qmessageaccountsortorder_stub.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessageaccountsortorder_symbian.cpp b/src/messaging/qmessageaccountsortorder_symbian.cpp index aaeab7fcfd..d4da2ad721 100644 --- a/src/messaging/qmessageaccountsortorder_symbian.cpp +++ b/src/messaging/qmessageaccountsortorder_symbian.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessageaccountsortorder_win.cpp b/src/messaging/qmessageaccountsortorder_win.cpp index d04c4765a9..d25df29f0a 100644 --- a/src/messaging/qmessageaccountsortorder_win.cpp +++ b/src/messaging/qmessageaccountsortorder_win.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessageaddress.cpp b/src/messaging/qmessageaddress.cpp index 89a347ff82..d254022bfc 100644 --- a/src/messaging/qmessageaddress.cpp +++ b/src/messaging/qmessageaddress.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessageaddress.h b/src/messaging/qmessageaddress.h index 40e1606a22..b9526e4d8c 100644 --- a/src/messaging/qmessageaddress.h +++ b/src/messaging/qmessageaddress.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessageaddress_p.h b/src/messaging/qmessageaddress_p.h index f01a151117..92d55d48ee 100644 --- a/src/messaging/qmessageaddress_p.h +++ b/src/messaging/qmessageaddress_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessagecontentcontainer.cpp b/src/messaging/qmessagecontentcontainer.cpp index 7f31ba61cc..043ac2e2d3 100644 --- a/src/messaging/qmessagecontentcontainer.cpp +++ b/src/messaging/qmessagecontentcontainer.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessagecontentcontainer.h b/src/messaging/qmessagecontentcontainer.h index 6a8b5861e0..8b140e989c 100644 --- a/src/messaging/qmessagecontentcontainer.h +++ b/src/messaging/qmessagecontentcontainer.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessagecontentcontainer_maemo.cpp b/src/messaging/qmessagecontentcontainer_maemo.cpp index fc18df4b09..fe01a047a2 100644 --- a/src/messaging/qmessagecontentcontainer_maemo.cpp +++ b/src/messaging/qmessagecontentcontainer_maemo.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessagecontentcontainer_maemo_p.h b/src/messaging/qmessagecontentcontainer_maemo_p.h index 573a24ecda..6453007cde 100644 --- a/src/messaging/qmessagecontentcontainer_maemo_p.h +++ b/src/messaging/qmessagecontentcontainer_maemo_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessagecontentcontainer_p.h b/src/messaging/qmessagecontentcontainer_p.h index c9609353e0..81f1dee6d1 100644 --- a/src/messaging/qmessagecontentcontainer_p.h +++ b/src/messaging/qmessagecontentcontainer_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessagecontentcontainer_qmf.cpp b/src/messaging/qmessagecontentcontainer_qmf.cpp index 5091ecc0f6..7e0a51b743 100644 --- a/src/messaging/qmessagecontentcontainer_qmf.cpp +++ b/src/messaging/qmessagecontentcontainer_qmf.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessagecontentcontainer_stub.cpp b/src/messaging/qmessagecontentcontainer_stub.cpp index f1f7933f70..467c6adc43 100644 --- a/src/messaging/qmessagecontentcontainer_stub.cpp +++ b/src/messaging/qmessagecontentcontainer_stub.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessagecontentcontainer_symbian.cpp b/src/messaging/qmessagecontentcontainer_symbian.cpp index e152b41a14..d8be332820 100644 --- a/src/messaging/qmessagecontentcontainer_symbian.cpp +++ b/src/messaging/qmessagecontentcontainer_symbian.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessagecontentcontainer_symbian_p.h b/src/messaging/qmessagecontentcontainer_symbian_p.h index 9da5403af2..67a42d351e 100644 --- a/src/messaging/qmessagecontentcontainer_symbian_p.h +++ b/src/messaging/qmessagecontentcontainer_symbian_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessagecontentcontainer_win.cpp b/src/messaging/qmessagecontentcontainer_win.cpp index 0fc57fe566..1327700eba 100644 --- a/src/messaging/qmessagecontentcontainer_win.cpp +++ b/src/messaging/qmessagecontentcontainer_win.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessagecontentcontainerid.cpp b/src/messaging/qmessagecontentcontainerid.cpp index f22a0ce841..9f1c26f570 100644 --- a/src/messaging/qmessagecontentcontainerid.cpp +++ b/src/messaging/qmessagecontentcontainerid.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessagecontentcontainerid.h b/src/messaging/qmessagecontentcontainerid.h index 7f6b1c198c..3c01921c9c 100644 --- a/src/messaging/qmessagecontentcontainerid.h +++ b/src/messaging/qmessagecontentcontainerid.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessagecontentcontainerid_maemo.cpp b/src/messaging/qmessagecontentcontainerid_maemo.cpp index c8c5d16dae..2e34787e15 100644 --- a/src/messaging/qmessagecontentcontainerid_maemo.cpp +++ b/src/messaging/qmessagecontentcontainerid_maemo.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessagecontentcontainerid_p.h b/src/messaging/qmessagecontentcontainerid_p.h index fb94333622..0852056b00 100644 --- a/src/messaging/qmessagecontentcontainerid_p.h +++ b/src/messaging/qmessagecontentcontainerid_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessagecontentcontainerid_qmf.cpp b/src/messaging/qmessagecontentcontainerid_qmf.cpp index 163e0f21c7..033dc9b04e 100644 --- a/src/messaging/qmessagecontentcontainerid_qmf.cpp +++ b/src/messaging/qmessagecontentcontainerid_qmf.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessagecontentcontainerid_stub.cpp b/src/messaging/qmessagecontentcontainerid_stub.cpp index b16ba3d278..fd9a754264 100644 --- a/src/messaging/qmessagecontentcontainerid_stub.cpp +++ b/src/messaging/qmessagecontentcontainerid_stub.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessagecontentcontainerid_symbian.cpp b/src/messaging/qmessagecontentcontainerid_symbian.cpp index 76fa1fbd1e..8083f9ddc1 100644 --- a/src/messaging/qmessagecontentcontainerid_symbian.cpp +++ b/src/messaging/qmessagecontentcontainerid_symbian.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessagecontentcontainerid_win.cpp b/src/messaging/qmessagecontentcontainerid_win.cpp index 9ac740609b..658076b9de 100644 --- a/src/messaging/qmessagecontentcontainerid_win.cpp +++ b/src/messaging/qmessagecontentcontainerid_win.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessagedatacomparator.cpp b/src/messaging/qmessagedatacomparator.cpp index 1fd4af7b19..0b01da1949 100644 --- a/src/messaging/qmessagedatacomparator.cpp +++ b/src/messaging/qmessagedatacomparator.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessagedatacomparator.h b/src/messaging/qmessagedatacomparator.h index 90713958b8..209cc5f880 100644 --- a/src/messaging/qmessagedatacomparator.h +++ b/src/messaging/qmessagedatacomparator.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessagefilter.cpp b/src/messaging/qmessagefilter.cpp index caa8b8aac8..4c1bccd072 100644 --- a/src/messaging/qmessagefilter.cpp +++ b/src/messaging/qmessagefilter.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessagefilter.h b/src/messaging/qmessagefilter.h index cdb66cb3db..45b256d9af 100644 --- a/src/messaging/qmessagefilter.h +++ b/src/messaging/qmessagefilter.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessagefilter_maemo.cpp b/src/messaging/qmessagefilter_maemo.cpp index d3e83374d4..25d5b6b0e7 100644 --- a/src/messaging/qmessagefilter_maemo.cpp +++ b/src/messaging/qmessagefilter_maemo.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessagefilter_p.h b/src/messaging/qmessagefilter_p.h index 8091d4e0d4..8712cce829 100644 --- a/src/messaging/qmessagefilter_p.h +++ b/src/messaging/qmessagefilter_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessagefilter_qmf.cpp b/src/messaging/qmessagefilter_qmf.cpp index 6e68135cb6..8de6404411 100644 --- a/src/messaging/qmessagefilter_qmf.cpp +++ b/src/messaging/qmessagefilter_qmf.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessagefilter_stub.cpp b/src/messaging/qmessagefilter_stub.cpp index 31a1081b4d..07b1c4254f 100644 --- a/src/messaging/qmessagefilter_stub.cpp +++ b/src/messaging/qmessagefilter_stub.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessagefilter_symbian.cpp b/src/messaging/qmessagefilter_symbian.cpp index 584a253487..546c78530f 100644 --- a/src/messaging/qmessagefilter_symbian.cpp +++ b/src/messaging/qmessagefilter_symbian.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessagefilter_win.cpp b/src/messaging/qmessagefilter_win.cpp index 3d46802fc9..1584b41627 100644 --- a/src/messaging/qmessagefilter_win.cpp +++ b/src/messaging/qmessagefilter_win.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessagefolder.cpp b/src/messaging/qmessagefolder.cpp index b5a041df5a..45000e9ead 100644 --- a/src/messaging/qmessagefolder.cpp +++ b/src/messaging/qmessagefolder.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessagefolder.h b/src/messaging/qmessagefolder.h index 98f3228e46..464b0ce2c1 100644 --- a/src/messaging/qmessagefolder.h +++ b/src/messaging/qmessagefolder.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessagefolder_maemo.cpp b/src/messaging/qmessagefolder_maemo.cpp index 267178204a..bbb6384f5b 100644 --- a/src/messaging/qmessagefolder_maemo.cpp +++ b/src/messaging/qmessagefolder_maemo.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessagefolder_p.h b/src/messaging/qmessagefolder_p.h index f59f76f819..9a4ef5cac0 100644 --- a/src/messaging/qmessagefolder_p.h +++ b/src/messaging/qmessagefolder_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessagefolder_qmf.cpp b/src/messaging/qmessagefolder_qmf.cpp index 5a5117fea4..6378086a3d 100644 --- a/src/messaging/qmessagefolder_qmf.cpp +++ b/src/messaging/qmessagefolder_qmf.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessagefolder_stub.cpp b/src/messaging/qmessagefolder_stub.cpp index 9e96f6620d..b8a26fb0bd 100644 --- a/src/messaging/qmessagefolder_stub.cpp +++ b/src/messaging/qmessagefolder_stub.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessagefolder_symbian.cpp b/src/messaging/qmessagefolder_symbian.cpp index 89d7b63de9..17ac6a9530 100644 --- a/src/messaging/qmessagefolder_symbian.cpp +++ b/src/messaging/qmessagefolder_symbian.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessagefolder_win.cpp b/src/messaging/qmessagefolder_win.cpp index 89d7b63de9..17ac6a9530 100644 --- a/src/messaging/qmessagefolder_win.cpp +++ b/src/messaging/qmessagefolder_win.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessagefolderfilter.cpp b/src/messaging/qmessagefolderfilter.cpp index aed60d327b..5b88d00d9b 100644 --- a/src/messaging/qmessagefolderfilter.cpp +++ b/src/messaging/qmessagefolderfilter.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessagefolderfilter.h b/src/messaging/qmessagefolderfilter.h index 84b26e7542..7781e4d567 100644 --- a/src/messaging/qmessagefolderfilter.h +++ b/src/messaging/qmessagefolderfilter.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessagefolderfilter_maemo.cpp b/src/messaging/qmessagefolderfilter_maemo.cpp index 48407facc0..85e9ef7f0e 100644 --- a/src/messaging/qmessagefolderfilter_maemo.cpp +++ b/src/messaging/qmessagefolderfilter_maemo.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessagefolderfilter_p.h b/src/messaging/qmessagefolderfilter_p.h index 9fab6ba31a..472f07e809 100644 --- a/src/messaging/qmessagefolderfilter_p.h +++ b/src/messaging/qmessagefolderfilter_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessagefolderfilter_qmf.cpp b/src/messaging/qmessagefolderfilter_qmf.cpp index 321f1f3f75..d2ca92e02c 100644 --- a/src/messaging/qmessagefolderfilter_qmf.cpp +++ b/src/messaging/qmessagefolderfilter_qmf.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessagefolderfilter_stub.cpp b/src/messaging/qmessagefolderfilter_stub.cpp index cac65ffaf9..a5b7a3b1d2 100644 --- a/src/messaging/qmessagefolderfilter_stub.cpp +++ b/src/messaging/qmessagefolderfilter_stub.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessagefolderfilter_symbian.cpp b/src/messaging/qmessagefolderfilter_symbian.cpp index 606adfab14..adcfb9dcaf 100644 --- a/src/messaging/qmessagefolderfilter_symbian.cpp +++ b/src/messaging/qmessagefolderfilter_symbian.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessagefolderfilter_win.cpp b/src/messaging/qmessagefolderfilter_win.cpp index a7aa813169..84cd201a52 100644 --- a/src/messaging/qmessagefolderfilter_win.cpp +++ b/src/messaging/qmessagefolderfilter_win.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessagefolderid.cpp b/src/messaging/qmessagefolderid.cpp index ce82106b0f..5b5ad74a5a 100644 --- a/src/messaging/qmessagefolderid.cpp +++ b/src/messaging/qmessagefolderid.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessagefolderid.h b/src/messaging/qmessagefolderid.h index 406a6729b8..8564953293 100644 --- a/src/messaging/qmessagefolderid.h +++ b/src/messaging/qmessagefolderid.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessagefolderid_maemo.cpp b/src/messaging/qmessagefolderid_maemo.cpp index 842c6e280b..031ba2bff4 100644 --- a/src/messaging/qmessagefolderid_maemo.cpp +++ b/src/messaging/qmessagefolderid_maemo.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessagefolderid_p.h b/src/messaging/qmessagefolderid_p.h index 3ef3abc7d7..f4f16206f7 100644 --- a/src/messaging/qmessagefolderid_p.h +++ b/src/messaging/qmessagefolderid_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessagefolderid_qmf.cpp b/src/messaging/qmessagefolderid_qmf.cpp index 6b0d88e3fb..522d317c5d 100644 --- a/src/messaging/qmessagefolderid_qmf.cpp +++ b/src/messaging/qmessagefolderid_qmf.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessagefolderid_stub.cpp b/src/messaging/qmessagefolderid_stub.cpp index 49860da18e..68f3f071c5 100644 --- a/src/messaging/qmessagefolderid_stub.cpp +++ b/src/messaging/qmessagefolderid_stub.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessagefolderid_symbian.cpp b/src/messaging/qmessagefolderid_symbian.cpp index 0fa837c23e..706a028560 100644 --- a/src/messaging/qmessagefolderid_symbian.cpp +++ b/src/messaging/qmessagefolderid_symbian.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessagefolderid_win.cpp b/src/messaging/qmessagefolderid_win.cpp index 3010df0c63..3c3c4d45bc 100644 --- a/src/messaging/qmessagefolderid_win.cpp +++ b/src/messaging/qmessagefolderid_win.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessagefoldersortorder.cpp b/src/messaging/qmessagefoldersortorder.cpp index 739caf3591..6837953249 100644 --- a/src/messaging/qmessagefoldersortorder.cpp +++ b/src/messaging/qmessagefoldersortorder.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessagefoldersortorder.h b/src/messaging/qmessagefoldersortorder.h index d661f8acf5..2f4fb4c37b 100644 --- a/src/messaging/qmessagefoldersortorder.h +++ b/src/messaging/qmessagefoldersortorder.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessagefoldersortorder_maemo.cpp b/src/messaging/qmessagefoldersortorder_maemo.cpp index f7010bde31..fc78645557 100644 --- a/src/messaging/qmessagefoldersortorder_maemo.cpp +++ b/src/messaging/qmessagefoldersortorder_maemo.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessagefoldersortorder_p.h b/src/messaging/qmessagefoldersortorder_p.h index 33d9babaf6..7105416736 100644 --- a/src/messaging/qmessagefoldersortorder_p.h +++ b/src/messaging/qmessagefoldersortorder_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessagefoldersortorder_qmf.cpp b/src/messaging/qmessagefoldersortorder_qmf.cpp index 5693f67595..d669a13616 100644 --- a/src/messaging/qmessagefoldersortorder_qmf.cpp +++ b/src/messaging/qmessagefoldersortorder_qmf.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessagefoldersortorder_stub.cpp b/src/messaging/qmessagefoldersortorder_stub.cpp index 56a239aa13..09398421b6 100644 --- a/src/messaging/qmessagefoldersortorder_stub.cpp +++ b/src/messaging/qmessagefoldersortorder_stub.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessagefoldersortorder_symbian.cpp b/src/messaging/qmessagefoldersortorder_symbian.cpp index 3f49c09ccc..d269bf0c04 100644 --- a/src/messaging/qmessagefoldersortorder_symbian.cpp +++ b/src/messaging/qmessagefoldersortorder_symbian.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessagefoldersortorder_win.cpp b/src/messaging/qmessagefoldersortorder_win.cpp index cae60856da..c2afc91825 100644 --- a/src/messaging/qmessagefoldersortorder_win.cpp +++ b/src/messaging/qmessagefoldersortorder_win.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessageglobal.h b/src/messaging/qmessageglobal.h index 35c2f67c13..957a1dfb59 100644 --- a/src/messaging/qmessageglobal.h +++ b/src/messaging/qmessageglobal.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessageid.cpp b/src/messaging/qmessageid.cpp index 6259ce8837..748c1ef181 100644 --- a/src/messaging/qmessageid.cpp +++ b/src/messaging/qmessageid.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessageid.h b/src/messaging/qmessageid.h index a55284ccc1..39d604a665 100644 --- a/src/messaging/qmessageid.h +++ b/src/messaging/qmessageid.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessageid_maemo.cpp b/src/messaging/qmessageid_maemo.cpp index 430d28bb2a..9ef992178a 100644 --- a/src/messaging/qmessageid_maemo.cpp +++ b/src/messaging/qmessageid_maemo.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessageid_p.h b/src/messaging/qmessageid_p.h index 7c33fe43c5..2b386805b2 100644 --- a/src/messaging/qmessageid_p.h +++ b/src/messaging/qmessageid_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessageid_qmf.cpp b/src/messaging/qmessageid_qmf.cpp index 1f1e7f2bf0..abe4a6b1aa 100644 --- a/src/messaging/qmessageid_qmf.cpp +++ b/src/messaging/qmessageid_qmf.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessageid_stub.cpp b/src/messaging/qmessageid_stub.cpp index d9ad9cbce9..3568f1d385 100644 --- a/src/messaging/qmessageid_stub.cpp +++ b/src/messaging/qmessageid_stub.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessageid_symbian.cpp b/src/messaging/qmessageid_symbian.cpp index a237919c97..b50cd16c9b 100644 --- a/src/messaging/qmessageid_symbian.cpp +++ b/src/messaging/qmessageid_symbian.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessageid_win.cpp b/src/messaging/qmessageid_win.cpp index 2fed26eb4a..ad093c1b45 100644 --- a/src/messaging/qmessageid_win.cpp +++ b/src/messaging/qmessageid_win.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessagemanager.cpp b/src/messaging/qmessagemanager.cpp index 2537558ef1..ad605c921f 100644 --- a/src/messaging/qmessagemanager.cpp +++ b/src/messaging/qmessagemanager.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessagemanager.h b/src/messaging/qmessagemanager.h index f9ea61d8d2..237da8b008 100644 --- a/src/messaging/qmessagemanager.h +++ b/src/messaging/qmessagemanager.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessageservice.cpp b/src/messaging/qmessageservice.cpp index 9825d24afe..ee7724b3be 100644 --- a/src/messaging/qmessageservice.cpp +++ b/src/messaging/qmessageservice.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessageservice.h b/src/messaging/qmessageservice.h index 83e237d894..d112442b51 100644 --- a/src/messaging/qmessageservice.h +++ b/src/messaging/qmessageservice.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessageservice_maemo.cpp b/src/messaging/qmessageservice_maemo.cpp index 41087ed34d..03a8ffbbf5 100644 --- a/src/messaging/qmessageservice_maemo.cpp +++ b/src/messaging/qmessageservice_maemo.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessageservice_maemo_p.h b/src/messaging/qmessageservice_maemo_p.h index 96a1956353..931ba104b0 100644 --- a/src/messaging/qmessageservice_maemo_p.h +++ b/src/messaging/qmessageservice_maemo_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessageservice_qmf.cpp b/src/messaging/qmessageservice_qmf.cpp index f2a34663e8..cd01a08835 100644 --- a/src/messaging/qmessageservice_qmf.cpp +++ b/src/messaging/qmessageservice_qmf.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessageservice_stub.cpp b/src/messaging/qmessageservice_stub.cpp index 47aaab953f..e0c38a6336 100644 --- a/src/messaging/qmessageservice_stub.cpp +++ b/src/messaging/qmessageservice_stub.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessageservice_symbian.cpp b/src/messaging/qmessageservice_symbian.cpp index e62c2bdf54..d37ca8b10e 100644 --- a/src/messaging/qmessageservice_symbian.cpp +++ b/src/messaging/qmessageservice_symbian.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessageservice_symbian_p.h b/src/messaging/qmessageservice_symbian_p.h index 20eb678b6d..25be79332c 100644 --- a/src/messaging/qmessageservice_symbian_p.h +++ b/src/messaging/qmessageservice_symbian_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessageservice_win.cpp b/src/messaging/qmessageservice_win.cpp index c0fe450a61..14eb85dd4f 100644 --- a/src/messaging/qmessageservice_win.cpp +++ b/src/messaging/qmessageservice_win.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessagesortorder.cpp b/src/messaging/qmessagesortorder.cpp index eabc8f235e..25126c1a89 100644 --- a/src/messaging/qmessagesortorder.cpp +++ b/src/messaging/qmessagesortorder.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessagesortorder.h b/src/messaging/qmessagesortorder.h index 7e456d5c32..0a440f8684 100644 --- a/src/messaging/qmessagesortorder.h +++ b/src/messaging/qmessagesortorder.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessagesortorder_maemo.cpp b/src/messaging/qmessagesortorder_maemo.cpp index 66f470a81a..32df7fc4e0 100644 --- a/src/messaging/qmessagesortorder_maemo.cpp +++ b/src/messaging/qmessagesortorder_maemo.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessagesortorder_p.h b/src/messaging/qmessagesortorder_p.h index 48e85df09b..edea43d8a8 100644 --- a/src/messaging/qmessagesortorder_p.h +++ b/src/messaging/qmessagesortorder_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessagesortorder_qmf.cpp b/src/messaging/qmessagesortorder_qmf.cpp index 0601e46266..3fba295aa8 100644 --- a/src/messaging/qmessagesortorder_qmf.cpp +++ b/src/messaging/qmessagesortorder_qmf.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessagesortorder_stub.cpp b/src/messaging/qmessagesortorder_stub.cpp index c5f8dfdc55..8d0824535c 100644 --- a/src/messaging/qmessagesortorder_stub.cpp +++ b/src/messaging/qmessagesortorder_stub.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessagesortorder_symbian.cpp b/src/messaging/qmessagesortorder_symbian.cpp index f927d2a3b4..cca48f6f79 100644 --- a/src/messaging/qmessagesortorder_symbian.cpp +++ b/src/messaging/qmessagesortorder_symbian.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessagesortorder_win.cpp b/src/messaging/qmessagesortorder_win.cpp index 56a3c4a8a6..7897768aab 100644 --- a/src/messaging/qmessagesortorder_win.cpp +++ b/src/messaging/qmessagesortorder_win.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessagestore.cpp b/src/messaging/qmessagestore.cpp index 697286c57e..b19ac5b293 100644 --- a/src/messaging/qmessagestore.cpp +++ b/src/messaging/qmessagestore.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessagestore.h b/src/messaging/qmessagestore.h index 2bfb3c384c..a7a1363941 100644 --- a/src/messaging/qmessagestore.h +++ b/src/messaging/qmessagestore.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessagestore_maemo.cpp b/src/messaging/qmessagestore_maemo.cpp index 3f8c72f1ad..24084777a0 100644 --- a/src/messaging/qmessagestore_maemo.cpp +++ b/src/messaging/qmessagestore_maemo.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessagestore_p.h b/src/messaging/qmessagestore_p.h index 562d80d03b..d2c87ff925 100644 --- a/src/messaging/qmessagestore_p.h +++ b/src/messaging/qmessagestore_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessagestore_qmf.cpp b/src/messaging/qmessagestore_qmf.cpp index b7cbe7c8c9..1e6909101a 100644 --- a/src/messaging/qmessagestore_qmf.cpp +++ b/src/messaging/qmessagestore_qmf.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessagestore_qmf_p.h b/src/messaging/qmessagestore_qmf_p.h index 280823b73f..82be840c35 100644 --- a/src/messaging/qmessagestore_qmf_p.h +++ b/src/messaging/qmessagestore_qmf_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessagestore_stub.cpp b/src/messaging/qmessagestore_stub.cpp index e7edd267d0..520684aa4d 100644 --- a/src/messaging/qmessagestore_stub.cpp +++ b/src/messaging/qmessagestore_stub.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessagestore_symbian.cpp b/src/messaging/qmessagestore_symbian.cpp index 6177883112..5ede481f69 100644 --- a/src/messaging/qmessagestore_symbian.cpp +++ b/src/messaging/qmessagestore_symbian.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessagestore_symbian_p.h b/src/messaging/qmessagestore_symbian_p.h index d2e990b836..ea9ffed5a1 100644 --- a/src/messaging/qmessagestore_symbian_p.h +++ b/src/messaging/qmessagestore_symbian_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmessagestore_win.cpp b/src/messaging/qmessagestore_win.cpp index 5eb302ff71..cc1a2e43b2 100644 --- a/src/messaging/qmessagestore_win.cpp +++ b/src/messaging/qmessagestore_win.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmfhelpers.cpp b/src/messaging/qmfhelpers.cpp index 07bb406071..4aef28b084 100644 --- a/src/messaging/qmfhelpers.cpp +++ b/src/messaging/qmfhelpers.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmfhelpers_p.h b/src/messaging/qmfhelpers_p.h index 9b8c30e7a5..17fdacc0cc 100644 --- a/src/messaging/qmfhelpers_p.h +++ b/src/messaging/qmfhelpers_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmtmengine_symbian.cpp b/src/messaging/qmtmengine_symbian.cpp index fefd50be47..339c12ce0f 100644 --- a/src/messaging/qmtmengine_symbian.cpp +++ b/src/messaging/qmtmengine_symbian.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qmtmengine_symbian_p.h b/src/messaging/qmtmengine_symbian_p.h index 58df1c804f..6da3a2c878 100644 --- a/src/messaging/qmtmengine_symbian_p.h +++ b/src/messaging/qmtmengine_symbian_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/qtmessaging.h b/src/messaging/qtmessaging.h index a7c30bad3f..00d7b89f04 100644 --- a/src/messaging/qtmessaging.h +++ b/src/messaging/qtmessaging.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/telepathyengine_maemo.cpp b/src/messaging/telepathyengine_maemo.cpp index 0df835fda8..dc89a66dc5 100644 --- a/src/messaging/telepathyengine_maemo.cpp +++ b/src/messaging/telepathyengine_maemo.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/telepathyengine_maemo_p.h b/src/messaging/telepathyengine_maemo_p.h index cf1699ba90..50df21b98f 100644 --- a/src/messaging/telepathyengine_maemo_p.h +++ b/src/messaging/telepathyengine_maemo_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/win32wce/longstring.cpp b/src/messaging/win32wce/longstring.cpp index 668c501c10..f2dc83bedd 100644 --- a/src/messaging/win32wce/longstring.cpp +++ b/src/messaging/win32wce/longstring.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/win32wce/longstring_p.h b/src/messaging/win32wce/longstring_p.h index ef7ea43436..0063237c24 100644 --- a/src/messaging/win32wce/longstring_p.h +++ b/src/messaging/win32wce/longstring_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/win32wce/qmailaddress.cpp b/src/messaging/win32wce/qmailaddress.cpp index 2423e50154..b4ae930f9a 100644 --- a/src/messaging/win32wce/qmailaddress.cpp +++ b/src/messaging/win32wce/qmailaddress.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/win32wce/qmailaddress.h b/src/messaging/win32wce/qmailaddress.h index 97d643419a..e9baf6b145 100644 --- a/src/messaging/win32wce/qmailaddress.h +++ b/src/messaging/win32wce/qmailaddress.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/win32wce/qmailcodec.cpp b/src/messaging/win32wce/qmailcodec.cpp index 60571055df..4d1df48d61 100644 --- a/src/messaging/win32wce/qmailcodec.cpp +++ b/src/messaging/win32wce/qmailcodec.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/win32wce/qmailcodec.h b/src/messaging/win32wce/qmailcodec.h index d45f8c6e62..6adb4c6ad2 100644 --- a/src/messaging/win32wce/qmailcodec.h +++ b/src/messaging/win32wce/qmailcodec.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/win32wce/qmailfolderfwd.h b/src/messaging/win32wce/qmailfolderfwd.h index 036ffa8998..5da251fcc5 100644 --- a/src/messaging/win32wce/qmailfolderfwd.h +++ b/src/messaging/win32wce/qmailfolderfwd.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/win32wce/qmailglobal.h b/src/messaging/win32wce/qmailglobal.h index 2d792056a1..d15b36f877 100644 --- a/src/messaging/win32wce/qmailglobal.h +++ b/src/messaging/win32wce/qmailglobal.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/win32wce/qmailid.cpp b/src/messaging/win32wce/qmailid.cpp index 2a2c86fe9e..48d1cff280 100644 --- a/src/messaging/win32wce/qmailid.cpp +++ b/src/messaging/win32wce/qmailid.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/win32wce/qmailid.h b/src/messaging/win32wce/qmailid.h index bdef8a7c74..1d533d05e3 100644 --- a/src/messaging/win32wce/qmailid.h +++ b/src/messaging/win32wce/qmailid.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/win32wce/qmailinstantiations.cpp b/src/messaging/win32wce/qmailinstantiations.cpp index 2197376f27..b638e7eed5 100644 --- a/src/messaging/win32wce/qmailinstantiations.cpp +++ b/src/messaging/win32wce/qmailinstantiations.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/win32wce/qmailipc.h b/src/messaging/win32wce/qmailipc.h index 46a7dd2e6c..63f9dae2b4 100644 --- a/src/messaging/win32wce/qmailipc.h +++ b/src/messaging/win32wce/qmailipc.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/win32wce/qmaillog.cpp b/src/messaging/win32wce/qmaillog.cpp index 707ed9edcd..46e12316ed 100644 --- a/src/messaging/win32wce/qmaillog.cpp +++ b/src/messaging/win32wce/qmaillog.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/win32wce/qmaillog.h b/src/messaging/win32wce/qmaillog.h index e7d4854c97..5f7541d2fb 100644 --- a/src/messaging/win32wce/qmaillog.h +++ b/src/messaging/win32wce/qmaillog.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/win32wce/qmailmessage.cpp b/src/messaging/win32wce/qmailmessage.cpp index 0b3b00526c..f994b9f3a3 100644 --- a/src/messaging/win32wce/qmailmessage.cpp +++ b/src/messaging/win32wce/qmailmessage.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/win32wce/qmailmessage.h b/src/messaging/win32wce/qmailmessage.h index 36676dc518..a25be47e5a 100644 --- a/src/messaging/win32wce/qmailmessage.h +++ b/src/messaging/win32wce/qmailmessage.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/win32wce/qmailmessage_p.h b/src/messaging/win32wce/qmailmessage_p.h index ff82935afb..d5c2e1dffe 100644 --- a/src/messaging/win32wce/qmailmessage_p.h +++ b/src/messaging/win32wce/qmailmessage_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/win32wce/qmailmessagefwd.cpp b/src/messaging/win32wce/qmailmessagefwd.cpp index 16ee4700b2..9681d00bc3 100644 --- a/src/messaging/win32wce/qmailmessagefwd.cpp +++ b/src/messaging/win32wce/qmailmessagefwd.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/win32wce/qmailmessagefwd.h b/src/messaging/win32wce/qmailmessagefwd.h index 7126a0d3fc..569e8540cc 100644 --- a/src/messaging/win32wce/qmailmessagefwd.h +++ b/src/messaging/win32wce/qmailmessagefwd.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/win32wce/qmailnamespace.cpp b/src/messaging/win32wce/qmailnamespace.cpp index ac9cf67567..1bea4bff04 100644 --- a/src/messaging/win32wce/qmailnamespace.cpp +++ b/src/messaging/win32wce/qmailnamespace.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/win32wce/qmailnamespace.h b/src/messaging/win32wce/qmailnamespace.h index ec774c60c3..9105745738 100644 --- a/src/messaging/win32wce/qmailnamespace.h +++ b/src/messaging/win32wce/qmailnamespace.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/win32wce/qmailtimestamp.cpp b/src/messaging/win32wce/qmailtimestamp.cpp index 7a62cb6506..d4fa5da66b 100644 --- a/src/messaging/win32wce/qmailtimestamp.cpp +++ b/src/messaging/win32wce/qmailtimestamp.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/win32wce/qmailtimestamp.h b/src/messaging/win32wce/qmailtimestamp.h index bd0e8bd5e1..85e6738876 100644 --- a/src/messaging/win32wce/qmailtimestamp.h +++ b/src/messaging/win32wce/qmailtimestamp.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/win32wce/qprivateimplementation.cpp b/src/messaging/win32wce/qprivateimplementation.cpp index 3f92183894..0dc1041085 100644 --- a/src/messaging/win32wce/qprivateimplementation.cpp +++ b/src/messaging/win32wce/qprivateimplementation.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/win32wce/qprivateimplementation.h b/src/messaging/win32wce/qprivateimplementation.h index 6f70c49477..9ffed71772 100644 --- a/src/messaging/win32wce/qprivateimplementation.h +++ b/src/messaging/win32wce/qprivateimplementation.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/win32wce/qprivateimplementationdef.h b/src/messaging/win32wce/qprivateimplementationdef.h index e9cdc93247..98cab4a68b 100644 --- a/src/messaging/win32wce/qprivateimplementationdef.h +++ b/src/messaging/win32wce/qprivateimplementationdef.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/winhelpers.cpp b/src/messaging/winhelpers.cpp index bf43f065b7..e72c942d1f 100644 --- a/src/messaging/winhelpers.cpp +++ b/src/messaging/winhelpers.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/messaging/winhelpers_p.h b/src/messaging/winhelpers_p.h index 2fc5cf0b92..fdc5f8c6bc 100644 --- a/src/messaging/winhelpers_p.h +++ b/src/messaging/winhelpers_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qaudiocapturesource.cpp b/src/multimedia/qaudiocapturesource.cpp index 0dcb6501db..1ac99db84e 100644 --- a/src/multimedia/qaudiocapturesource.cpp +++ b/src/multimedia/qaudiocapturesource.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qaudiocapturesource.h b/src/multimedia/qaudiocapturesource.h index 4340820bd5..cca8162c6c 100644 --- a/src/multimedia/qaudiocapturesource.h +++ b/src/multimedia/qaudiocapturesource.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qaudioencodercontrol.cpp b/src/multimedia/qaudioencodercontrol.cpp index bb00113b4a..23cb958f48 100644 --- a/src/multimedia/qaudioencodercontrol.cpp +++ b/src/multimedia/qaudioencodercontrol.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qaudioencodercontrol.h b/src/multimedia/qaudioencodercontrol.h index 1822476d82..1887c63904 100644 --- a/src/multimedia/qaudioencodercontrol.h +++ b/src/multimedia/qaudioencodercontrol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qaudioendpointselector.cpp b/src/multimedia/qaudioendpointselector.cpp index 85643fcf18..c6084a825d 100644 --- a/src/multimedia/qaudioendpointselector.cpp +++ b/src/multimedia/qaudioendpointselector.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qaudioendpointselector.h b/src/multimedia/qaudioendpointselector.h index 6058dda08f..7d2dfd0d74 100644 --- a/src/multimedia/qaudioendpointselector.h +++ b/src/multimedia/qaudioendpointselector.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qgraphicsvideoitem.cpp b/src/multimedia/qgraphicsvideoitem.cpp index 0e53e88743..4c227617e9 100644 --- a/src/multimedia/qgraphicsvideoitem.cpp +++ b/src/multimedia/qgraphicsvideoitem.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qgraphicsvideoitem.h b/src/multimedia/qgraphicsvideoitem.h index 7673cbccaa..85fe3aa2b9 100644 --- a/src/multimedia/qgraphicsvideoitem.h +++ b/src/multimedia/qgraphicsvideoitem.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qgraphicsvideoitem_maemo5.cpp b/src/multimedia/qgraphicsvideoitem_maemo5.cpp index 343586c482..f5b75139db 100644 --- a/src/multimedia/qgraphicsvideoitem_maemo5.cpp +++ b/src/multimedia/qgraphicsvideoitem_maemo5.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qimageencodercontrol.cpp b/src/multimedia/qimageencodercontrol.cpp index 267cbff9bf..bf9446ac50 100644 --- a/src/multimedia/qimageencodercontrol.cpp +++ b/src/multimedia/qimageencodercontrol.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qimageencodercontrol.h b/src/multimedia/qimageencodercontrol.h index 7231596d05..a3a2f0a7cb 100644 --- a/src/multimedia/qimageencodercontrol.h +++ b/src/multimedia/qimageencodercontrol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qlocalmediaplaylistprovider.cpp b/src/multimedia/qlocalmediaplaylistprovider.cpp index fc5bd332cb..610f36b0db 100644 --- a/src/multimedia/qlocalmediaplaylistprovider.cpp +++ b/src/multimedia/qlocalmediaplaylistprovider.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qlocalmediaplaylistprovider.h b/src/multimedia/qlocalmediaplaylistprovider.h index b1d8421a99..03ec35a073 100644 --- a/src/multimedia/qlocalmediaplaylistprovider.h +++ b/src/multimedia/qlocalmediaplaylistprovider.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qmediacontainercontrol.cpp b/src/multimedia/qmediacontainercontrol.cpp index 1ea163b60d..01bc4ccf91 100644 --- a/src/multimedia/qmediacontainercontrol.cpp +++ b/src/multimedia/qmediacontainercontrol.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qmediacontainercontrol.h b/src/multimedia/qmediacontainercontrol.h index e4e7ba0658..6efa4f0d17 100644 --- a/src/multimedia/qmediacontainercontrol.h +++ b/src/multimedia/qmediacontainercontrol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qmediacontent.cpp b/src/multimedia/qmediacontent.cpp index f29c77cafd..e6e515933e 100644 --- a/src/multimedia/qmediacontent.cpp +++ b/src/multimedia/qmediacontent.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qmediacontent.h b/src/multimedia/qmediacontent.h index 2d23814310..6e89d57d29 100644 --- a/src/multimedia/qmediacontent.h +++ b/src/multimedia/qmediacontent.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qmediacontrol.cpp b/src/multimedia/qmediacontrol.cpp index f4e66361e1..1eaeea576d 100644 --- a/src/multimedia/qmediacontrol.cpp +++ b/src/multimedia/qmediacontrol.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qmediacontrol.h b/src/multimedia/qmediacontrol.h index 3f77b829b3..1097db19d9 100644 --- a/src/multimedia/qmediacontrol.h +++ b/src/multimedia/qmediacontrol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qmediacontrol_p.h b/src/multimedia/qmediacontrol_p.h index 701ccec082..1326d3c267 100644 --- a/src/multimedia/qmediacontrol_p.h +++ b/src/multimedia/qmediacontrol_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qmediaencodersettings.cpp b/src/multimedia/qmediaencodersettings.cpp index 91082e002b..92f0f7cf32 100644 --- a/src/multimedia/qmediaencodersettings.cpp +++ b/src/multimedia/qmediaencodersettings.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qmediaencodersettings.h b/src/multimedia/qmediaencodersettings.h index d0800fa7fb..e48b469c29 100644 --- a/src/multimedia/qmediaencodersettings.h +++ b/src/multimedia/qmediaencodersettings.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qmediaimageviewer.cpp b/src/multimedia/qmediaimageviewer.cpp index 6aa028bf21..20acfa23e5 100644 --- a/src/multimedia/qmediaimageviewer.cpp +++ b/src/multimedia/qmediaimageviewer.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qmediaimageviewer.h b/src/multimedia/qmediaimageviewer.h index 8e7c2a51aa..a2e4d3733b 100644 --- a/src/multimedia/qmediaimageviewer.h +++ b/src/multimedia/qmediaimageviewer.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qmediaimageviewerservice.cpp b/src/multimedia/qmediaimageviewerservice.cpp index 5e1b12e212..d514d6f6a7 100644 --- a/src/multimedia/qmediaimageviewerservice.cpp +++ b/src/multimedia/qmediaimageviewerservice.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qmediaimageviewerservice_p.h b/src/multimedia/qmediaimageviewerservice_p.h index ace5d4475e..9e40a39b59 100644 --- a/src/multimedia/qmediaimageviewerservice_p.h +++ b/src/multimedia/qmediaimageviewerservice_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qmediaobject.cpp b/src/multimedia/qmediaobject.cpp index ed524c5acb..d1c5d2856b 100644 --- a/src/multimedia/qmediaobject.cpp +++ b/src/multimedia/qmediaobject.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qmediaobject.h b/src/multimedia/qmediaobject.h index 390e4a3296..1fccd775ca 100644 --- a/src/multimedia/qmediaobject.h +++ b/src/multimedia/qmediaobject.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qmediaobject_p.h b/src/multimedia/qmediaobject_p.h index e2e643c314..8f6bcba8c2 100644 --- a/src/multimedia/qmediaobject_p.h +++ b/src/multimedia/qmediaobject_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qmediaplayer.cpp b/src/multimedia/qmediaplayer.cpp index 64a8e3969d..80e5de0e67 100644 --- a/src/multimedia/qmediaplayer.cpp +++ b/src/multimedia/qmediaplayer.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qmediaplayer.h b/src/multimedia/qmediaplayer.h index a9789bfd78..c581d4ba81 100644 --- a/src/multimedia/qmediaplayer.h +++ b/src/multimedia/qmediaplayer.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qmediaplayercontrol.cpp b/src/multimedia/qmediaplayercontrol.cpp index 85807ee3f4..986745482b 100644 --- a/src/multimedia/qmediaplayercontrol.cpp +++ b/src/multimedia/qmediaplayercontrol.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qmediaplayercontrol.h b/src/multimedia/qmediaplayercontrol.h index 8573cb2c2d..f0137ce2de 100644 --- a/src/multimedia/qmediaplayercontrol.h +++ b/src/multimedia/qmediaplayercontrol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qmediaplaylist.cpp b/src/multimedia/qmediaplaylist.cpp index ca9e53d71b..82a5a80caf 100644 --- a/src/multimedia/qmediaplaylist.cpp +++ b/src/multimedia/qmediaplaylist.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qmediaplaylist.h b/src/multimedia/qmediaplaylist.h index 768fa1bf13..872d5b8986 100644 --- a/src/multimedia/qmediaplaylist.h +++ b/src/multimedia/qmediaplaylist.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qmediaplaylist_p.h b/src/multimedia/qmediaplaylist_p.h index d9126968b7..95544f5aa3 100644 --- a/src/multimedia/qmediaplaylist_p.h +++ b/src/multimedia/qmediaplaylist_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qmediaplaylistcontrol.cpp b/src/multimedia/qmediaplaylistcontrol.cpp index 2614323b8c..2737716d1d 100644 --- a/src/multimedia/qmediaplaylistcontrol.cpp +++ b/src/multimedia/qmediaplaylistcontrol.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qmediaplaylistcontrol.h b/src/multimedia/qmediaplaylistcontrol.h index cbef02a07d..61fcd76ba2 100644 --- a/src/multimedia/qmediaplaylistcontrol.h +++ b/src/multimedia/qmediaplaylistcontrol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qmediaplaylistioplugin.cpp b/src/multimedia/qmediaplaylistioplugin.cpp index 9cd8cef090..9fbd98bc3d 100644 --- a/src/multimedia/qmediaplaylistioplugin.cpp +++ b/src/multimedia/qmediaplaylistioplugin.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qmediaplaylistioplugin.h b/src/multimedia/qmediaplaylistioplugin.h index 8efdfa3990..9a381d431b 100644 --- a/src/multimedia/qmediaplaylistioplugin.h +++ b/src/multimedia/qmediaplaylistioplugin.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qmediaplaylistnavigator.cpp b/src/multimedia/qmediaplaylistnavigator.cpp index b94a0edcab..8d1e66c06c 100644 --- a/src/multimedia/qmediaplaylistnavigator.cpp +++ b/src/multimedia/qmediaplaylistnavigator.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qmediaplaylistnavigator.h b/src/multimedia/qmediaplaylistnavigator.h index b22f63e763..396bae9d46 100644 --- a/src/multimedia/qmediaplaylistnavigator.h +++ b/src/multimedia/qmediaplaylistnavigator.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qmediaplaylistprovider.cpp b/src/multimedia/qmediaplaylistprovider.cpp index a390b2308a..8565d8b062 100644 --- a/src/multimedia/qmediaplaylistprovider.cpp +++ b/src/multimedia/qmediaplaylistprovider.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qmediaplaylistprovider.h b/src/multimedia/qmediaplaylistprovider.h index bb7a00e4fd..f05d6da5f8 100644 --- a/src/multimedia/qmediaplaylistprovider.h +++ b/src/multimedia/qmediaplaylistprovider.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qmediaplaylistprovider_p.h b/src/multimedia/qmediaplaylistprovider_p.h index b46705f460..dc5b1e1cb5 100644 --- a/src/multimedia/qmediaplaylistprovider_p.h +++ b/src/multimedia/qmediaplaylistprovider_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qmediapluginloader.cpp b/src/multimedia/qmediapluginloader.cpp index 663e3e45fc..45bc525f67 100644 --- a/src/multimedia/qmediapluginloader.cpp +++ b/src/multimedia/qmediapluginloader.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qmediapluginloader_p.h b/src/multimedia/qmediapluginloader_p.h index cf45d306b7..39b935a2b5 100644 --- a/src/multimedia/qmediapluginloader_p.h +++ b/src/multimedia/qmediapluginloader_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qmediarecorder.cpp b/src/multimedia/qmediarecorder.cpp index 5af078b94c..7122807a43 100644 --- a/src/multimedia/qmediarecorder.cpp +++ b/src/multimedia/qmediarecorder.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qmediarecorder.h b/src/multimedia/qmediarecorder.h index 837b84104d..eb2acf5b0a 100644 --- a/src/multimedia/qmediarecorder.h +++ b/src/multimedia/qmediarecorder.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qmediarecordercontrol.cpp b/src/multimedia/qmediarecordercontrol.cpp index 9d2f703965..91122baca0 100644 --- a/src/multimedia/qmediarecordercontrol.cpp +++ b/src/multimedia/qmediarecordercontrol.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qmediarecordercontrol.h b/src/multimedia/qmediarecordercontrol.h index e3564329c0..dcefd46ebc 100644 --- a/src/multimedia/qmediarecordercontrol.h +++ b/src/multimedia/qmediarecordercontrol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qmediaresource.cpp b/src/multimedia/qmediaresource.cpp index f345230f12..8914dffaeb 100644 --- a/src/multimedia/qmediaresource.cpp +++ b/src/multimedia/qmediaresource.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qmediaresource.h b/src/multimedia/qmediaresource.h index 8a6cf89fb7..6075fc0b91 100644 --- a/src/multimedia/qmediaresource.h +++ b/src/multimedia/qmediaresource.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qmediaservice.cpp b/src/multimedia/qmediaservice.cpp index 4681e6dd1e..b6dc1bff6b 100644 --- a/src/multimedia/qmediaservice.cpp +++ b/src/multimedia/qmediaservice.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qmediaservice.h b/src/multimedia/qmediaservice.h index 847c1cb785..2fb64359da 100644 --- a/src/multimedia/qmediaservice.h +++ b/src/multimedia/qmediaservice.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qmediaservice_p.h b/src/multimedia/qmediaservice_p.h index d7f389ad44..dffab10eb5 100644 --- a/src/multimedia/qmediaservice_p.h +++ b/src/multimedia/qmediaservice_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qmediaserviceprovider.cpp b/src/multimedia/qmediaserviceprovider.cpp index 2782f5dc81..bef91fdf0d 100644 --- a/src/multimedia/qmediaserviceprovider.cpp +++ b/src/multimedia/qmediaserviceprovider.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qmediaserviceprovider.h b/src/multimedia/qmediaserviceprovider.h index 15c4682e63..a35eadcc7c 100644 --- a/src/multimedia/qmediaserviceprovider.h +++ b/src/multimedia/qmediaserviceprovider.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qmediaserviceproviderplugin.h b/src/multimedia/qmediaserviceproviderplugin.h index 985be343d1..fef199f18c 100644 --- a/src/multimedia/qmediaserviceproviderplugin.h +++ b/src/multimedia/qmediaserviceproviderplugin.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qmediastreamscontrol.cpp b/src/multimedia/qmediastreamscontrol.cpp index 91dfe9b47d..89cec07bf1 100644 --- a/src/multimedia/qmediastreamscontrol.cpp +++ b/src/multimedia/qmediastreamscontrol.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qmediastreamscontrol.h b/src/multimedia/qmediastreamscontrol.h index b3130a74f3..6a0bd7de28 100644 --- a/src/multimedia/qmediastreamscontrol.h +++ b/src/multimedia/qmediastreamscontrol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qmediatimerange.cpp b/src/multimedia/qmediatimerange.cpp index 42b902ffba..417c6b461e 100644 --- a/src/multimedia/qmediatimerange.cpp +++ b/src/multimedia/qmediatimerange.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qmediatimerange.h b/src/multimedia/qmediatimerange.h index 15e84ed079..d6fa83c7d9 100644 --- a/src/multimedia/qmediatimerange.h +++ b/src/multimedia/qmediatimerange.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qmetadatacontrol.cpp b/src/multimedia/qmetadatacontrol.cpp index 7d5996b9f4..461ce4d443 100644 --- a/src/multimedia/qmetadatacontrol.cpp +++ b/src/multimedia/qmetadatacontrol.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qmetadatacontrol.h b/src/multimedia/qmetadatacontrol.h index e52fecea07..d90e083925 100644 --- a/src/multimedia/qmetadatacontrol.h +++ b/src/multimedia/qmetadatacontrol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qpaintervideosurface.cpp b/src/multimedia/qpaintervideosurface.cpp index 7790e3a5d5..91c2f35474 100644 --- a/src/multimedia/qpaintervideosurface.cpp +++ b/src/multimedia/qpaintervideosurface.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qpaintervideosurface_p.h b/src/multimedia/qpaintervideosurface_p.h index 3a20115dc3..0de5150595 100644 --- a/src/multimedia/qpaintervideosurface_p.h +++ b/src/multimedia/qpaintervideosurface_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qradiotuner.cpp b/src/multimedia/qradiotuner.cpp index ca5ac75640..6cacf71915 100644 --- a/src/multimedia/qradiotuner.cpp +++ b/src/multimedia/qradiotuner.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qradiotuner.h b/src/multimedia/qradiotuner.h index d7228b639f..70e6b07e33 100644 --- a/src/multimedia/qradiotuner.h +++ b/src/multimedia/qradiotuner.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qradiotunercontrol.cpp b/src/multimedia/qradiotunercontrol.cpp index e6fd7ca697..1260bc1ea9 100644 --- a/src/multimedia/qradiotunercontrol.cpp +++ b/src/multimedia/qradiotunercontrol.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qradiotunercontrol.h b/src/multimedia/qradiotunercontrol.h index 47651f766a..231f32fd6d 100644 --- a/src/multimedia/qradiotunercontrol.h +++ b/src/multimedia/qradiotunercontrol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qsoundeffect_p.h b/src/multimedia/qsoundeffect_p.h index de7070e06d..ea7c49f697 100644 --- a/src/multimedia/qsoundeffect_p.h +++ b/src/multimedia/qsoundeffect_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qtmedianamespace.h b/src/multimedia/qtmedianamespace.h index b6a3454186..beca47dab1 100644 --- a/src/multimedia/qtmedianamespace.h +++ b/src/multimedia/qtmedianamespace.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qtmedianamespace.qdoc b/src/multimedia/qtmedianamespace.qdoc index fd5734afde..c39316a779 100644 --- a/src/multimedia/qtmedianamespace.qdoc +++ b/src/multimedia/qtmedianamespace.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qvideodevicecontrol.cpp b/src/multimedia/qvideodevicecontrol.cpp index 8ff26e7471..b02e6a9b28 100644 --- a/src/multimedia/qvideodevicecontrol.cpp +++ b/src/multimedia/qvideodevicecontrol.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qvideodevicecontrol.h b/src/multimedia/qvideodevicecontrol.h index 2e817a27ac..bc7f9ca3f5 100644 --- a/src/multimedia/qvideodevicecontrol.h +++ b/src/multimedia/qvideodevicecontrol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qvideoencodercontrol.cpp b/src/multimedia/qvideoencodercontrol.cpp index f416300ac2..0d5b88b9b6 100644 --- a/src/multimedia/qvideoencodercontrol.cpp +++ b/src/multimedia/qvideoencodercontrol.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qvideoencodercontrol.h b/src/multimedia/qvideoencodercontrol.h index 08fc7e6f5f..6a75fb32f7 100644 --- a/src/multimedia/qvideoencodercontrol.h +++ b/src/multimedia/qvideoencodercontrol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qvideooutputcontrol.cpp b/src/multimedia/qvideooutputcontrol.cpp index 95de2cde30..21f93fda1d 100644 --- a/src/multimedia/qvideooutputcontrol.cpp +++ b/src/multimedia/qvideooutputcontrol.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qvideooutputcontrol.h b/src/multimedia/qvideooutputcontrol.h index adc44e4e49..80a2827a7e 100644 --- a/src/multimedia/qvideooutputcontrol.h +++ b/src/multimedia/qvideooutputcontrol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qvideorenderercontrol.cpp b/src/multimedia/qvideorenderercontrol.cpp index 787436d170..89d3333bd4 100644 --- a/src/multimedia/qvideorenderercontrol.cpp +++ b/src/multimedia/qvideorenderercontrol.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qvideorenderercontrol.h b/src/multimedia/qvideorenderercontrol.h index b754b90e10..b253141bd5 100644 --- a/src/multimedia/qvideorenderercontrol.h +++ b/src/multimedia/qvideorenderercontrol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qvideowidget.cpp b/src/multimedia/qvideowidget.cpp index 6c5804b708..1ad7e8bb5d 100644 --- a/src/multimedia/qvideowidget.cpp +++ b/src/multimedia/qvideowidget.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qvideowidget.h b/src/multimedia/qvideowidget.h index 630a8d3212..5cf3c000e4 100644 --- a/src/multimedia/qvideowidget.h +++ b/src/multimedia/qvideowidget.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qvideowidget_p.h b/src/multimedia/qvideowidget_p.h index 660236af57..20d45510d7 100644 --- a/src/multimedia/qvideowidget_p.h +++ b/src/multimedia/qvideowidget_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qvideowidgetcontrol.cpp b/src/multimedia/qvideowidgetcontrol.cpp index ac08c8a120..7464a37635 100644 --- a/src/multimedia/qvideowidgetcontrol.cpp +++ b/src/multimedia/qvideowidgetcontrol.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qvideowidgetcontrol.h b/src/multimedia/qvideowidgetcontrol.h index a57b73dd54..177e544bbe 100644 --- a/src/multimedia/qvideowidgetcontrol.h +++ b/src/multimedia/qvideowidgetcontrol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qvideowindowcontrol.cpp b/src/multimedia/qvideowindowcontrol.cpp index fe121e25d4..e5dd8409e0 100644 --- a/src/multimedia/qvideowindowcontrol.cpp +++ b/src/multimedia/qvideowindowcontrol.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qvideowindowcontrol.h b/src/multimedia/qvideowindowcontrol.h index 9b0afa008d..534f5d2f9f 100644 --- a/src/multimedia/qvideowindowcontrol.h +++ b/src/multimedia/qvideowindowcontrol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qxvideosurface_maemo5.cpp b/src/multimedia/qxvideosurface_maemo5.cpp index 5bebe5cb63..d69e66736c 100644 --- a/src/multimedia/qxvideosurface_maemo5.cpp +++ b/src/multimedia/qxvideosurface_maemo5.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/multimedia/qxvideosurface_maemo5_p.h b/src/multimedia/qxvideosurface_maemo5_p.h index 7415b8dc85..16b6fbfc60 100644 --- a/src/multimedia/qxvideosurface_maemo5_p.h +++ b/src/multimedia/qxvideosurface_maemo5_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/publishsubscribe/contextkitlayer.cpp b/src/publishsubscribe/contextkitlayer.cpp index 7436289c28..bca92a7ed0 100644 --- a/src/publishsubscribe/contextkitlayer.cpp +++ b/src/publishsubscribe/contextkitlayer.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/publishsubscribe/gconfitem.cpp b/src/publishsubscribe/gconfitem.cpp index a826b421ed..98e9165e3f 100644 --- a/src/publishsubscribe/gconfitem.cpp +++ b/src/publishsubscribe/gconfitem.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/publishsubscribe/gconfitem_p.h b/src/publishsubscribe/gconfitem_p.h index 3bbb5188b2..9afe824574 100644 --- a/src/publishsubscribe/gconfitem_p.h +++ b/src/publishsubscribe/gconfitem_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/publishsubscribe/gconflayer_linux.cpp b/src/publishsubscribe/gconflayer_linux.cpp index 5f7e4d03e0..07bbd06a76 100644 --- a/src/publishsubscribe/gconflayer_linux.cpp +++ b/src/publishsubscribe/gconflayer_linux.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/publishsubscribe/gconflayer_linux_p.h b/src/publishsubscribe/gconflayer_linux_p.h index 103ab8731e..dde7284743 100644 --- a/src/publishsubscribe/gconflayer_linux_p.h +++ b/src/publishsubscribe/gconflayer_linux_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/publishsubscribe/pathmapper_proxy_symbian.cpp b/src/publishsubscribe/pathmapper_proxy_symbian.cpp index c90a7e57a7..f5aac21409 100644 --- a/src/publishsubscribe/pathmapper_proxy_symbian.cpp +++ b/src/publishsubscribe/pathmapper_proxy_symbian.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/publishsubscribe/pathmapper_proxy_symbian_p.h b/src/publishsubscribe/pathmapper_proxy_symbian_p.h index c4334e52c5..7e54ba23da 100644 --- a/src/publishsubscribe/pathmapper_proxy_symbian_p.h +++ b/src/publishsubscribe/pathmapper_proxy_symbian_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/publishsubscribe/psmapperserver_symbian/clientservercommon.h b/src/publishsubscribe/psmapperserver_symbian/clientservercommon.h index 137bcf786d..8cdffabbb3 100644 --- a/src/publishsubscribe/psmapperserver_symbian/clientservercommon.h +++ b/src/publishsubscribe/psmapperserver_symbian/clientservercommon.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/publishsubscribe/psmapperserver_symbian/pathmapper_symbian.cpp b/src/publishsubscribe/psmapperserver_symbian/pathmapper_symbian.cpp index 790dbe8e12..34f56781fd 100644 --- a/src/publishsubscribe/psmapperserver_symbian/pathmapper_symbian.cpp +++ b/src/publishsubscribe/psmapperserver_symbian/pathmapper_symbian.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/publishsubscribe/psmapperserver_symbian/pathmapper_symbian_p.h b/src/publishsubscribe/psmapperserver_symbian/pathmapper_symbian_p.h index dc4af6bed1..b5a9f7dc0b 100644 --- a/src/publishsubscribe/psmapperserver_symbian/pathmapper_symbian_p.h +++ b/src/publishsubscribe/psmapperserver_symbian/pathmapper_symbian_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/publishsubscribe/psmapperserver_symbian/pspathmapperserver.cpp b/src/publishsubscribe/psmapperserver_symbian/pspathmapperserver.cpp index 53d245d39b..7c181e0122 100644 --- a/src/publishsubscribe/psmapperserver_symbian/pspathmapperserver.cpp +++ b/src/publishsubscribe/psmapperserver_symbian/pspathmapperserver.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/publishsubscribe/psmapperserver_symbian/pspathmapperserver.h b/src/publishsubscribe/psmapperserver_symbian/pspathmapperserver.h index 7d0f62058e..55c9cf8d67 100644 --- a/src/publishsubscribe/psmapperserver_symbian/pspathmapperserver.h +++ b/src/publishsubscribe/psmapperserver_symbian/pspathmapperserver.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/publishsubscribe/psmapperserver_symbian/pspathmapperserver.pan b/src/publishsubscribe/psmapperserver_symbian/pspathmapperserver.pan index 4c6d764c6a..640a314374 100644 --- a/src/publishsubscribe/psmapperserver_symbian/pspathmapperserver.pan +++ b/src/publishsubscribe/psmapperserver_symbian/pspathmapperserver.pan @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/publishsubscribe/psmapperserver_symbian/pspathmapperservermain.cpp b/src/publishsubscribe/psmapperserver_symbian/pspathmapperservermain.cpp index 7fc6d164da..fb64e9840f 100644 --- a/src/publishsubscribe/psmapperserver_symbian/pspathmapperservermain.cpp +++ b/src/publishsubscribe/psmapperserver_symbian/pspathmapperservermain.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/publishsubscribe/psmapperserver_symbian/pspathmappersession.cpp b/src/publishsubscribe/psmapperserver_symbian/pspathmappersession.cpp index c63380a00f..b40b0f0e56 100644 --- a/src/publishsubscribe/psmapperserver_symbian/pspathmappersession.cpp +++ b/src/publishsubscribe/psmapperserver_symbian/pspathmappersession.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/publishsubscribe/psmapperserver_symbian/pspathmappersession.h b/src/publishsubscribe/psmapperserver_symbian/pspathmappersession.h index 4b2b1327cc..61221b49f4 100644 --- a/src/publishsubscribe/psmapperserver_symbian/pspathmappersession.h +++ b/src/publishsubscribe/psmapperserver_symbian/pspathmappersession.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/publishsubscribe/psmapperserver_symbian/qcrmlparser.cpp b/src/publishsubscribe/psmapperserver_symbian/qcrmlparser.cpp index 2466fb2515..a4fc7eac88 100644 --- a/src/publishsubscribe/psmapperserver_symbian/qcrmlparser.cpp +++ b/src/publishsubscribe/psmapperserver_symbian/qcrmlparser.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/publishsubscribe/psmapperserver_symbian/qcrmlparser_p.h b/src/publishsubscribe/psmapperserver_symbian/qcrmlparser_p.h index e8ef1dc41d..da6e18ad69 100644 --- a/src/publishsubscribe/psmapperserver_symbian/qcrmlparser_p.h +++ b/src/publishsubscribe/psmapperserver_symbian/qcrmlparser_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/publishsubscribe/qmallocpool.cpp b/src/publishsubscribe/qmallocpool.cpp index eacdaeb6f8..d5746a7a62 100644 --- a/src/publishsubscribe/qmallocpool.cpp +++ b/src/publishsubscribe/qmallocpool.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/publishsubscribe/qmallocpool_p.h b/src/publishsubscribe/qmallocpool_p.h index fb9e522623..5ed4c8eaac 100644 --- a/src/publishsubscribe/qmallocpool_p.h +++ b/src/publishsubscribe/qmallocpool_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/publishsubscribe/qpacketprotocol.cpp b/src/publishsubscribe/qpacketprotocol.cpp index 3eaa14bf0e..d25c6978ae 100644 --- a/src/publishsubscribe/qpacketprotocol.cpp +++ b/src/publishsubscribe/qpacketprotocol.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/publishsubscribe/qpacketprotocol_p.h b/src/publishsubscribe/qpacketprotocol_p.h index 91de8937d9..dbc2bdce53 100644 --- a/src/publishsubscribe/qpacketprotocol_p.h +++ b/src/publishsubscribe/qpacketprotocol_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/publishsubscribe/qsystemreadwritelock_p.h b/src/publishsubscribe/qsystemreadwritelock_p.h index 4350945a63..87773e58a6 100644 --- a/src/publishsubscribe/qsystemreadwritelock_p.h +++ b/src/publishsubscribe/qsystemreadwritelock_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/publishsubscribe/qsystemreadwritelock_unix.cpp b/src/publishsubscribe/qsystemreadwritelock_unix.cpp index 6ab79a1c9a..b8b27c93a4 100644 --- a/src/publishsubscribe/qsystemreadwritelock_unix.cpp +++ b/src/publishsubscribe/qsystemreadwritelock_unix.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/publishsubscribe/qsystemreadwritelock_win.cpp b/src/publishsubscribe/qsystemreadwritelock_win.cpp index 21dbe8f56f..aa586e050b 100644 --- a/src/publishsubscribe/qsystemreadwritelock_win.cpp +++ b/src/publishsubscribe/qsystemreadwritelock_win.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/publishsubscribe/qvaluespace.cpp b/src/publishsubscribe/qvaluespace.cpp index 01f79f711b..0ffaee41ac 100644 --- a/src/publishsubscribe/qvaluespace.cpp +++ b/src/publishsubscribe/qvaluespace.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/publishsubscribe/qvaluespace.h b/src/publishsubscribe/qvaluespace.h index ea7111b428..f9c5c8d8d5 100644 --- a/src/publishsubscribe/qvaluespace.h +++ b/src/publishsubscribe/qvaluespace.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/publishsubscribe/qvaluespace_p.h b/src/publishsubscribe/qvaluespace_p.h index 1e55f3beb1..720e83d8f5 100644 --- a/src/publishsubscribe/qvaluespace_p.h +++ b/src/publishsubscribe/qvaluespace_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/publishsubscribe/qvaluespacemanager.cpp b/src/publishsubscribe/qvaluespacemanager.cpp index 82f3e4fd34..d038c53773 100644 --- a/src/publishsubscribe/qvaluespacemanager.cpp +++ b/src/publishsubscribe/qvaluespacemanager.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/publishsubscribe/qvaluespacemanager_p.h b/src/publishsubscribe/qvaluespacemanager_p.h index 7b2b61e39b..b2bef40a05 100644 --- a/src/publishsubscribe/qvaluespacemanager_p.h +++ b/src/publishsubscribe/qvaluespacemanager_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/publishsubscribe/qvaluespacepublisher.cpp b/src/publishsubscribe/qvaluespacepublisher.cpp index 52293c2955..5496717aea 100644 --- a/src/publishsubscribe/qvaluespacepublisher.cpp +++ b/src/publishsubscribe/qvaluespacepublisher.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/publishsubscribe/qvaluespacepublisher.h b/src/publishsubscribe/qvaluespacepublisher.h index 066d6f6f5c..0196011ed4 100644 --- a/src/publishsubscribe/qvaluespacepublisher.h +++ b/src/publishsubscribe/qvaluespacepublisher.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/publishsubscribe/qvaluespacesubscriber.cpp b/src/publishsubscribe/qvaluespacesubscriber.cpp index 78c2e133e9..93bd9e56a7 100644 --- a/src/publishsubscribe/qvaluespacesubscriber.cpp +++ b/src/publishsubscribe/qvaluespacesubscriber.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/publishsubscribe/qvaluespacesubscriber.h b/src/publishsubscribe/qvaluespacesubscriber.h index a9b277f407..47eea6c60e 100644 --- a/src/publishsubscribe/qvaluespacesubscriber.h +++ b/src/publishsubscribe/qvaluespacesubscriber.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/publishsubscribe/registrylayer_win.cpp b/src/publishsubscribe/registrylayer_win.cpp index b6576a7be5..25760cf6ca 100644 --- a/src/publishsubscribe/registrylayer_win.cpp +++ b/src/publishsubscribe/registrylayer_win.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/publishsubscribe/settingslayer_symbian.cpp b/src/publishsubscribe/settingslayer_symbian.cpp index 64c19fd068..da8e9da458 100644 --- a/src/publishsubscribe/settingslayer_symbian.cpp +++ b/src/publishsubscribe/settingslayer_symbian.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/publishsubscribe/settingslayer_symbian_p.h b/src/publishsubscribe/settingslayer_symbian_p.h index d9c3be8cc5..df4f7cfd81 100644 --- a/src/publishsubscribe/settingslayer_symbian_p.h +++ b/src/publishsubscribe/settingslayer_symbian_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/publishsubscribe/sharedmemorylayer.cpp b/src/publishsubscribe/sharedmemorylayer.cpp index 9ca1c4b19e..113cc7db20 100644 --- a/src/publishsubscribe/sharedmemorylayer.cpp +++ b/src/publishsubscribe/sharedmemorylayer.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/publishsubscribe/xqsettingsmanager_symbian/ccentralrepositoryhandler.cpp b/src/publishsubscribe/xqsettingsmanager_symbian/ccentralrepositoryhandler.cpp index 3e97725025..79624ecda6 100644 --- a/src/publishsubscribe/xqsettingsmanager_symbian/ccentralrepositoryhandler.cpp +++ b/src/publishsubscribe/xqsettingsmanager_symbian/ccentralrepositoryhandler.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/publishsubscribe/xqsettingsmanager_symbian/ccentralrepositoryhandler.h b/src/publishsubscribe/xqsettingsmanager_symbian/ccentralrepositoryhandler.h index 660bf56ab5..785bf3af07 100644 --- a/src/publishsubscribe/xqsettingsmanager_symbian/ccentralrepositoryhandler.h +++ b/src/publishsubscribe/xqsettingsmanager_symbian/ccentralrepositoryhandler.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/publishsubscribe/xqsettingsmanager_symbian/cenrepmonitor.cpp b/src/publishsubscribe/xqsettingsmanager_symbian/cenrepmonitor.cpp index 4ccddad572..ebcf23d1be 100644 --- a/src/publishsubscribe/xqsettingsmanager_symbian/cenrepmonitor.cpp +++ b/src/publishsubscribe/xqsettingsmanager_symbian/cenrepmonitor.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/publishsubscribe/xqsettingsmanager_symbian/cenrepmonitor.h b/src/publishsubscribe/xqsettingsmanager_symbian/cenrepmonitor.h index 7c6eb9d087..cc19b6d77c 100644 --- a/src/publishsubscribe/xqsettingsmanager_symbian/cenrepmonitor.h +++ b/src/publishsubscribe/xqsettingsmanager_symbian/cenrepmonitor.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/publishsubscribe/xqsettingsmanager_symbian/cpublishandsubscribehandler.cpp b/src/publishsubscribe/xqsettingsmanager_symbian/cpublishandsubscribehandler.cpp index 338bf7d202..4c61681429 100644 --- a/src/publishsubscribe/xqsettingsmanager_symbian/cpublishandsubscribehandler.cpp +++ b/src/publishsubscribe/xqsettingsmanager_symbian/cpublishandsubscribehandler.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/publishsubscribe/xqsettingsmanager_symbian/cpublishandsubscribehandler.h b/src/publishsubscribe/xqsettingsmanager_symbian/cpublishandsubscribehandler.h index 261815594b..c2f3508d81 100644 --- a/src/publishsubscribe/xqsettingsmanager_symbian/cpublishandsubscribehandler.h +++ b/src/publishsubscribe/xqsettingsmanager_symbian/cpublishandsubscribehandler.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/publishsubscribe/xqsettingsmanager_symbian/pubsubmonitor.cpp b/src/publishsubscribe/xqsettingsmanager_symbian/pubsubmonitor.cpp index bb5ef418cd..5fc8a23990 100644 --- a/src/publishsubscribe/xqsettingsmanager_symbian/pubsubmonitor.cpp +++ b/src/publishsubscribe/xqsettingsmanager_symbian/pubsubmonitor.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/publishsubscribe/xqsettingsmanager_symbian/pubsubmonitor.h b/src/publishsubscribe/xqsettingsmanager_symbian/pubsubmonitor.h index 74d8caeb0b..72d4b485a1 100644 --- a/src/publishsubscribe/xqsettingsmanager_symbian/pubsubmonitor.h +++ b/src/publishsubscribe/xqsettingsmanager_symbian/pubsubmonitor.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/publishsubscribe/xqsettingsmanager_symbian/settingshandlerbase.cpp b/src/publishsubscribe/xqsettingsmanager_symbian/settingshandlerbase.cpp index e55e50d5b2..193697baba 100644 --- a/src/publishsubscribe/xqsettingsmanager_symbian/settingshandlerbase.cpp +++ b/src/publishsubscribe/xqsettingsmanager_symbian/settingshandlerbase.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/publishsubscribe/xqsettingsmanager_symbian/settingshandlerbase.h b/src/publishsubscribe/xqsettingsmanager_symbian/settingshandlerbase.h index d2375aef40..3fc6288aa6 100644 --- a/src/publishsubscribe/xqsettingsmanager_symbian/settingshandlerbase.h +++ b/src/publishsubscribe/xqsettingsmanager_symbian/settingshandlerbase.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/publishsubscribe/xqsettingsmanager_symbian/settingsmanager_global.h b/src/publishsubscribe/xqsettingsmanager_symbian/settingsmanager_global.h index 8b19fac509..f574a8304b 100644 --- a/src/publishsubscribe/xqsettingsmanager_symbian/settingsmanager_global.h +++ b/src/publishsubscribe/xqsettingsmanager_symbian/settingsmanager_global.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/publishsubscribe/xqsettingsmanager_symbian/xqcentralrepositorysearchcriteria.cpp b/src/publishsubscribe/xqsettingsmanager_symbian/xqcentralrepositorysearchcriteria.cpp index 2d333a3372..82850f9874 100644 --- a/src/publishsubscribe/xqsettingsmanager_symbian/xqcentralrepositorysearchcriteria.cpp +++ b/src/publishsubscribe/xqsettingsmanager_symbian/xqcentralrepositorysearchcriteria.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/publishsubscribe/xqsettingsmanager_symbian/xqcentralrepositorysearchcriteria.h b/src/publishsubscribe/xqsettingsmanager_symbian/xqcentralrepositorysearchcriteria.h index 70155cbc33..3b4157c2b0 100644 --- a/src/publishsubscribe/xqsettingsmanager_symbian/xqcentralrepositorysearchcriteria.h +++ b/src/publishsubscribe/xqsettingsmanager_symbian/xqcentralrepositorysearchcriteria.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/publishsubscribe/xqsettingsmanager_symbian/xqcentralrepositoryutils.cpp b/src/publishsubscribe/xqsettingsmanager_symbian/xqcentralrepositoryutils.cpp index 43c28bf578..9f19a947cf 100644 --- a/src/publishsubscribe/xqsettingsmanager_symbian/xqcentralrepositoryutils.cpp +++ b/src/publishsubscribe/xqsettingsmanager_symbian/xqcentralrepositoryutils.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/publishsubscribe/xqsettingsmanager_symbian/xqcentralrepositoryutils.h b/src/publishsubscribe/xqsettingsmanager_symbian/xqcentralrepositoryutils.h index 6f2d7d850a..3d969a906b 100644 --- a/src/publishsubscribe/xqsettingsmanager_symbian/xqcentralrepositoryutils.h +++ b/src/publishsubscribe/xqsettingsmanager_symbian/xqcentralrepositoryutils.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/publishsubscribe/xqsettingsmanager_symbian/xqcentralrepositoryutils_p.cpp b/src/publishsubscribe/xqsettingsmanager_symbian/xqcentralrepositoryutils_p.cpp index 32a586a2a2..44c80e2a96 100644 --- a/src/publishsubscribe/xqsettingsmanager_symbian/xqcentralrepositoryutils_p.cpp +++ b/src/publishsubscribe/xqsettingsmanager_symbian/xqcentralrepositoryutils_p.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/publishsubscribe/xqsettingsmanager_symbian/xqcentralrepositoryutils_p.h b/src/publishsubscribe/xqsettingsmanager_symbian/xqcentralrepositoryutils_p.h index 6652c068e5..0157b09321 100644 --- a/src/publishsubscribe/xqsettingsmanager_symbian/xqcentralrepositoryutils_p.h +++ b/src/publishsubscribe/xqsettingsmanager_symbian/xqcentralrepositoryutils_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/publishsubscribe/xqsettingsmanager_symbian/xqpublishandsubscribesecuritypolicy.cpp b/src/publishsubscribe/xqsettingsmanager_symbian/xqpublishandsubscribesecuritypolicy.cpp index 7b536fcb67..d4c43e12ec 100644 --- a/src/publishsubscribe/xqsettingsmanager_symbian/xqpublishandsubscribesecuritypolicy.cpp +++ b/src/publishsubscribe/xqsettingsmanager_symbian/xqpublishandsubscribesecuritypolicy.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/publishsubscribe/xqsettingsmanager_symbian/xqpublishandsubscribesecuritypolicy.h b/src/publishsubscribe/xqsettingsmanager_symbian/xqpublishandsubscribesecuritypolicy.h index f6e6c4c8ff..e0c1cf65c2 100644 --- a/src/publishsubscribe/xqsettingsmanager_symbian/xqpublishandsubscribesecuritypolicy.h +++ b/src/publishsubscribe/xqsettingsmanager_symbian/xqpublishandsubscribesecuritypolicy.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/publishsubscribe/xqsettingsmanager_symbian/xqpublishandsubscribeutils.cpp b/src/publishsubscribe/xqsettingsmanager_symbian/xqpublishandsubscribeutils.cpp index ca33c30817..80fc786464 100644 --- a/src/publishsubscribe/xqsettingsmanager_symbian/xqpublishandsubscribeutils.cpp +++ b/src/publishsubscribe/xqsettingsmanager_symbian/xqpublishandsubscribeutils.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/publishsubscribe/xqsettingsmanager_symbian/xqpublishandsubscribeutils.h b/src/publishsubscribe/xqsettingsmanager_symbian/xqpublishandsubscribeutils.h index 0f92d91392..d54adbeeeb 100644 --- a/src/publishsubscribe/xqsettingsmanager_symbian/xqpublishandsubscribeutils.h +++ b/src/publishsubscribe/xqsettingsmanager_symbian/xqpublishandsubscribeutils.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/publishsubscribe/xqsettingsmanager_symbian/xqpublishandsubscribeutils_p.cpp b/src/publishsubscribe/xqsettingsmanager_symbian/xqpublishandsubscribeutils_p.cpp index 35726318db..07d74d5b69 100644 --- a/src/publishsubscribe/xqsettingsmanager_symbian/xqpublishandsubscribeutils_p.cpp +++ b/src/publishsubscribe/xqsettingsmanager_symbian/xqpublishandsubscribeutils_p.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/publishsubscribe/xqsettingsmanager_symbian/xqpublishandsubscribeutils_p.h b/src/publishsubscribe/xqsettingsmanager_symbian/xqpublishandsubscribeutils_p.h index 3b52a77660..dab17b7e7a 100644 --- a/src/publishsubscribe/xqsettingsmanager_symbian/xqpublishandsubscribeutils_p.h +++ b/src/publishsubscribe/xqsettingsmanager_symbian/xqpublishandsubscribeutils_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/publishsubscribe/xqsettingsmanager_symbian/xqsettingskey.cpp b/src/publishsubscribe/xqsettingsmanager_symbian/xqsettingskey.cpp index d3077b85de..3ed73bc174 100644 --- a/src/publishsubscribe/xqsettingsmanager_symbian/xqsettingskey.cpp +++ b/src/publishsubscribe/xqsettingsmanager_symbian/xqsettingskey.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/publishsubscribe/xqsettingsmanager_symbian/xqsettingskey.h b/src/publishsubscribe/xqsettingsmanager_symbian/xqsettingskey.h index b65bcef3dd..5a92398153 100644 --- a/src/publishsubscribe/xqsettingsmanager_symbian/xqsettingskey.h +++ b/src/publishsubscribe/xqsettingsmanager_symbian/xqsettingskey.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/publishsubscribe/xqsettingsmanager_symbian/xqsettingsmanager.cpp b/src/publishsubscribe/xqsettingsmanager_symbian/xqsettingsmanager.cpp index a2f344e134..12a0b41f57 100644 --- a/src/publishsubscribe/xqsettingsmanager_symbian/xqsettingsmanager.cpp +++ b/src/publishsubscribe/xqsettingsmanager_symbian/xqsettingsmanager.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/publishsubscribe/xqsettingsmanager_symbian/xqsettingsmanager.h b/src/publishsubscribe/xqsettingsmanager_symbian/xqsettingsmanager.h index 3c6e0990c7..431bb8807e 100644 --- a/src/publishsubscribe/xqsettingsmanager_symbian/xqsettingsmanager.h +++ b/src/publishsubscribe/xqsettingsmanager_symbian/xqsettingsmanager.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/publishsubscribe/xqsettingsmanager_symbian/xqsettingsmanager_p.cpp b/src/publishsubscribe/xqsettingsmanager_symbian/xqsettingsmanager_p.cpp index 240c0a0335..2d23151e75 100644 --- a/src/publishsubscribe/xqsettingsmanager_symbian/xqsettingsmanager_p.cpp +++ b/src/publishsubscribe/xqsettingsmanager_symbian/xqsettingsmanager_p.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/publishsubscribe/xqsettingsmanager_symbian/xqsettingsmanager_p.h b/src/publishsubscribe/xqsettingsmanager_symbian/xqsettingsmanager_p.h index 8da7835a34..e0d4074ad1 100644 --- a/src/publishsubscribe/xqsettingsmanager_symbian/xqsettingsmanager_p.h +++ b/src/publishsubscribe/xqsettingsmanager_symbian/xqsettingsmanager_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/s60installs/bwins/QtSystemInfou.def b/src/s60installs/bwins/QtSystemInfou.def index 679c780b18..ede72bffc8 100644 --- a/src/s60installs/bwins/QtSystemInfou.def +++ b/src/s60installs/bwins/QtSystemInfou.def @@ -120,4 +120,6 @@ EXPORTS ?networkStatus@QSystemNetworkInfo@QtMobility@@QAE?AW4NetworkStatus@12@W4NetworkMode@12@@Z @ 119 NONAME ; enum QtMobility::QSystemNetworkInfo::NetworkStatus QtMobility::QSystemNetworkInfo::networkStatus(enum QtMobility::QSystemNetworkInfo::NetworkMode)
?staticMetaObject@QSystemStorageInfo@QtMobility@@2UQMetaObject@@B @ 120 NONAME ; struct QMetaObject const QtMobility::QSystemStorageInfo::staticMetaObject
?screenSaverInhibited@QSystemScreenSaver@QtMobility@@QAE_NXZ @ 121 NONAME ; bool QtMobility::QSystemScreenSaver::screenSaverInhibited(void)
+ ?connectNotify@QSystemNetworkInfo@QtMobility@@MAEXPBD@Z @ 122 NONAME ; void QtMobility::QSystemNetworkInfo::connectNotify(char const *)
+ ?disconnectNotify@QSystemNetworkInfo@QtMobility@@MAEXPBD@Z @ 123 NONAME ; void QtMobility::QSystemNetworkInfo::disconnectNotify(char const *)
diff --git a/src/s60installs/eabi/QtSystemInfou.def b/src/s60installs/eabi/QtSystemInfou.def index c7c48c682b..2404ae4915 100644 --- a/src/s60installs/eabi/QtSystemInfou.def +++ b/src/s60installs/eabi/QtSystemInfou.def @@ -120,4 +120,6 @@ EXPORTS _ZTVN10QtMobility18QSystemScreenSaverE @ 119 NONAME
_ZTVN10QtMobility18QSystemStorageInfoE @ 120 NONAME
_ZN10QtMobility18QSystemNetworkInfo11currentModeEv @ 121 NONAME
+ _ZN10QtMobility18QSystemNetworkInfo13connectNotifyEPKc @ 122 NONAME
+ _ZN10QtMobility18QSystemNetworkInfo16disconnectNotifyEPKc @ 123 NONAME
diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro index e13369d6ff..5509044c29 100644 --- a/src/s60installs/s60installs.pro +++ b/src/s60installs/s60installs.pro @@ -8,11 +8,8 @@ symbian: { SUBDIRS = TARGET = "QtMobility" TARGET.UID3 = 0x2002AC89 - # TP preview 0.1.0 - # Beta 0.2.0 - # Final 1.0.0 - VERSION = 1.0.0 + VERSION = 1.1.0 vendorinfo = \ "; Localised Vendor name" \ diff --git a/src/sensors/make_sensor.pl b/src/sensors/make_sensor.pl index 5bf499a84e..c2b5354ecf 100755 --- a/src/sensors/make_sensor.pl +++ b/src/sensors/make_sensor.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl ############################################################################# ## -## Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +## Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ## All rights reserved. ## Contact: Nokia Corporation (qt-info@nokia.com) ## diff --git a/src/sensors/qaccelerometer.cpp b/src/sensors/qaccelerometer.cpp index f62b4617eb..cd396fe812 100644 --- a/src/sensors/qaccelerometer.cpp +++ b/src/sensors/qaccelerometer.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/sensors/qaccelerometer.h b/src/sensors/qaccelerometer.h index 2ddb14b53e..34b9b8780d 100644 --- a/src/sensors/qaccelerometer.h +++ b/src/sensors/qaccelerometer.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/sensors/qaccelerometer_p.h b/src/sensors/qaccelerometer_p.h index 59ee3dffea..9ee005f45d 100644 --- a/src/sensors/qaccelerometer_p.h +++ b/src/sensors/qaccelerometer_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/sensors/qambientlightsensor.cpp b/src/sensors/qambientlightsensor.cpp index 874596df47..ede75d4ac3 100644 --- a/src/sensors/qambientlightsensor.cpp +++ b/src/sensors/qambientlightsensor.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/sensors/qambientlightsensor.h b/src/sensors/qambientlightsensor.h index 4fd6d1a54f..f886018129 100644 --- a/src/sensors/qambientlightsensor.h +++ b/src/sensors/qambientlightsensor.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/sensors/qambientlightsensor_p.h b/src/sensors/qambientlightsensor_p.h index 17b41d5d69..4ed4219a53 100644 --- a/src/sensors/qambientlightsensor_p.h +++ b/src/sensors/qambientlightsensor_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/sensors/qcompass.cpp b/src/sensors/qcompass.cpp index 8ef4879132..1c17101996 100644 --- a/src/sensors/qcompass.cpp +++ b/src/sensors/qcompass.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/sensors/qcompass.h b/src/sensors/qcompass.h index 17e2f38a10..962fb01518 100644 --- a/src/sensors/qcompass.h +++ b/src/sensors/qcompass.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/sensors/qcompass_p.h b/src/sensors/qcompass_p.h index dc91d0c39e..11465be351 100644 --- a/src/sensors/qcompass_p.h +++ b/src/sensors/qcompass_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/sensors/qmagnetometer.cpp b/src/sensors/qmagnetometer.cpp index 2f388aa691..c1416150f4 100644 --- a/src/sensors/qmagnetometer.cpp +++ b/src/sensors/qmagnetometer.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/sensors/qmagnetometer.h b/src/sensors/qmagnetometer.h index af8801a8d3..828a12e3de 100644 --- a/src/sensors/qmagnetometer.h +++ b/src/sensors/qmagnetometer.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/sensors/qmagnetometer_p.h b/src/sensors/qmagnetometer_p.h index 96f1d640a5..f4c6a46faf 100644 --- a/src/sensors/qmagnetometer_p.h +++ b/src/sensors/qmagnetometer_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/sensors/qorientationsensor.cpp b/src/sensors/qorientationsensor.cpp index 1455e38244..d03843fab7 100644 --- a/src/sensors/qorientationsensor.cpp +++ b/src/sensors/qorientationsensor.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/sensors/qorientationsensor.h b/src/sensors/qorientationsensor.h index 1826bb73b7..b2a6db9cf5 100644 --- a/src/sensors/qorientationsensor.h +++ b/src/sensors/qorientationsensor.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/sensors/qorientationsensor_p.h b/src/sensors/qorientationsensor_p.h index 9764ce4afc..d8f43ab689 100644 --- a/src/sensors/qorientationsensor_p.h +++ b/src/sensors/qorientationsensor_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/sensors/qproximitysensor.cpp b/src/sensors/qproximitysensor.cpp index 411904307c..2818437d36 100644 --- a/src/sensors/qproximitysensor.cpp +++ b/src/sensors/qproximitysensor.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/sensors/qproximitysensor.h b/src/sensors/qproximitysensor.h index 1bfd725a83..6379b28897 100644 --- a/src/sensors/qproximitysensor.h +++ b/src/sensors/qproximitysensor.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/sensors/qproximitysensor_p.h b/src/sensors/qproximitysensor_p.h index 817c84b1c0..97c0d5271e 100644 --- a/src/sensors/qproximitysensor_p.h +++ b/src/sensors/qproximitysensor_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/sensors/qrotationsensor.cpp b/src/sensors/qrotationsensor.cpp index 0b554f763e..899af13197 100644 --- a/src/sensors/qrotationsensor.cpp +++ b/src/sensors/qrotationsensor.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/sensors/qrotationsensor.h b/src/sensors/qrotationsensor.h index 664ce724c7..887d3c9985 100644 --- a/src/sensors/qrotationsensor.h +++ b/src/sensors/qrotationsensor.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/sensors/qrotationsensor_p.h b/src/sensors/qrotationsensor_p.h index 5a8c9e2082..e0909c477c 100644 --- a/src/sensors/qrotationsensor_p.h +++ b/src/sensors/qrotationsensor_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/sensors/qsensor.cpp b/src/sensors/qsensor.cpp index 86aeb382a3..e2696825cf 100644 --- a/src/sensors/qsensor.cpp +++ b/src/sensors/qsensor.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/sensors/qsensor.h b/src/sensors/qsensor.h index ee802867f6..98becb078e 100644 --- a/src/sensors/qsensor.h +++ b/src/sensors/qsensor.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/sensors/qsensor_p.h b/src/sensors/qsensor_p.h index bfd56ae68c..f8421a3a74 100644 --- a/src/sensors/qsensor_p.h +++ b/src/sensors/qsensor_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/sensors/qsensorbackend.cpp b/src/sensors/qsensorbackend.cpp index b4c89d53df..e790b8486b 100644 --- a/src/sensors/qsensorbackend.cpp +++ b/src/sensors/qsensorbackend.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/sensors/qsensorbackend.h b/src/sensors/qsensorbackend.h index d234666517..d3c9b18598 100644 --- a/src/sensors/qsensorbackend.h +++ b/src/sensors/qsensorbackend.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/sensors/qsensormanager.cpp b/src/sensors/qsensormanager.cpp index 4e7baa0707..ef1982bc11 100644 --- a/src/sensors/qsensormanager.cpp +++ b/src/sensors/qsensormanager.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/sensors/qsensormanager.h b/src/sensors/qsensormanager.h index 7e803b188e..a8e1d72598 100644 --- a/src/sensors/qsensormanager.h +++ b/src/sensors/qsensormanager.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/sensors/qsensorplugin.cpp b/src/sensors/qsensorplugin.cpp index 3846a2e410..d860710ead 100644 --- a/src/sensors/qsensorplugin.cpp +++ b/src/sensors/qsensorplugin.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/sensors/qsensorplugin.h b/src/sensors/qsensorplugin.h index 454e507d15..694e2efbe1 100644 --- a/src/sensors/qsensorplugin.h +++ b/src/sensors/qsensorplugin.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/sensors/qsensorpluginloader.cpp b/src/sensors/qsensorpluginloader.cpp index 996ed6ecfd..8a2b9f1d8e 100644 --- a/src/sensors/qsensorpluginloader.cpp +++ b/src/sensors/qsensorpluginloader.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/sensors/qsensorpluginloader_p.h b/src/sensors/qsensorpluginloader_p.h index 8e49073988..7007f40e90 100644 --- a/src/sensors/qsensorpluginloader_p.h +++ b/src/sensors/qsensorpluginloader_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/sensors/qtapsensor.cpp b/src/sensors/qtapsensor.cpp index 907d0558bb..666af088eb 100644 --- a/src/sensors/qtapsensor.cpp +++ b/src/sensors/qtapsensor.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -59,7 +59,7 @@ IMPLEMENT_READING(QTapReading) \image sensors-coordinates2.jpg - By default it returns double tap events. The QTapSensor::returnDoubleTapEvents property + By default it returns only double tap events. The QTapSensor::returnDoubleTapEvents property must be set to false to return individual tap events. */ @@ -186,8 +186,11 @@ const char *QTapSensor::type("QTapSensor"); \property QTapSensor::returnDoubleTapEvents \brief a value indicating if double tap events should be reported. - Set to true (the default) to have the sensor report on double tap events. - Set to false to have the sensor report on individual tap events. + Set to true (the default) to have the sensor report only on double tap events. + Set to false to have the sensor report only on individual tap events. + + It is not possible to have the sensor report both single and double tap events. + If both are needed the app should create 2 sensor objects. Note that you must access this property via QObject::property() and QObject::setProperty(). The property must be set before calling start(). diff --git a/src/sensors/qtapsensor.h b/src/sensors/qtapsensor.h index baafe6cd2f..b27f2ddf38 100644 --- a/src/sensors/qtapsensor.h +++ b/src/sensors/qtapsensor.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/sensors/qtapsensor_p.h b/src/sensors/qtapsensor_p.h index 85919675d7..e21fdcaab7 100644 --- a/src/sensors/qtapsensor_p.h +++ b/src/sensors/qtapsensor_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/sensors/sensorlog_p.h b/src/sensors/sensorlog_p.h index 9684cd0e39..f614cb472c 100644 --- a/src/sensors/sensorlog_p.h +++ b/src/sensors/sensorlog_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/serviceframework/databasemanager.cpp b/src/serviceframework/databasemanager.cpp index c5e6d8dc0a..411ad632fe 100644 --- a/src/serviceframework/databasemanager.cpp +++ b/src/serviceframework/databasemanager.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/serviceframework/databasemanager_p.h b/src/serviceframework/databasemanager_p.h index c0dab91be6..2c483aee13 100644 --- a/src/serviceframework/databasemanager_p.h +++ b/src/serviceframework/databasemanager_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/serviceframework/databasemanager_s60.cpp b/src/serviceframework/databasemanager_s60.cpp index 0ce4c0b2b3..6a7c48f4c7 100644 --- a/src/serviceframework/databasemanager_s60.cpp +++ b/src/serviceframework/databasemanager_s60.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -529,7 +529,7 @@ QTM_BEGIN_NAMESPACE __ASSERT_ALWAYS(dbManagerServer != NULL, CDatabaseManagerServer::PanicServer(ESrvCreateServer)); TInt err = dbManagerServer->Start(KDatabaseManagerServerName); - if (err != KErrNone) + if (err != KErrNone && err != KErrAlreadyExists) { CDatabaseManagerServer::PanicServer(ESvrStartServer); } diff --git a/src/serviceframework/databasemanager_s60_p.h b/src/serviceframework/databasemanager_s60_p.h index 1d478932a7..6ce5ef928e 100644 --- a/src/serviceframework/databasemanager_s60_p.h +++ b/src/serviceframework/databasemanager_s60_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/serviceframework/dberror.cpp b/src/serviceframework/dberror.cpp index cfbf36699b..b0d436b831 100644 --- a/src/serviceframework/dberror.cpp +++ b/src/serviceframework/dberror.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/serviceframework/dberror_p.h b/src/serviceframework/dberror_p.h index 8903b11bfe..7115ef7cde 100644 --- a/src/serviceframework/dberror_p.h +++ b/src/serviceframework/dberror_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/serviceframework/qabstractsecuritysession.cpp b/src/serviceframework/qabstractsecuritysession.cpp index 1c17b7622f..918494b7dd 100644 --- a/src/serviceframework/qabstractsecuritysession.cpp +++ b/src/serviceframework/qabstractsecuritysession.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/serviceframework/qabstractsecuritysession.h b/src/serviceframework/qabstractsecuritysession.h index 0f9968df09..4683ada6bc 100644 --- a/src/serviceframework/qabstractsecuritysession.h +++ b/src/serviceframework/qabstractsecuritysession.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/serviceframework/qservice.h b/src/serviceframework/qservice.h index 47902840d2..2525a72cd9 100644 --- a/src/serviceframework/qservice.h +++ b/src/serviceframework/qservice.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/serviceframework/qservice.qdoc b/src/serviceframework/qservice.qdoc index 5bbb35d06d..bc2d030f25 100644 --- a/src/serviceframework/qservice.qdoc +++ b/src/serviceframework/qservice.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/serviceframework/qservicecontext.cpp b/src/serviceframework/qservicecontext.cpp index becb7c409e..5419830494 100644 --- a/src/serviceframework/qservicecontext.cpp +++ b/src/serviceframework/qservicecontext.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/serviceframework/qservicecontext.h b/src/serviceframework/qservicecontext.h index 8412917d81..6511227972 100644 --- a/src/serviceframework/qservicecontext.h +++ b/src/serviceframework/qservicecontext.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/serviceframework/qservicefilter.cpp b/src/serviceframework/qservicefilter.cpp index 6044e15c50..598429b11e 100644 --- a/src/serviceframework/qservicefilter.cpp +++ b/src/serviceframework/qservicefilter.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/serviceframework/qservicefilter.h b/src/serviceframework/qservicefilter.h index f8f14f54b2..9c4f72a16c 100644 --- a/src/serviceframework/qservicefilter.h +++ b/src/serviceframework/qservicefilter.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/serviceframework/qserviceinterfacedescriptor.cpp b/src/serviceframework/qserviceinterfacedescriptor.cpp index a9b38f7723..7ee0045881 100644 --- a/src/serviceframework/qserviceinterfacedescriptor.cpp +++ b/src/serviceframework/qserviceinterfacedescriptor.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/serviceframework/qserviceinterfacedescriptor.h b/src/serviceframework/qserviceinterfacedescriptor.h index 3e657ca660..d07bb701fb 100644 --- a/src/serviceframework/qserviceinterfacedescriptor.h +++ b/src/serviceframework/qserviceinterfacedescriptor.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/serviceframework/qserviceinterfacedescriptor_p.h b/src/serviceframework/qserviceinterfacedescriptor_p.h index 0ef54c977d..f3979748b6 100644 --- a/src/serviceframework/qserviceinterfacedescriptor_p.h +++ b/src/serviceframework/qserviceinterfacedescriptor_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/serviceframework/qservicemanager.cpp b/src/serviceframework/qservicemanager.cpp index 968979fd08..ddf4e85adc 100644 --- a/src/serviceframework/qservicemanager.cpp +++ b/src/serviceframework/qservicemanager.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -63,7 +63,10 @@ static QString qservicemanager_resolveLibraryPath(const QString &libNameOrPath) return libNameOrPath; // try to find plug-in via QLibrary - const QStringList paths = QCoreApplication::libraryPaths(); + QStringList paths = QCoreApplication::libraryPaths(); +#ifdef QTM_PLUGIN_PATH + paths << QLatin1String(QTM_PLUGIN_PATH)+QLatin1String("/serviceframework"); +#endif for (int i=0; i<paths.count(); i++) { QString libPath = QDir::toNativeSeparators(paths[i]) + QDir::separator() + libNameOrPath; diff --git a/src/serviceframework/qservicemanager.h b/src/serviceframework/qservicemanager.h index d27748a14b..e770de1cde 100644 --- a/src/serviceframework/qservicemanager.h +++ b/src/serviceframework/qservicemanager.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/serviceframework/qserviceplugininterface.cpp b/src/serviceframework/qserviceplugininterface.cpp index b08c50f75f..f41b57e59c 100644 --- a/src/serviceframework/qserviceplugininterface.cpp +++ b/src/serviceframework/qserviceplugininterface.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/serviceframework/qserviceplugininterface.h b/src/serviceframework/qserviceplugininterface.h index 35b9ebebcc..d9bc095c87 100644 --- a/src/serviceframework/qserviceplugininterface.h +++ b/src/serviceframework/qserviceplugininterface.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/serviceframework/servicedatabase.cpp b/src/serviceframework/servicedatabase.cpp index 3e37d7ee8b..b540f200a4 100644 --- a/src/serviceframework/servicedatabase.cpp +++ b/src/serviceframework/servicedatabase.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/serviceframework/servicedatabase_p.h b/src/serviceframework/servicedatabase_p.h index 42915bf6d9..b8d9abcdde 100644 --- a/src/serviceframework/servicedatabase_p.h +++ b/src/serviceframework/servicedatabase_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/serviceframework/servicemetadata.cpp b/src/serviceframework/servicemetadata.cpp index 476f054aeb..760de70d50 100644 --- a/src/serviceframework/servicemetadata.cpp +++ b/src/serviceframework/servicemetadata.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/serviceframework/servicemetadata_p.h b/src/serviceframework/servicemetadata_p.h index 81a374f97f..09fc9b1958 100644 --- a/src/serviceframework/servicemetadata_p.h +++ b/src/serviceframework/servicemetadata_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/serviceframework/symbian/clientservercommon.h b/src/serviceframework/symbian/clientservercommon.h index 313d5ffb91..2d1176dfc8 100644 --- a/src/serviceframework/symbian/clientservercommon.h +++ b/src/serviceframework/symbian/clientservercommon.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/serviceframework/symbian/databasemanagerserver.cpp b/src/serviceframework/symbian/databasemanagerserver.cpp index b894fe8c90..a818a64985 100644 --- a/src/serviceframework/symbian/databasemanagerserver.cpp +++ b/src/serviceframework/symbian/databasemanagerserver.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/serviceframework/symbian/databasemanagerserver.h b/src/serviceframework/symbian/databasemanagerserver.h index 36b0ad15b5..9716a76d74 100644 --- a/src/serviceframework/symbian/databasemanagerserver.h +++ b/src/serviceframework/symbian/databasemanagerserver.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/serviceframework/symbian/databasemanagerserver.pan b/src/serviceframework/symbian/databasemanagerserver.pan index 9750a379a2..8a0feaed4b 100644 --- a/src/serviceframework/symbian/databasemanagerserver.pan +++ b/src/serviceframework/symbian/databasemanagerserver.pan @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/serviceframework/symbian/databasemanagerserver_global.h b/src/serviceframework/symbian/databasemanagerserver_global.h index f8984adbec..b66079b5dd 100644 --- a/src/serviceframework/symbian/databasemanagerserver_global.h +++ b/src/serviceframework/symbian/databasemanagerserver_global.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/serviceframework/symbian/databasemanagersession.cpp b/src/serviceframework/symbian/databasemanagersession.cpp index 5c2fe85023..a20630bb82 100644 --- a/src/serviceframework/symbian/databasemanagersession.cpp +++ b/src/serviceframework/symbian/databasemanagersession.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/serviceframework/symbian/databasemanagersession.h b/src/serviceframework/symbian/databasemanagersession.h index 35f2ddcd7a..b820ec80c4 100644 --- a/src/serviceframework/symbian/databasemanagersession.h +++ b/src/serviceframework/symbian/databasemanagersession.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/serviceframework/symbian/databasemanagersignalhandler.cpp b/src/serviceframework/symbian/databasemanagersignalhandler.cpp index 178fb2cc6a..a9ef84b2bd 100644 --- a/src/serviceframework/symbian/databasemanagersignalhandler.cpp +++ b/src/serviceframework/symbian/databasemanagersignalhandler.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/serviceframework/symbian/databasemanagersignalhandler.h b/src/serviceframework/symbian/databasemanagersignalhandler.h index 7b31188718..0dec3c0f85 100644 --- a/src/serviceframework/symbian/databasemanagersignalhandler.h +++ b/src/serviceframework/symbian/databasemanagersignalhandler.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/serviceframework/symbian/exe/databasemanagerservermain.cpp b/src/serviceframework/symbian/exe/databasemanagerservermain.cpp index 83dbc74021..21999fa0d1 100644 --- a/src/serviceframework/symbian/exe/databasemanagerservermain.cpp +++ b/src/serviceframework/symbian/exe/databasemanagerservermain.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/systeminfo/qhalservice_linux.cpp b/src/systeminfo/qhalservice_linux.cpp index da12d308bd..328f6bfacc 100644 --- a/src/systeminfo/qhalservice_linux.cpp +++ b/src/systeminfo/qhalservice_linux.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/systeminfo/qhalservice_linux_p.h b/src/systeminfo/qhalservice_linux_p.h index 3c15fc7a04..37c0c6d81b 100644 --- a/src/systeminfo/qhalservice_linux_p.h +++ b/src/systeminfo/qhalservice_linux_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/systeminfo/qnetworkmanagerservice_linux.cpp b/src/systeminfo/qnetworkmanagerservice_linux.cpp index 88a1da0304..7b3c92ce17 100644 --- a/src/systeminfo/qnetworkmanagerservice_linux.cpp +++ b/src/systeminfo/qnetworkmanagerservice_linux.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/systeminfo/qnetworkmanagerservice_linux_p.h b/src/systeminfo/qnetworkmanagerservice_linux_p.h index 8a41e28088..90f1487a5e 100644 --- a/src/systeminfo/qnetworkmanagerservice_linux_p.h +++ b/src/systeminfo/qnetworkmanagerservice_linux_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/systeminfo/qnmdbushelper.cpp b/src/systeminfo/qnmdbushelper.cpp index 4b81705473..37fcf29d64 100644 --- a/src/systeminfo/qnmdbushelper.cpp +++ b/src/systeminfo/qnmdbushelper.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/systeminfo/qnmdbushelper_p.h b/src/systeminfo/qnmdbushelper_p.h index d527b68974..0e5e291638 100644 --- a/src/systeminfo/qnmdbushelper_p.h +++ b/src/systeminfo/qnmdbushelper_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/systeminfo/qsysteminfo.cpp b/src/systeminfo/qsysteminfo.cpp index de4cb0008b..ee8ab33403 100644 --- a/src/systeminfo/qsysteminfo.cpp +++ b/src/systeminfo/qsysteminfo.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -229,14 +229,14 @@ information from the system. /*! \fn void QSystemDeviceInfo::powerStateChanged(QSystemDeviceInfo::PowerState state) - This signal is emitted when the power state has changed, such as when a phone gets plugged qint32o the wall. + This signal is emitted when the power state has changed, such as when a phone gets plugged in to the wall. \a state is the new power state. */ /*! \fn void QSystemDeviceInfo::currentProfileChanged(QSystemDeviceInfo::Profile profile) - This signal is emitted whenever the network profile changes, specified by \a profile. + This signal is emitted whenever the users active profile changes, specified by \a profile. */ diff --git a/src/systeminfo/qsysteminfo.h b/src/systeminfo/qsysteminfo.h index 0f909388b4..91d6d1c34b 100644 --- a/src/systeminfo/qsysteminfo.h +++ b/src/systeminfo/qsysteminfo.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/systeminfo/qsysteminfo_linux.cpp b/src/systeminfo/qsysteminfo_linux.cpp index 90a3ff6d8d..2973f14f26 100644 --- a/src/systeminfo/qsysteminfo_linux.cpp +++ b/src/systeminfo/qsysteminfo_linux.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/systeminfo/qsysteminfo_linux_common.cpp b/src/systeminfo/qsysteminfo_linux_common.cpp index 489b012da0..24adb84472 100644 --- a/src/systeminfo/qsysteminfo_linux_common.cpp +++ b/src/systeminfo/qsysteminfo_linux_common.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -44,7 +44,7 @@ #include <QDir> #if !defined(QT_NO_DBUS) -#include <qhalservice_linux_p.h> +#include "qhalservice_linux_p.h" #include <QtDBus/QtDBus> #include <QtDBus/QDBusConnection> #include <QtDBus/QDBusError> @@ -191,16 +191,7 @@ bool QSystemInfoLinuxCommonPrivate::hasFeatureSupported(QSystemInfo::Feature fea break; case QSystemInfo::FmradioFeature : { - const QString sysPath = "/sys/class/video4linux/"; - const QDir sysDir(sysPath); - QStringList filters; - filters << "*"; - QStringList sysList = sysDir.entryList( filters ,QDir::Dirs, QDir::Name); - foreach(const QString dir, sysList) { - if (dir.contains("radio")) { - featureSupported = true; - } - } + featureSupported = !(QDir("/sys/class/video4linux/").entryList(QStringList("radio*")).empty()); } break; case QSystemInfo::IrFeature : @@ -284,14 +275,7 @@ bool QSystemInfoLinuxCommonPrivate::hasFeatureSupported(QSystemInfo::Feature fea break; case QSystemInfo::VideoOutFeature : { - const QString sysPath = "/sys/class/video4linux/"; - const QDir sysDir(sysPath); - QStringList filters; - filters << "*"; - const QStringList sysList = sysDir.entryList( filters ,QDir::Dirs, QDir::Name); - if(sysList.contains("video")) { - featureSupported = true; - } + featureSupported = !(QDir("/sys/class/video4linux/").entryList(QStringList("video*")).empty()); } break; case QSystemInfo::HapticsFeature: diff --git a/src/systeminfo/qsysteminfo_linux_common_p.h b/src/systeminfo/qsysteminfo_linux_common_p.h index ef1d5a668b..188c1840d2 100644 --- a/src/systeminfo/qsysteminfo_linux_common_p.h +++ b/src/systeminfo/qsysteminfo_linux_common_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -61,7 +61,7 @@ #include "qsysteminfo.h" #include <qmobilityglobal.h> #if !defined(QT_NO_DBUS) -#include <qhalservice_linux_p.h> +#include "qhalservice_linux_p.h" #endif QT_BEGIN_HEADER diff --git a/src/systeminfo/qsysteminfo_linux_p.h b/src/systeminfo/qsysteminfo_linux_p.h index b3014b7155..d191e6f5bd 100644 --- a/src/systeminfo/qsysteminfo_linux_p.h +++ b/src/systeminfo/qsysteminfo_linux_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/systeminfo/qsysteminfo_mac.mm b/src/systeminfo/qsysteminfo_mac.mm index f1184e0ad6..2c1d19895b 100644 --- a/src/systeminfo/qsysteminfo_mac.mm +++ b/src/systeminfo/qsysteminfo_mac.mm @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/systeminfo/qsysteminfo_mac_p.h b/src/systeminfo/qsysteminfo_mac_p.h index 3fdb834b97..322f551cea 100644 --- a/src/systeminfo/qsysteminfo_mac_p.h +++ b/src/systeminfo/qsysteminfo_mac_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/systeminfo/qsysteminfo_maemo.cpp b/src/systeminfo/qsysteminfo_maemo.cpp index 6b2772370b..c7d599b7c2 100644 --- a/src/systeminfo/qsysteminfo_maemo.cpp +++ b/src/systeminfo/qsysteminfo_maemo.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -38,8 +38,9 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include <qsysteminfo.h> -#include <qsysteminfo_maemo_p.h> +#include "qsysteminfo.h" +#include "qsysteminfo_maemo_p.h" + #include <QStringList> #include <QSize> #include <QFile> @@ -166,18 +167,6 @@ bool QSystemInfoPrivate::hasFeatureSupported(QSystemInfo::Feature feature) } } break; - case QSystemInfo::VideoOutFeature : - { - const QString sysPath = "/sys/class/video4linux/"; - const QDir sysDir(sysPath); - QStringList filters; - filters << "*"; - const QStringList sysList = sysDir.entryList( filters ,QDir::Dirs, QDir::Name); - if(sysList.contains("video0")) { - featureSupported = true; - } - } - break; case QSystemInfo::HapticsFeature: { // if(halIsAvailable) { @@ -1023,23 +1012,23 @@ void QSystemDeviceInfoPrivate::deviceModeChanged(QString newMode) emit currentProfileChanged(currentProfile()); } -void QSystemDeviceInfoPrivate::profileChanged(bool, bool, QString profile, QList<ProfileDataValue> values) +void QSystemDeviceInfoPrivate::profileChanged(bool changed, bool active, QString profile, QList<ProfileDataValue> values) { - const QSystemDeviceInfo::Profile previousProfile = currentProfile(); - - profileName = profile; - foreach (const ProfileDataValue value, values) { - if (value.key == "ringing.alert.type") - silentProfile = value.val == "silent"; - else if (value.key == "vibrating.alert.enabled") - vibratingAlertEnabled = value.val == "On"; - else if (value.key == "ringing.alert.volume") - ringingAlertVolume = value.val.toInt(); + if (active) { + const QSystemDeviceInfo::Profile previousProfile = currentProfile(); + profileName = profile; + foreach (const ProfileDataValue value, values) { + if (value.key == "ringing.alert.type") + silentProfile = value.val == "silent"; + else if (value.key == "vibrating.alert.enabled") + vibratingAlertEnabled = value.val == "On"; + else if (value.key == "ringing.alert.volume") + ringingAlertVolume = value.val.toInt(); + } + QSystemDeviceInfo::Profile newProfile = currentProfile(); + if (previousProfile != newProfile) + emit currentProfileChanged(newProfile); } - - QSystemDeviceInfo::Profile newProfile = currentProfile(); - if (previousProfile != newProfile) - emit currentProfileChanged(newProfile); } #endif diff --git a/src/systeminfo/qsysteminfo_maemo_p.h b/src/systeminfo/qsysteminfo_maemo_p.h index 9a8081088c..e6258ad17d 100644 --- a/src/systeminfo/qsysteminfo_maemo_p.h +++ b/src/systeminfo/qsysteminfo_maemo_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -62,7 +62,7 @@ #include "qsysteminfo.h" #include <qmobilityglobal.h> #if !defined(QT_NO_DBUS) -#include <qhalservice_linux_p.h> +#include "qhalservice_linux_p.h" typedef enum { diff --git a/src/systeminfo/qsysteminfo_s60.cpp b/src/systeminfo/qsysteminfo_s60.cpp index 3b75e42d56..493b46d570 100644 --- a/src/systeminfo/qsysteminfo_s60.cpp +++ b/src/systeminfo/qsysteminfo_s60.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/systeminfo/qsysteminfo_s60_p.h b/src/systeminfo/qsysteminfo_s60_p.h index b8bd7e34c3..7230ee4e1b 100644 --- a/src/systeminfo/qsysteminfo_s60_p.h +++ b/src/systeminfo/qsysteminfo_s60_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/systeminfo/qsysteminfo_win.cpp b/src/systeminfo/qsysteminfo_win.cpp index 67db5900cb..1bbaa972bd 100644 --- a/src/systeminfo/qsysteminfo_win.cpp +++ b/src/systeminfo/qsysteminfo_win.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/systeminfo/qsysteminfo_win_p.h b/src/systeminfo/qsysteminfo_win_p.h index 7de41f2edb..331a420abe 100644 --- a/src/systeminfo/qsysteminfo_win_p.h +++ b/src/systeminfo/qsysteminfo_win_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/systeminfo/qwmihelper_win.cpp b/src/systeminfo/qwmihelper_win.cpp index a3f57d86ec..a570d9ffef 100644 --- a/src/systeminfo/qwmihelper_win.cpp +++ b/src/systeminfo/qwmihelper_win.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/systeminfo/qwmihelper_win_p.h b/src/systeminfo/qwmihelper_win_p.h index 52689b2ef4..93b495bb75 100644 --- a/src/systeminfo/qwmihelper_win_p.h +++ b/src/systeminfo/qwmihelper_win_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/systeminfo/symbian/chargingstatus_s60.cpp b/src/systeminfo/symbian/chargingstatus_s60.cpp index 31d0e7ab6b..c8a1b09cf1 100644 --- a/src/systeminfo/symbian/chargingstatus_s60.cpp +++ b/src/systeminfo/symbian/chargingstatus_s60.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/systeminfo/symbian/chargingstatus_s60.h b/src/systeminfo/symbian/chargingstatus_s60.h index aa99d38c6d..0ddfb11cf8 100644 --- a/src/systeminfo/symbian/chargingstatus_s60.h +++ b/src/systeminfo/symbian/chargingstatus_s60.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/systeminfo/symbian/telephonyinfo_s60.cpp b/src/systeminfo/symbian/telephonyinfo_s60.cpp index b2ba01cb16..5696937209 100644 --- a/src/systeminfo/symbian/telephonyinfo_s60.cpp +++ b/src/systeminfo/symbian/telephonyinfo_s60.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/systeminfo/symbian/telephonyinfo_s60.h b/src/systeminfo/symbian/telephonyinfo_s60.h index 19696f039a..63df518491 100644 --- a/src/systeminfo/symbian/telephonyinfo_s60.h +++ b/src/systeminfo/symbian/telephonyinfo_s60.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/versit/qvcard21writer.cpp b/src/versit/qvcard21writer.cpp index 07fb9f52f3..360ba95267 100644 --- a/src/versit/qvcard21writer.cpp +++ b/src/versit/qvcard21writer.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/versit/qvcard21writer_p.h b/src/versit/qvcard21writer_p.h index 022d23d16f..479d135995 100644 --- a/src/versit/qvcard21writer_p.h +++ b/src/versit/qvcard21writer_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/versit/qvcard30writer.cpp b/src/versit/qvcard30writer.cpp index 2253bb37fc..a3e011519a 100644 --- a/src/versit/qvcard30writer.cpp +++ b/src/versit/qvcard30writer.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/versit/qvcard30writer_p.h b/src/versit/qvcard30writer_p.h index 77453145c1..0040ea6407 100644 --- a/src/versit/qvcard30writer_p.h +++ b/src/versit/qvcard30writer_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/versit/qversitcontactexporter.cpp b/src/versit/qversitcontactexporter.cpp index 9198e5d7a1..d3bad26569 100644 --- a/src/versit/qversitcontactexporter.cpp +++ b/src/versit/qversitcontactexporter.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/versit/qversitcontactexporter.h b/src/versit/qversitcontactexporter.h index cc3d8cea4e..a2ac12e739 100644 --- a/src/versit/qversitcontactexporter.h +++ b/src/versit/qversitcontactexporter.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/versit/qversitcontactexporter_p.cpp b/src/versit/qversitcontactexporter_p.cpp index 0cd6eda073..cda1eaa4d0 100644 --- a/src/versit/qversitcontactexporter_p.cpp +++ b/src/versit/qversitcontactexporter_p.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/versit/qversitcontactexporter_p.h b/src/versit/qversitcontactexporter_p.h index 90baa20199..1d784b2974 100644 --- a/src/versit/qversitcontactexporter_p.h +++ b/src/versit/qversitcontactexporter_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/versit/qversitcontactimporter.cpp b/src/versit/qversitcontactimporter.cpp index 4098f797e0..3fe3b226c8 100644 --- a/src/versit/qversitcontactimporter.cpp +++ b/src/versit/qversitcontactimporter.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/versit/qversitcontactimporter.h b/src/versit/qversitcontactimporter.h index ab0f883a1c..b2a51df03d 100644 --- a/src/versit/qversitcontactimporter.h +++ b/src/versit/qversitcontactimporter.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/versit/qversitcontactimporter_p.cpp b/src/versit/qversitcontactimporter_p.cpp index 5c5e41465c..0c908a109c 100644 --- a/src/versit/qversitcontactimporter_p.cpp +++ b/src/versit/qversitcontactimporter_p.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/versit/qversitcontactimporter_p.h b/src/versit/qversitcontactimporter_p.h index afd66c756d..6fe1e3f63f 100644 --- a/src/versit/qversitcontactimporter_p.h +++ b/src/versit/qversitcontactimporter_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/versit/qversitdefs_p.h b/src/versit/qversitdefs_p.h index 36e727969f..7d05192442 100644 --- a/src/versit/qversitdefs_p.h +++ b/src/versit/qversitdefs_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/versit/qversitdocument.cpp b/src/versit/qversitdocument.cpp index 42a88d2084..de7d3de2a0 100644 --- a/src/versit/qversitdocument.cpp +++ b/src/versit/qversitdocument.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/versit/qversitdocument.h b/src/versit/qversitdocument.h index 93bc475198..2e555cff44 100644 --- a/src/versit/qversitdocument.h +++ b/src/versit/qversitdocument.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/versit/qversitdocument_p.h b/src/versit/qversitdocument_p.h index 7129f9cb70..0f26ec69b3 100644 --- a/src/versit/qversitdocument_p.h +++ b/src/versit/qversitdocument_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/versit/qversitdocumentwriter_p.cpp b/src/versit/qversitdocumentwriter_p.cpp index 661d753c44..4e8a1aaa2a 100644 --- a/src/versit/qversitdocumentwriter_p.cpp +++ b/src/versit/qversitdocumentwriter_p.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/versit/qversitproperty.cpp b/src/versit/qversitproperty.cpp index 94b95d5c76..3513d303ee 100644 --- a/src/versit/qversitproperty.cpp +++ b/src/versit/qversitproperty.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/versit/qversitproperty.h b/src/versit/qversitproperty.h index ae482bb165..48994a5b48 100644 --- a/src/versit/qversitproperty.h +++ b/src/versit/qversitproperty.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/versit/qversitproperty_p.h b/src/versit/qversitproperty_p.h index 81422e61ed..4ac0d0b6d7 100644 --- a/src/versit/qversitproperty_p.h +++ b/src/versit/qversitproperty_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/versit/qversitreader.cpp b/src/versit/qversitreader.cpp index f2d7934dbb..4eefadf726 100644 --- a/src/versit/qversitreader.cpp +++ b/src/versit/qversitreader.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/versit/qversitreader.h b/src/versit/qversitreader.h index 405cdebbfc..d7f16a7c96 100644 --- a/src/versit/qversitreader.h +++ b/src/versit/qversitreader.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/versit/qversitreader_p.cpp b/src/versit/qversitreader_p.cpp index 87b55b287f..06811478f8 100644 --- a/src/versit/qversitreader_p.cpp +++ b/src/versit/qversitreader_p.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/versit/qversitreader_p.h b/src/versit/qversitreader_p.h index 128ca25463..ec830cbec4 100644 --- a/src/versit/qversitreader_p.h +++ b/src/versit/qversitreader_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/versit/qversitwriter.cpp b/src/versit/qversitwriter.cpp index 9a3aee953f..180056501a 100644 --- a/src/versit/qversitwriter.cpp +++ b/src/versit/qversitwriter.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/versit/qversitwriter.h b/src/versit/qversitwriter.h index d6bb01cce3..26f29a7c7f 100644 --- a/src/versit/qversitwriter.h +++ b/src/versit/qversitwriter.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/versit/qversitwriter_p.cpp b/src/versit/qversitwriter_p.cpp index ad6bee8522..5e91fb2d6f 100644 --- a/src/versit/qversitwriter_p.cpp +++ b/src/versit/qversitwriter_p.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/versit/qversitwriter_p.h b/src/versit/qversitwriter_p.h index 70908d78b3..1fd3d49a1f 100644 --- a/src/versit/qversitwriter_p.h +++ b/src/versit/qversitwriter_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/versit/versitutils.cpp b/src/versit/versitutils.cpp index 9542d031fc..4384b40e47 100644 --- a/src/versit/versitutils.cpp +++ b/src/versit/versitutils.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/versit/versitutils_p.h b/src/versit/versitutils_p.h index 8299903dcd..25eb88a4b0 100644 --- a/src/versit/versitutils_p.h +++ b/src/versit/versitutils_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/databasemanager/tst_databasemanager.cpp b/tests/auto/databasemanager/tst_databasemanager.cpp index f38855a850..af4e01bce3 100644 --- a/tests/auto/databasemanager/tst_databasemanager.cpp +++ b/tests/auto/databasemanager/tst_databasemanager.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/databasemanager/tst_databasemanager_s60.cpp b/tests/auto/databasemanager/tst_databasemanager_s60.cpp index 4837ac22ab..ed61d9496c 100644 --- a/tests/auto/databasemanager/tst_databasemanager_s60.cpp +++ b/tests/auto/databasemanager/tst_databasemanager_s60.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qabstractsecuritysession/tst_qabstractsecuritysession.cpp b/tests/auto/qabstractsecuritysession/tst_qabstractsecuritysession.cpp index c08f7f8b16..ce03ed4bb2 100644 --- a/tests/auto/qabstractsecuritysession/tst_qabstractsecuritysession.cpp +++ b/tests/auto/qabstractsecuritysession/tst_qabstractsecuritysession.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qaudiocapturesource/tst_qaudiocapturesource.cpp b/tests/auto/qaudiocapturesource/tst_qaudiocapturesource.cpp index f1a42e4f52..c11a9eb328 100644 --- a/tests/auto/qaudiocapturesource/tst_qaudiocapturesource.cpp +++ b/tests/auto/qaudiocapturesource/tst_qaudiocapturesource.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qbearertestcommon.h b/tests/auto/qbearertestcommon.h index e4626b6b08..55d7a04f9f 100644 --- a/tests/auto/qbearertestcommon.h +++ b/tests/auto/qbearertestcommon.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qcontact/tst_qcontact.cpp b/tests/auto/qcontact/tst_qcontact.cpp index 210dd33901..ed4975b7a7 100644 --- a/tests/auto/qcontact/tst_qcontact.cpp +++ b/tests/auto/qcontact/tst_qcontact.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qcontactasync/maliciousplugin/maliciousplugin.cpp b/tests/auto/qcontactasync/maliciousplugin/maliciousplugin.cpp index 11b5d4cd7f..5e71315261 100644 --- a/tests/auto/qcontactasync/maliciousplugin/maliciousplugin.cpp +++ b/tests/auto/qcontactasync/maliciousplugin/maliciousplugin.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qcontactasync/maliciousplugin/maliciousplugin_p.h b/tests/auto/qcontactasync/maliciousplugin/maliciousplugin_p.h index 3a9786a4d8..6df7fa7602 100644 --- a/tests/auto/qcontactasync/maliciousplugin/maliciousplugin_p.h +++ b/tests/auto/qcontactasync/maliciousplugin/maliciousplugin_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qcontactasync/unittest/tst_qcontactasync.cpp b/tests/auto/qcontactasync/unittest/tst_qcontactasync.cpp index 8e30bcb1dc..d95f79fbe9 100644 --- a/tests/auto/qcontactasync/unittest/tst_qcontactasync.cpp +++ b/tests/auto/qcontactasync/unittest/tst_qcontactasync.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qcontactdetail/tst_qcontactdetail.cpp b/tests/auto/qcontactdetail/tst_qcontactdetail.cpp index fc5b62c91b..d2fdeb4e40 100644 --- a/tests/auto/qcontactdetail/tst_qcontactdetail.cpp +++ b/tests/auto/qcontactdetail/tst_qcontactdetail.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qcontactdetaildefinition/tst_qcontactdetaildefinition.cpp b/tests/auto/qcontactdetaildefinition/tst_qcontactdetaildefinition.cpp index c591919ac9..d7c6aa5283 100644 --- a/tests/auto/qcontactdetaildefinition/tst_qcontactdetaildefinition.cpp +++ b/tests/auto/qcontactdetaildefinition/tst_qcontactdetaildefinition.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qcontactdetails/tst_qcontactdetails.cpp b/tests/auto/qcontactdetails/tst_qcontactdetails.cpp index 7f4cfc3344..16848c0f49 100644 --- a/tests/auto/qcontactdetails/tst_qcontactdetails.cpp +++ b/tests/auto/qcontactdetails/tst_qcontactdetails.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qcontactfilter/tst_qcontactfilter.cpp b/tests/auto/qcontactfilter/tst_qcontactfilter.cpp index 8f13da4bf4..e3bff37d82 100644 --- a/tests/auto/qcontactfilter/tst_qcontactfilter.cpp +++ b/tests/auto/qcontactfilter/tst_qcontactfilter.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qcontactmanager/tst_qcontactmanager.cpp b/tests/auto/qcontactmanager/tst_qcontactmanager.cpp index 22837538bf..835c0767f1 100644 --- a/tests/auto/qcontactmanager/tst_qcontactmanager.cpp +++ b/tests/auto/qcontactmanager/tst_qcontactmanager.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qcontactmanagerdataholder.h b/tests/auto/qcontactmanagerdataholder.h index e20398806b..f584ed2569 100644 --- a/tests/auto/qcontactmanagerdataholder.h +++ b/tests/auto/qcontactmanagerdataholder.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qcontactmanagerfiltering/tst_qcontactmanagerfiltering.cpp b/tests/auto/qcontactmanagerfiltering/tst_qcontactmanagerfiltering.cpp index 1cf5c43b6f..8f95c34584 100644 --- a/tests/auto/qcontactmanagerfiltering/tst_qcontactmanagerfiltering.cpp +++ b/tests/auto/qcontactmanagerfiltering/tst_qcontactmanagerfiltering.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qcontactmanagerplugins/dummyotherplugin/dummyotherplugin.cpp b/tests/auto/qcontactmanagerplugins/dummyotherplugin/dummyotherplugin.cpp index 519e266fd9..63359f475a 100644 --- a/tests/auto/qcontactmanagerplugins/dummyotherplugin/dummyotherplugin.cpp +++ b/tests/auto/qcontactmanagerplugins/dummyotherplugin/dummyotherplugin.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qcontactmanagerplugins/dummyplugin/dummyplugin.cpp b/tests/auto/qcontactmanagerplugins/dummyplugin/dummyplugin.cpp index b53b3114ee..10abd20c92 100644 --- a/tests/auto/qcontactmanagerplugins/dummyplugin/dummyplugin.cpp +++ b/tests/auto/qcontactmanagerplugins/dummyplugin/dummyplugin.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qcontactmanagerplugins/unittest/tst_qcontactmanagerplugins.cpp b/tests/auto/qcontactmanagerplugins/unittest/tst_qcontactmanagerplugins.cpp index aba096844e..5c83c6f5c8 100644 --- a/tests/auto/qcontactmanagerplugins/unittest/tst_qcontactmanagerplugins.cpp +++ b/tests/auto/qcontactmanagerplugins/unittest/tst_qcontactmanagerplugins.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qcontactmemusage/tst_qcontactmemusage.cpp b/tests/auto/qcontactmemusage/tst_qcontactmemusage.cpp index 4961023dcf..80d61102b8 100644 --- a/tests/auto/qcontactmemusage/tst_qcontactmemusage.cpp +++ b/tests/auto/qcontactmemusage/tst_qcontactmemusage.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qcontactrelationship/tst_qcontactrelationship.cpp b/tests/auto/qcontactrelationship/tst_qcontactrelationship.cpp index 8a5d9df715..4672fcac95 100644 --- a/tests/auto/qcontactrelationship/tst_qcontactrelationship.cpp +++ b/tests/auto/qcontactrelationship/tst_qcontactrelationship.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qcrmlparser/tst_qcrmlparser.cpp b/tests/auto/qcrmlparser/tst_qcrmlparser.cpp index 505c0892cc..9a697bf19e 100644 --- a/tests/auto/qcrmlparser/tst_qcrmlparser.cpp +++ b/tests/auto/qcrmlparser/tst_qcrmlparser.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qgeoareamonitor/tst_qgeoareamonitor.cpp b/tests/auto/qgeoareamonitor/tst_qgeoareamonitor.cpp index 9b6dfd73be..0bcab28482 100644 --- a/tests/auto/qgeoareamonitor/tst_qgeoareamonitor.cpp +++ b/tests/auto/qgeoareamonitor/tst_qgeoareamonitor.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qgeocoordinate/tst_qgeocoordinate.cpp b/tests/auto/qgeocoordinate/tst_qgeocoordinate.cpp index cd9a50207f..f1fca9e4d4 100644 --- a/tests/auto/qgeocoordinate/tst_qgeocoordinate.cpp +++ b/tests/auto/qgeocoordinate/tst_qgeocoordinate.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qgeoinfosources_wince/tst_qgeoinfosources_wince.cpp b/tests/auto/qgeoinfosources_wince/tst_qgeoinfosources_wince.cpp index b5e8496f0e..1f50423ad8 100644 --- a/tests/auto/qgeoinfosources_wince/tst_qgeoinfosources_wince.cpp +++ b/tests/auto/qgeoinfosources_wince/tst_qgeoinfosources_wince.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qgeopositioninfo/tst_qgeopositioninfo.cpp b/tests/auto/qgeopositioninfo/tst_qgeopositioninfo.cpp index 37973c5569..238920893e 100644 --- a/tests/auto/qgeopositioninfo/tst_qgeopositioninfo.cpp +++ b/tests/auto/qgeopositioninfo/tst_qgeopositioninfo.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qgeopositioninfosource/tst_qgeopositioninfosource.cpp b/tests/auto/qgeopositioninfosource/tst_qgeopositioninfosource.cpp index a1abd9fd85..ac96e39508 100644 --- a/tests/auto/qgeopositioninfosource/tst_qgeopositioninfosource.cpp +++ b/tests/auto/qgeopositioninfosource/tst_qgeopositioninfosource.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qgeosatelliteinfo/tst_qgeosatelliteinfo.cpp b/tests/auto/qgeosatelliteinfo/tst_qgeosatelliteinfo.cpp index 8cbabdf466..0731930abb 100644 --- a/tests/auto/qgeosatelliteinfo/tst_qgeosatelliteinfo.cpp +++ b/tests/auto/qgeosatelliteinfo/tst_qgeosatelliteinfo.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qgeosatelliteinfosource/tst_qgeosatelliteinfosource.cpp b/tests/auto/qgeosatelliteinfosource/tst_qgeosatelliteinfosource.cpp index 576313974b..ad62a49f0a 100644 --- a/tests/auto/qgeosatelliteinfosource/tst_qgeosatelliteinfosource.cpp +++ b/tests/auto/qgeosatelliteinfosource/tst_qgeosatelliteinfosource.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp b/tests/auto/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp index 05c533f249..bfd1bfe707 100644 --- a/tests/auto/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp +++ b/tests/auto/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qlatin1constant/tst_qlatin1constant.cpp b/tests/auto/qlatin1constant/tst_qlatin1constant.cpp index d7598126d0..37a16a6223 100644 --- a/tests/auto/qlatin1constant/tst_qlatin1constant.cpp +++ b/tests/auto/qlatin1constant/tst_qlatin1constant.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qlocationtestutils.cpp b/tests/auto/qlocationtestutils.cpp index f0f2aa1e99..53f09b1104 100644 --- a/tests/auto/qlocationtestutils.cpp +++ b/tests/auto/qlocationtestutils.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qlocationtestutils_p.h b/tests/auto/qlocationtestutils_p.h index 662ee01ff0..3da2d609aa 100644 --- a/tests/auto/qlocationtestutils_p.h +++ b/tests/auto/qlocationtestutils_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qlocationutils/tst_qlocationutils.cpp b/tests/auto/qlocationutils/tst_qlocationutils.cpp index 417aabe318..895a222655 100644 --- a/tests/auto/qlocationutils/tst_qlocationutils.cpp +++ b/tests/auto/qlocationutils/tst_qlocationutils.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qmallocpool/tst_qmallocpool.cpp b/tests/auto/qmallocpool/tst_qmallocpool.cpp index a7b34cb02a..b3752afbda 100644 --- a/tests/auto/qmallocpool/tst_qmallocpool.cpp +++ b/tests/auto/qmallocpool/tst_qmallocpool.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qmediacontent/tst_qmediacontent.cpp b/tests/auto/qmediacontent/tst_qmediacontent.cpp index cd01c30571..d365673f4c 100644 --- a/tests/auto/qmediacontent/tst_qmediacontent.cpp +++ b/tests/auto/qmediacontent/tst_qmediacontent.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qmediaimageviewer/tst_qmediaimageviewer.cpp b/tests/auto/qmediaimageviewer/tst_qmediaimageviewer.cpp index 26d04ab484..8dd45e18aa 100644 --- a/tests/auto/qmediaimageviewer/tst_qmediaimageviewer.cpp +++ b/tests/auto/qmediaimageviewer/tst_qmediaimageviewer.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qmediaobject/tst_qmediaobject.cpp b/tests/auto/qmediaobject/tst_qmediaobject.cpp index 237fb24ba6..9d729f1ed9 100644 --- a/tests/auto/qmediaobject/tst_qmediaobject.cpp +++ b/tests/auto/qmediaobject/tst_qmediaobject.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qmediaplayer/tst_qmediaplayer.cpp b/tests/auto/qmediaplayer/tst_qmediaplayer.cpp index b9053c3a25..5ac875a135 100644 --- a/tests/auto/qmediaplayer/tst_qmediaplayer.cpp +++ b/tests/auto/qmediaplayer/tst_qmediaplayer.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qmediaplaylist/tst_qmediaplaylist.cpp b/tests/auto/qmediaplaylist/tst_qmediaplaylist.cpp index ed8d4e2711..72ff0f44ab 100644 --- a/tests/auto/qmediaplaylist/tst_qmediaplaylist.cpp +++ b/tests/auto/qmediaplaylist/tst_qmediaplaylist.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qmediaplaylistnavigator/tst_qmediaplaylistnavigator.cpp b/tests/auto/qmediaplaylistnavigator/tst_qmediaplaylistnavigator.cpp index d3d7a85a6d..d67d2f70ea 100644 --- a/tests/auto/qmediaplaylistnavigator/tst_qmediaplaylistnavigator.cpp +++ b/tests/auto/qmediaplaylistnavigator/tst_qmediaplaylistnavigator.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qmediapluginloader/tst_qmediapluginloader.cpp b/tests/auto/qmediapluginloader/tst_qmediapluginloader.cpp index 3ed9aa10f8..3251a49d77 100644 --- a/tests/auto/qmediapluginloader/tst_qmediapluginloader.cpp +++ b/tests/auto/qmediapluginloader/tst_qmediapluginloader.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qmediarecorder/tst_qmediarecorder.cpp b/tests/auto/qmediarecorder/tst_qmediarecorder.cpp index e238614dfe..fbfc57f32a 100644 --- a/tests/auto/qmediarecorder/tst_qmediarecorder.cpp +++ b/tests/auto/qmediarecorder/tst_qmediarecorder.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qmediaresource/tst_qmediaresource.cpp b/tests/auto/qmediaresource/tst_qmediaresource.cpp index fd7b485db8..9486fcea52 100644 --- a/tests/auto/qmediaresource/tst_qmediaresource.cpp +++ b/tests/auto/qmediaresource/tst_qmediaresource.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qmediaservice/tst_qmediaservice.cpp b/tests/auto/qmediaservice/tst_qmediaservice.cpp index 510d3b28b1..5f77cab5a2 100644 --- a/tests/auto/qmediaservice/tst_qmediaservice.cpp +++ b/tests/auto/qmediaservice/tst_qmediaservice.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qmediaserviceprovider/tst_qmediaserviceprovider.cpp b/tests/auto/qmediaserviceprovider/tst_qmediaserviceprovider.cpp index 1f6de51052..744512562c 100644 --- a/tests/auto/qmediaserviceprovider/tst_qmediaserviceprovider.cpp +++ b/tests/auto/qmediaserviceprovider/tst_qmediaserviceprovider.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qmediatimerange/tst_qmediatimerange.cpp b/tests/auto/qmediatimerange/tst_qmediatimerange.cpp index 7b0efd2f61..cc65a752de 100644 --- a/tests/auto/qmediatimerange/tst_qmediatimerange.cpp +++ b/tests/auto/qmediatimerange/tst_qmediatimerange.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qmessage/tst_qmessage.cpp b/tests/auto/qmessage/tst_qmessage.cpp index 41fc3398fa..edf8b60728 100644 --- a/tests/auto/qmessage/tst_qmessage.cpp +++ b/tests/auto/qmessage/tst_qmessage.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qmessageservice/tst_qmessageservice.cpp b/tests/auto/qmessageservice/tst_qmessageservice.cpp index 86ff094cff..8f380726f1 100644 --- a/tests/auto/qmessageservice/tst_qmessageservice.cpp +++ b/tests/auto/qmessageservice/tst_qmessageservice.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qmessagestore/tst_qmessagestore.cpp b/tests/auto/qmessagestore/tst_qmessagestore.cpp index 850694e5a7..cda80a3784 100644 --- a/tests/auto/qmessagestore/tst_qmessagestore.cpp +++ b/tests/auto/qmessagestore/tst_qmessagestore.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qmessagestorekeys/tst_qmessagestorekeys.cpp b/tests/auto/qmessagestorekeys/tst_qmessagestorekeys.cpp index ee24740979..d3c6a3bebd 100644 --- a/tests/auto/qmessagestorekeys/tst_qmessagestorekeys.cpp +++ b/tests/auto/qmessagestorekeys/tst_qmessagestorekeys.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qnetworkconfiguration/tst_qnetworkconfiguration.cpp b/tests/auto/qnetworkconfiguration/tst_qnetworkconfiguration.cpp index 3995459f3a..6da8d60644 100644 --- a/tests/auto/qnetworkconfiguration/tst_qnetworkconfiguration.cpp +++ b/tests/auto/qnetworkconfiguration/tst_qnetworkconfiguration.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -44,6 +44,13 @@ #include "../../../src/bearer/qnetworkconfiguration.h" #include "../../../src/bearer/qnetworkconfigmanager.h" +/* + Although this unit test doesn't use QNetworkAccessManager + this include is used to ensure that bearer continues to compile against + Qt 4.7+ which has a QNetworkConfiguration enabled QNetworkAccessManager +*/ +#include <QNetworkAccessManager> + #if defined(Q_WS_MAEMO_6) || defined(Q_WS_MAEMO_5) #include <stdio.h> #include <iapconf.h> diff --git a/tests/auto/qnetworksession/lackey/main.cpp b/tests/auto/qnetworksession/lackey/main.cpp index a92f449928..9ed8f2cdf5 100644 --- a/tests/auto/qnetworksession/lackey/main.cpp +++ b/tests/auto/qnetworksession/lackey/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -46,6 +46,8 @@ #include "../../../../src/bearer/qnetworkconfiguration.h" #include "../../../../src/bearer/qnetworksession.h" +#include <QEventLoop> +#include <QTimer> #include <QDebug> QTM_USE_NAMESPACE @@ -59,7 +61,14 @@ int main(int argc, char** argv) { QCoreApplication app(argc, argv); + // Update configurations so that everything is up to date for this process too. + // Event loop is used to wait for awhile. QNetworkConfigurationManager manager; + manager.updateConfigurations(); + QEventLoop iIgnoreEventLoop; + QTimer::singleShot(3000, &iIgnoreEventLoop, SLOT(quit())); + iIgnoreEventLoop.exec(); + QList<QNetworkConfiguration> discovered = manager.allConfigurations(QNetworkConfiguration::Discovered); @@ -75,7 +84,6 @@ int main(int argc, char** argv) // Cannot read/write to processes on WinCE or Symbian. // Easiest alternative is to use sockets for IPC. - QLocalSocket oopSocket; oopSocket.connectToServer("tst_qnetworksession"); diff --git a/tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.cpp b/tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.cpp index 376d81b287..4cb0d9c2a8 100644 --- a/tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.cpp +++ b/tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.cpp @@ -1,5 +1,5 @@ /**************************************************************************** -** +** ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) @@ -96,6 +96,7 @@ private slots: private: QNetworkConfigurationManager manager; + QMap<QString, bool> testsToRun; uint inProcessSessionManagementCount; @@ -113,6 +114,7 @@ private: bool openSession(QNetworkSession *session); bool closeSession(QNetworkSession *session, bool lastSessionOnConfiguration = true); void updateConfigurations(); +void printConfigurations(); QNetworkConfiguration suitableConfiguration(QString bearerType, QNetworkConfiguration::Type configType); void tst_QNetworkSession::initTestCase() @@ -121,7 +123,19 @@ void tst_QNetworkSession::initTestCase() qRegisterMetaType<QNetworkSession::SessionError>("QNetworkSession::SessionError"); qRegisterMetaType<QNetworkConfiguration>("QNetworkConfiguration"); qRegisterMetaType<QNetworkConfiguration::Type>("QNetworkConfiguration::Type"); - + + // If you wish to skip tests, set value as false. This is often very convinient because tests are so lengthy. + // Better way still would be to make this readable from a file. + testsToRun["robustnessBombing"] = true; + testsToRun["outOfProcessSession"] = true; + testsToRun["invalidSession"] = true; + testsToRun["repeatedOpenClose"] = true; + testsToRun["roamingErrorCodes"] = true; + testsToRun["sessionStop"] = true; + testsToRun["sessionProperties"] = true; + testsToRun["userChoiceSession"] = true; + testsToRun["sessionOpenCloseStop"] = true; + #if defined(Q_WS_MAEMO_6) || defined(Q_WS_MAEMO_5) iapconf = new Maemo::IAPConf("007"); iapconf->setValue("ipv4_type", "AUTO"); @@ -234,6 +248,10 @@ void tst_QNetworkSession::cleanupTestCase() // Robustness test for calling interfaces in nonsense order / with nonsense parameters void tst_QNetworkSession::robustnessBombing() { + if (!testsToRun["robustnessBombing"]) { + QSKIP("Temporary skip due to value set false (or it is missing) in testsToRun map", SkipAll); + } + QNetworkConfigurationManager mgr; QNetworkSession testSession(mgr.defaultConfiguration()); // Should not reset even session is not opened @@ -241,15 +259,14 @@ void tst_QNetworkSession::robustnessBombing() testSession.accept(); testSession.ignore(); testSession.reject(); - quint64 temp; - temp = testSession.bytesWritten(); - temp = testSession.bytesReceived(); - temp = testSession.activeTime(); } void tst_QNetworkSession::invalidSession() -{ +{ + if (!testsToRun["invalidSession"]) { + QSKIP("Temporary skip due to value set false (or it is missing) in testsToRun map", SkipAll); + } // 1. Verify that session created with invalid configuration remains in invalid state QNetworkSession session(QNetworkConfiguration(), 0); QVERIFY(!session.isOpen()); @@ -264,11 +281,24 @@ void tst_QNetworkSession::invalidSession() qvariant_cast<QNetworkSession::SessionError> (errorSpy.first().at(0)); QVERIFY(error == QNetworkSession::InvalidConfigurationError); QVERIFY(session.state() == QNetworkSession::Invalid); - + #ifdef QNETWORKSESSION_MANUAL_TESTS + + QNetworkConfiguration invalidatedConfig = suitableConfiguration("WLAN",QNetworkConfiguration::InternetAccessPoint); + if (invalidatedConfig.isValid()) { + // 3. Verify that invalidating a session after its successfully configured works + QNetworkSession invalidatedSession(invalidatedConfig); + qDebug() << "Delete the WLAN IAP from phone now (waiting 60 seconds): " << invalidatedConfig.name(); + QTest::qWait(60000); + QVERIFY(!invalidatedConfig.isValid()); + QVERIFY(invalidatedSession.state() == QNetworkSession::Invalid); + qDebug() << "Add the WLAN IAP back (waiting 60 seconds): " << invalidatedConfig.name(); + QTest::qWait(60000); + } + QNetworkConfiguration definedConfig = suitableConfiguration("WLAN",QNetworkConfiguration::InternetAccessPoint); if (definedConfig.isValid()) { - // 3. Verify that opening a session with defined configuration emits error and enters notavailable-state + // 4. Verify that opening a session with defined configuration emits error and enters notavailable-state // TODO these timer waits should be changed to waiting appropriate signals, now these wait excessively qDebug() << "Shutdown WLAN IAP (waiting 60 seconds): " << definedConfig.name(); QTest::qWait(60000); @@ -277,43 +307,27 @@ void tst_QNetworkSession::invalidSession() QNetworkSession definedSession(definedConfig); QSignalSpy errorSpy(&definedSession, SIGNAL(error(QNetworkSession::SessionError))); QNetworkSession::SessionError sessionError; + updateConfigurations(); definedSession.open(); +#ifdef Q_OS_SYMBIAN + // On symbian, the connection opening is tried even with defined state. + qDebug("Waiting for 10 seconds to all signals to propagate."); + QTest::qWait(10000); +#endif + updateConfigurations(); QVERIFY(definedConfig.isValid()); // Session remains valid QVERIFY(definedSession.state() == QNetworkSession::NotAvailable); // State is not available because WLAN is not in coverage QVERIFY(!errorSpy.isEmpty()); // Session tells with error about invalidated configuration sessionError = qvariant_cast<QNetworkSession::SessionError> (errorSpy.first().at(0)); - qDebug() << "Error code is: " << sessionError; QVERIFY(sessionError == QNetworkSession::InvalidConfigurationError); - qDebug() << "Turn the WLAN IAP back on (waiting 60 seconds): " << definedConfig.name(); QTest::qWait(60000); - updateConfigurations(); - + updateConfigurations(); QVERIFY(definedConfig.state() == QNetworkConfiguration::Discovered); } - - QNetworkConfiguration invalidatedConfig = suitableConfiguration("WLAN",QNetworkConfiguration::InternetAccessPoint); - if (invalidatedConfig.isValid()) { - // 4. Verify that invalidating a session after its successfully configured works - QNetworkSession invalidatedSession(invalidatedConfig); - QSignalSpy errorSpy(&invalidatedSession, SIGNAL(error(QNetworkSession::SessionError))); - QNetworkSession::SessionError sessionError; - - qDebug() << "Delete the WLAN IAP from phone now (waiting 60 seconds): " << invalidatedConfig.name(); - QTest::qWait(60000); - - invalidatedSession.open(); - QVERIFY(!invalidatedConfig.isValid()); - QVERIFY(invalidatedSession.state() == QNetworkSession::Invalid); - QVERIFY(!errorSpy.isEmpty()); - - sessionError = qvariant_cast<QNetworkSession::SessionError> (errorSpy.first().at(0)); - QVERIFY(sessionError == QNetworkSession::InvalidConfigurationError); - qDebug() << "Add the WLAN IAP back (waiting 60 seconds): " << invalidatedConfig.name(); - QTest::qWait(60000); - } + #endif } @@ -331,12 +345,12 @@ void tst_QNetworkSession::sessionProperties_data() void tst_QNetworkSession::sessionProperties() { + if (!testsToRun["sessionProperties"]) { + QSKIP("Temporary skip due to value set false (or it is missing) in testsToRun map", SkipAll); + } QFETCH(QNetworkConfiguration, configuration); - QNetworkSession session(configuration); - QVERIFY(session.configuration() == configuration); - QStringList validBearerNames = QStringList() << QLatin1String("Unknown") << QLatin1String("Ethernet") << QLatin1String("WLAN") @@ -407,7 +421,12 @@ void tst_QNetworkSession::repeatedOpenClose_data() { } // Tests repeated-open close. -void tst_QNetworkSession::repeatedOpenClose() { +void tst_QNetworkSession::repeatedOpenClose() +{ + if (!testsToRun["repeatedOpenClose"]) { + QSKIP("Temporary skip due to value set false (or it is missing) in testsToRun map", SkipAll); + } + QFETCH(QString, bearerType); QFETCH(QNetworkConfiguration::Type, configurationType); QFETCH(int, repeatTimes); @@ -423,13 +442,20 @@ void tst_QNetworkSession::repeatedOpenClose() { !closeSession(&permanentSession)) { QSKIP("Unable to open/close session, skipping this round of repeated open-close test.", SkipSingle); } - for (int i = repeatTimes; i > 0; i--) { + for (int i = 0; i < repeatTimes; i++) { + qDebug() << "Opening, loop number " << i; QVERIFY(openSession(&permanentSession)); + qDebug() << "Closing, loop number, then waiting 5 seconds: " << i; QVERIFY(closeSession(&permanentSession)); + QTest::qWait(5000); } } -void tst_QNetworkSession::roamingErrorCodes() { +void tst_QNetworkSession::roamingErrorCodes() +{ + if (!testsToRun["roamingErrorCodes"]) { + QSKIP("Temporary skip due to value set false (or it is missing) in testsToRun map", SkipAll); + } #ifndef Q_OS_SYMBIAN QSKIP("Roaming supported on Symbian.", SkipAll); #else @@ -453,41 +479,11 @@ void tst_QNetworkSession::roamingErrorCodes() { adminIapSession.stop(); // requires NetworkControl capabilities QTRY_VERIFY(!errorSpy.isEmpty()); // wait for error signals QNetworkSession::SessionError error = qvariant_cast<QNetworkSession::SessionError>(errorSpy.first().at(0)); + QTest::qWait(2000); // Wait for a moment to all platform signals to propagate QVERIFY(error == QNetworkSession::SessionAbortedError); QVERIFY(iapSession.state() == QNetworkSession::Disconnected); QVERIFY(adminIapSession.state() == QNetworkSession::Disconnected); #endif // Q_OS_SYMBIAN - -#ifdef QNETWORKSESSION_MANUAL_TESTS - // Check for roaming error. - // Case requires that you have controllable WLAN in Internet SNAP (only). - QNetworkConfiguration snapConfig = suitableConfiguration("bearer_not_relevant_with_snaps", QNetworkConfiguration::ServiceNetwork); - if (!snapConfig.isValid()) { - QSKIP("No SNAP accessible, skipping test.", SkipAll); - } - QNetworkSession snapSession(snapConfig); - QVERIFY(openSession(&snapSession)); - QSignalSpy errorSpySnap(&snapSession, SIGNAL(error(QNetworkSession::SessionError))); - qDebug("Disconnect the WLAN now"); - QTRY_VERIFY(!errorSpySnap.isEmpty()); // wait for error signals - QVERIFY(errorSpySnap.count() == 1); - error = qvariant_cast<QNetworkSession::SessionError>(errorSpySnap.first().at(0)); - qDebug() << "Error received when turning off wlan on SNAP: " << error; - QVERIFY(error == QNetworkSession::RoamingError); - - qDebug("Connect the WLAN now"); - QTest::qWait(60000); // Wait for WLAN to get up - QNetworkConfiguration wlanIapConfig2 = suitableConfiguration("WLAN", QNetworkConfiguration::InternetAccessPoint); - QNetworkSession iapSession2(wlanIapConfig2); - QVERIFY(openSession(&iapSession2)); - QSignalSpy errorSpy2(&iapSession2, SIGNAL(error(QNetworkSession::SessionError))); - qDebug("Disconnect the WLAN now"); - QTRY_VERIFY(!errorSpy2.isEmpty()); // wait for error signals - QVERIFY(errorSpy2.count() == 1); - error = qvariant_cast<QNetworkSession::SessionError>(errorSpy2.first().at(0)); - QVERIFY(error == QNetworkSession::SessionAbortedError); - QVERIFY(iapSession2.state() == QNetworkSession::Disconnected); -#endif } @@ -502,6 +498,9 @@ void tst_QNetworkSession::sessionStop_data() { void tst_QNetworkSession::sessionStop() { + if (!testsToRun["sessionStop"]) { + QSKIP("Temporary skip due to value set false (or it is missing) in testsToRun map", SkipAll); + } #ifndef Q_OS_SYMBIAN QSKIP("Testcase contains mainly Symbian specific checks, because it is only platform to really support interface (IAP-level) Stop.", SkipAll); #endif @@ -509,6 +508,9 @@ void tst_QNetworkSession::sessionStop() QFETCH(QNetworkConfiguration::Type, configurationType); int configWaitdelayInMs = 2000; + + updateConfigurations(); + printConfigurations(); QNetworkConfiguration config = suitableConfiguration(bearerType, configurationType); if (!config.isValid()) { @@ -526,6 +528,9 @@ void tst_QNetworkSession::sessionStop() QSignalSpy closedSessionStateChangedSpy(&closedSession, SIGNAL(stateChanged(QNetworkSession::State))); QSignalSpy closedErrorSpy(&closedSession, SIGNAL(error(QNetworkSession::SessionError))); + QSignalSpy openedSessionClosedSpy(&openedSession, SIGNAL(closed())); + QSignalSpy openedSessionStateChangedSpy(&openedSession, SIGNAL(stateChanged(QNetworkSession::State))); + QSignalSpy innocentSessionClosedSpy(&innocentSession, SIGNAL(closed())); QSignalSpy innocentSessionStateChangedSpy(&innocentSession, SIGNAL(stateChanged(QNetworkSession::State))); QSignalSpy innocentErrorSpy(&innocentSession, SIGNAL(error(QNetworkSession::SessionError))); @@ -541,10 +546,18 @@ void tst_QNetworkSession::sessionStop() closedSessionClosedSpy.clear(); closedSessionStateChangedSpy.clear(); closedErrorSpy.clear(); + openedSessionStateChangedSpy.clear(); + openedSessionClosedSpy.clear(); + openedSession.stop(); - QVERIFY(openedSession.state() == QNetworkSession::Disconnected); + qDebug("Waiting for %d ms to get all configurationChange signals from platform.", configWaitdelayInMs); QTest::qWait(configWaitdelayInMs); // Wait to get all relevant configurationChange() signals + + // First to closing, then to disconnected + QVERIFY(openedSessionStateChangedSpy.count() == 2); + QVERIFY(!openedSessionClosedSpy.isEmpty()); + QVERIFY(openedSession.state() == QNetworkSession::Disconnected); QVERIFY(config.state() != QNetworkConfiguration::Active); // 2. Verify that stopping a session based on non-connected configuration does nothing @@ -570,18 +583,20 @@ void tst_QNetworkSession::sessionStop() // 3. Check that stopping a opened session affects also other opened session based on the same configuration. if (config.type() == QNetworkConfiguration::InternetAccessPoint) { qDebug("----------3. Check that stopping a opened session affects also other opened session based on the same configuration."); + QVERIFY(openSession(&openedSession)); QVERIFY(openSession(&innocentSession)); - + configChangeSpy.clear(); innocentSessionClosedSpy.clear(); innocentSessionStateChangedSpy.clear(); innocentErrorSpy.clear(); - + openedSession.stop(); qDebug("Waiting for %d ms to get all configurationChange signals from platform.", configWaitdelayInMs); QTest::qWait(configWaitdelayInMs); // Wait to get all relevant configurationChange() signals - + QTest::qWait(configWaitdelayInMs); // Wait to get all relevant configurationChange() signals + QVERIFY(!innocentSessionClosedSpy.isEmpty()); QVERIFY(!innocentSessionStateChangedSpy.isEmpty()); QVERIFY(!innocentErrorSpy.isEmpty()); @@ -601,14 +616,19 @@ void tst_QNetworkSession::sessionStop() if (config.type() == QNetworkConfiguration::ServiceNetwork) { qDebug("----------4. Skip for SNAP configuration."); } else if (config.type() == QNetworkConfiguration::InternetAccessPoint) { - qDebug("----------4. Check that stopping a non-opened session stops the other session based on the same configuration"); - QVERIFY(openSession(&innocentSession)); + qDebug("----------4. Check that stopping a non-opened session stops the other session based on the same configuration"); + qDebug("----------4.1 Opening innocent session"); + QVERIFY(openSession(&innocentSession)); qDebug("Waiting for %d ms after open to make sure all platform indications are propagated", configWaitdelayInMs); QTest::qWait(configWaitdelayInMs); + qDebug("----------4.2 Calling closedSession.stop()"); closedSession.stop(); qDebug("Waiting for %d ms to get all configurationChange signals from platform..", configWaitdelayInMs); QTest::qWait(configWaitdelayInMs); // Wait to get all relevant configurationChange() signals + QTest::qWait(configWaitdelayInMs); + QTest::qWait(configWaitdelayInMs); + QVERIFY(!innocentSessionClosedSpy.isEmpty()); QVERIFY(!innocentSessionStateChangedSpy.isEmpty()); QVERIFY(!innocentErrorSpy.isEmpty()); @@ -640,6 +660,9 @@ void tst_QNetworkSession::userChoiceSession_data() void tst_QNetworkSession::userChoiceSession() { + if (!testsToRun["userChoiceSession"]) { + QSKIP("Temporary skip due to value set false (or it is missing) in testsToRun map", SkipAll); + } QFETCH(QNetworkConfiguration, configuration); QVERIFY(configuration.type() == QNetworkConfiguration::UserChoice); @@ -669,7 +692,20 @@ void tst_QNetworkSession::userChoiceSession() session.open(); +#if defined(Q_OS_SYMBIAN) + // Opening & closing multiple connections in a row sometimes + // results hanging of connection opening on Symbian devices + // => If first open fails, wait a moment and try again. + if (!session.waitForOpened()) { + qDebug("**** Session open Timeout - Wait 5 seconds and try once again ****"); + session.close(); + QTest::qWait(5000); // Wait a while before trying to open session again + session.open(); + session.waitForOpened(); + } +#else session.waitForOpened(); +#endif if (session.isOpen()) QVERIFY(!sessionOpenedSpy.isEmpty() || !errorSpy.isEmpty()); @@ -769,6 +805,9 @@ void tst_QNetworkSession::sessionOpenCloseStop_data() void tst_QNetworkSession::sessionOpenCloseStop() { + if (!testsToRun["sessionOpenCloseStop"]) { + QSKIP("Temporary skip due to value set false (or it is missing) in testsToRun map", SkipAll); + } QFETCH(QNetworkConfiguration, configuration); QFETCH(bool, forceSessionStop); @@ -801,7 +840,20 @@ void tst_QNetworkSession::sessionOpenCloseStop() session.open(); +#if defined(Q_OS_SYMBIAN) + // Opening & closing multiple connections in a row sometimes + // results hanging of connection opening on Symbian devices + // => If first open fails, wait a moment and try again. + if (!session.waitForOpened()) { + qDebug("**** Session open Timeout - Wait 5 seconds and try once again ****"); + session.close(); + QTest::qWait(5000); // Wait a while before trying to open session again + session.open(); + session.waitForOpened(); + } +#else session.waitForOpened(); +#endif if (session.isOpen()) QVERIFY(!sessionOpenedSpy.isEmpty() || !errorSpy.isEmpty()); @@ -875,24 +927,28 @@ void tst_QNetworkSession::sessionOpenCloseStop() QVERIFY(session.error() == QNetworkSession::UnknownSessionError); session2.open(); - + QTRY_VERIFY(!sessionOpenedSpy2.isEmpty() || !errorSpy2.isEmpty()); + if (errorSpy2.isEmpty()) { + QVERIFY(session2.isOpen()); + QVERIFY(session2.state() == QNetworkSession::Connected); + } QVERIFY(session.isOpen()); - QVERIFY(session2.isOpen()); QVERIFY(session.state() == QNetworkSession::Connected); - QVERIFY(session2.state() == QNetworkSession::Connected); #if !(defined(Q_OS_SYMBIAN) && defined(__WINS__)) // On Symbian emulator, the support for data bearers is limited QVERIFY(session.interface().isValid()); #endif - QCOMPARE(session.interface().hardwareAddress(), session2.interface().hardwareAddress()); - QCOMPARE(session.interface().index(), session2.interface().index()); + if (errorSpy2.isEmpty()) { + QCOMPARE(session.interface().hardwareAddress(), session2.interface().hardwareAddress()); + QCOMPARE(session.interface().index(), session2.interface().index()); + } } sessionOpenedSpy2.clear(); - if (forceSessionStop) { + if (forceSessionStop && session2.isOpen()) { // Test forcing the second session to stop the interface. QNetworkSession::State previousState = session.state(); #ifdef Q_CC_NOKIAX86 @@ -901,15 +957,17 @@ void tst_QNetworkSession::sessionOpenCloseStop() #else bool expectStateChange = previousState != QNetworkSession::Disconnected; #endif - session2.stop(); + // QNetworkSession::stop() must result either closed() signal + // or error() signal QTRY_VERIFY(!sessionClosedSpy2.isEmpty() || !errorSpy2.isEmpty()); - QVERIFY(!session2.isOpen()); if (!errorSpy2.isEmpty()) { - QVERIFY(!errorSpy.isEmpty()); + // QNetworkSession::stop() resulted error() signal for session2 + // => also session should emit error() signal + QTRY_VERIFY(!errorSpy.isEmpty()); // check for SessionAbortedError QNetworkSession::SessionError error = @@ -929,9 +987,12 @@ void tst_QNetworkSession::sessionOpenCloseStop() QVERIFY(errorSpy.isEmpty()); QVERIFY(errorSpy2.isEmpty()); - + + // Wait for Disconnected state + QTRY_NOOP(session2.state() == QNetworkSession::Disconnected); + if (expectStateChange) - QTRY_VERIFY(stateChangedSpy2.count() >= 2 || !errorSpy2.isEmpty()); + QTRY_VERIFY(stateChangedSpy2.count() >= 1 || !errorSpy2.isEmpty()); if (!errorSpy2.isEmpty()) { QVERIFY(session2.state() == previousState); @@ -975,54 +1036,66 @@ void tst_QNetworkSession::sessionOpenCloseStop() state = qvariant_cast<QNetworkSession::State>(stateChangedSpy2.at(3).at(0)); QVERIFY(state == QNetworkSession::Disconnected); + + QTRY_VERIFY(session.state() == QNetworkSession::Roaming || + session.state() == QNetworkSession::Connected || + session.state() == QNetworkSession::Disconnected); + QTRY_VERIFY(stateChangedSpy.count() > 0); - state = qvariant_cast<QNetworkSession::State>(stateChangedSpy.at(0).at(0)); + state = qvariant_cast<QNetworkSession::State>(stateChangedSpy.at(stateChangedSpy.count() - 1).at(0)); + if (state == QNetworkSession::Roaming) { - QTRY_VERIFY(!errorSpy.isEmpty() || stateChangedSpy.count() > 1); + QTRY_VERIFY(session.state() == QNetworkSession::Connected); + QTRY_VERIFY(session2.state() == QNetworkSession::Connected); + roamedSuccessfully = true; + } else if (state == QNetworkSession::Disconnected) { + QTRY_VERIFY(!errorSpy.isEmpty()); + QTRY_VERIFY(session2.state() == QNetworkSession::Disconnected); + } else if (state == QNetworkSession::Connected) { + QTRY_VERIFY(errorSpy.isEmpty()); if (stateChangedSpy.count() > 1) { - state = qvariant_cast<QNetworkSession::State>(stateChangedSpy.at(1).at(0)); - if (state == QNetworkSession::Connected) { - roamedSuccessfully = true; - QTRY_VERIFY(session2.state() == QNetworkSession::Disconnected); - } + state = qvariant_cast<QNetworkSession::State>(stateChangedSpy.at(stateChangedSpy.count() - 2).at(0)); + QVERIFY(state == QNetworkSession::Roaming); } - } + roamedSuccessfully = true; + } + if (roamedSuccessfully) { QString configId = session.sessionProperty("ActiveConfiguration").toString(); QNetworkConfiguration config = manager.configurationFromIdentifier(configId); QNetworkSession session3(config); QSignalSpy errorSpy3(&session3, SIGNAL(error(QNetworkSession::SessionError))); QSignalSpy sessionOpenedSpy3(&session3, SIGNAL(opened())); - session3.open(); - session3.waitForOpened(); - + session3.waitForOpened(); if (session.isOpen()) QVERIFY(!sessionOpenedSpy3.isEmpty() || !errorSpy3.isEmpty()); - session.stop(); - QTRY_VERIFY(session.state() == QNetworkSession::Disconnected); - QTRY_VERIFY(session3.state() == QNetworkSession::Disconnected); } #ifndef Q_CC_NOKIAX86 if (!roamedSuccessfully) QVERIFY(!errorSpy.isEmpty()); #endif } else { - QCOMPARE(stateChangedSpy2.count(), 2); - - QNetworkSession::State state = - qvariant_cast<QNetworkSession::State>(stateChangedSpy2.at(0).at(0)); - QVERIFY(state == QNetworkSession::Closing); - - state = qvariant_cast<QNetworkSession::State>(stateChangedSpy2.at(1).at(0)); - QVERIFY(state == QNetworkSession::Disconnected); + QTest::qWait(2000); // Wait awhile to get all signals from platform + + if (stateChangedSpy2.count() == 2) { + QNetworkSession::State state = + qvariant_cast<QNetworkSession::State>(stateChangedSpy2.at(0).at(0)); + QVERIFY(state == QNetworkSession::Closing); + state = qvariant_cast<QNetworkSession::State>(stateChangedSpy2.at(1).at(0)); + QVERIFY(state == QNetworkSession::Disconnected); + } else { // Assume .count() == 1 + QCOMPARE(stateChangedSpy2.count(), 1); + QNetworkSession::State state = qvariant_cast<QNetworkSession::State>(stateChangedSpy2.at(0).at(0)); + // Symbian version dependant. + QVERIFY(state == QNetworkSession::Disconnected); + } } QTRY_VERIFY(!sessionClosedSpy.isEmpty()); - QVERIFY(session.state() == QNetworkSession::Disconnected); - QVERIFY(session2.state() == QNetworkSession::Disconnected); + QTRY_VERIFY(session.state() == QNetworkSession::Disconnected); } QVERIFY(errorSpy2.isEmpty()); @@ -1041,7 +1114,7 @@ void tst_QNetworkSession::sessionOpenCloseStop() QVERIFY(!session.isOpen()); #endif QVERIFY(!session2.isOpen()); - } else { + } else if (session2.isOpen()) { // Test closing the second session. { int stateChangedCountBeforeClose = stateChangedSpy2.count(); @@ -1138,9 +1211,15 @@ QDebug operator<<(QDebug debug, const QList<QNetworkConfiguration> &list) // at Discovered -state. void tst_QNetworkSession::outOfProcessSession() { + if (!testsToRun["outOfProcessSession"]) { + QSKIP("Temporary skip due to value set false (or it is missing) in testsToRun map", SkipAll); + } #if defined(Q_OS_SYMBIAN) && defined(__WINS__) QSKIP("Symbian emulator does not support two [QR]PRocesses linking a dll (QtBearer.dll) with global writeable static data.", SkipAll); #endif + updateConfigurations(); + QTest::qWait(2000); + QNetworkConfigurationManager manager; // Create a QNetworkConfigurationManager to detect configuration changes made in Lackey. This // is actually the essence of this testcase - to check that platform mediates/reflects changes @@ -1161,6 +1240,7 @@ void tst_QNetworkSession::outOfProcessSession() lackey.start("qnetworksessionlackey"); QVERIFY(lackey.waitForStarted()); + QVERIFY(oopServer.waitForNewConnection(-1)); QLocalSocket *oopSocket = oopServer.nextPendingConnection(); @@ -1241,6 +1321,7 @@ QNetworkConfiguration suitableConfiguration(QString bearerType, QNetworkConfigur // Refresh configurations and derive configurations matching given parameters. QNetworkConfigurationManager mgr; QSignalSpy updateSpy(&mgr, SIGNAL(updateCompleted())); + mgr.updateConfigurations(); QTRY_NOOP(updateSpy.count() == 1); if (updateSpy.count() != 1) { @@ -1249,8 +1330,7 @@ QNetworkConfiguration suitableConfiguration(QString bearerType, QNetworkConfigur } QList<QNetworkConfiguration> discoveredConfigs = mgr.allConfigurations(QNetworkConfiguration::Discovered); foreach(QNetworkConfiguration config, discoveredConfigs) { - if ((config.state() & QNetworkConfiguration::Active) == QNetworkConfiguration::Active) { - // qDebug() << "Dumping config because is active: " << config.name(); + if ((config.state() & QNetworkConfiguration::Active) == QNetworkConfiguration::Active) { discoveredConfigs.removeOne(config); } else if (config.type() != configType) { // qDebug() << "Dumping config because type (IAP/SNAP) mismatches: " << config.name(); @@ -1287,9 +1367,23 @@ void updateConfigurations() QTRY_NOOP(updateSpy.count() == 1); } +// A convinience-function: updates and prints all available confiurations and their states +void printConfigurations() +{ + QNetworkConfigurationManager manager; + QList<QNetworkConfiguration> allConfigs = + manager.allConfigurations(); + qDebug("tst_QNetworkSession::printConfigurations QNetworkConfigurationManager gives following configurations: "); + foreach(QNetworkConfiguration config, allConfigs) { + qDebug() << "Name of the configuration: " << config.name(); + qDebug() << "State of the configuration: " << config.state(); + } +} + // A convinience function for test-cases: opens the given configuration and return // true if it was done gracefully. bool openSession(QNetworkSession *session) { + bool result = true; QNetworkConfigurationManager mgr; QSignalSpy openedSpy(session, SIGNAL(opened())); QSignalSpy stateChangeSpy(session, SIGNAL(stateChanged(QNetworkSession::State))); @@ -1299,43 +1393,57 @@ bool openSession(QNetworkSession *session) { // active by some other session QNetworkConfiguration::StateFlags configInitState = session->configuration().state(); QNetworkSession::State sessionInitState = session->state(); + qDebug() << "tst_QNetworkSession::openSession() name of the configuration to be opened: " << session->configuration().name(); + qDebug() << "tst_QNetworkSession::openSession() state of the configuration to be opened: " << session->configuration().state(); + qDebug() << "tst_QNetworkSession::openSession() state of the session to be opened: " << session->state(); if (session->isOpen() || !session->sessionProperty("ActiveConfiguration").toString().isEmpty()) { qDebug("tst_QNetworkSession::openSession() failure: session was already open / active."); - return false; + result = false; } else { session->open(); session->waitForOpened(120000); // Bringing interfaces up and down may take time at platform } + QTest::qWait(5000); // Wait a moment to ensure all signals are propagated // Check that connection opening went by the book. Add checks here if more strictness needed. if (!session->isOpen()) { qDebug("tst_QNetworkSession::openSession() failure: QNetworkSession::open() failed."); - return false; + result = false; } if (openedSpy.count() != 1) { qDebug("tst_QNetworkSession::openSession() failure: QNetworkSession::opened() - signal not received."); - return false; + result = false; } if (!errorSpy.isEmpty()) { qDebug("tst_QNetworkSession::openSession() failure: QNetworkSession::error() - signal was detected."); - return false; + result = false; } if (sessionInitState != QNetworkSession::Connected && stateChangeSpy.isEmpty()) { qDebug("tst_QNetworkSession::openSession() failure: QNetworkSession::stateChanged() - signals not detected."); - return false; + result = false; } if (configInitState != QNetworkConfiguration::Active && configChangeSpy.isEmpty()) { qDebug("tst_QNetworkSession::openSession() failure: QNetworkConfigurationManager::configurationChanged() - signals not detected."); - return false; + result = false; } if (session->configuration().state() != QNetworkConfiguration::Active) { qDebug("tst_QNetworkSession::openSession() failure: session's configuration is not in 'Active' -state."); - return false; + qDebug() << "tst_QNetworkSession::openSession() state is: " << session->configuration().state(); + result = false; + } + if (result == false) { + qDebug() << "tst_QNetworkSession::openSession() opening session failed."; + } else { + qDebug() << "tst_QNetworkSession::openSession() opening session succeeded."; } - return true; + qDebug() << "tst_QNetworkSession::openSession() name of the configuration is: " << session->configuration().name(); + qDebug() << "tst_QNetworkSession::openSession() configuration state is: " << session->configuration().state(); + qDebug() << "tst_QNetworkSession::openSession() session state is: " << session->state(); + + return result; } // Helper function for closing opened session. Performs checks that @@ -1348,6 +1456,11 @@ bool closeSession(QNetworkSession *session, bool lastSessionOnConfiguration) { qDebug("tst_QNetworkSession::closeSession() failure: NULL session given"); return false; } + + qDebug() << "tst_QNetworkSession::closeSession() name of the configuration to be closed: " << session->configuration().name(); + qDebug() << "tst_QNetworkSession::closeSession() state of the configuration to be closed: " << session->configuration().state(); + qDebug() << "tst_QNetworkSession::closeSession() state of the session to be closed: " << session->state(); + if (session->state() != QNetworkSession::Connected || !session->isOpen()) { qDebug("tst_QNetworkSession::closeSession() failure: session is not opened."); @@ -1359,38 +1472,48 @@ bool closeSession(QNetworkSession *session, bool lastSessionOnConfiguration) { QSignalSpy sessionErrorSpy(session, SIGNAL(error(QNetworkSession::SessionError))); QSignalSpy configChangeSpy(&mgr, SIGNAL(configurationChanged(QNetworkConfiguration))); + bool result = true; session->close(); + QTest::qWait(5000); // Wait a moment so that all signals are propagated if (!sessionErrorSpy.isEmpty()) { qDebug("tst_QNetworkSession::closeSession() failure: QNetworkSession::error() received."); - return false; + result = false; } if (sessionClosedSpy.count() != 1) { qDebug("tst_QNetworkSession::closeSession() failure: QNetworkSession::closed() signal not received."); - return false; + result = false; } if (lastSessionOnConfiguration && sessionStateChangedSpy.isEmpty()) { qDebug("tst_QNetworkSession::closeSession() failure: QNetworkSession::stateChanged() signals not received."); - return false; + result = false; } if (lastSessionOnConfiguration && session->state() != QNetworkSession::Disconnected) { qDebug("tst_QNetworkSession::closeSession() failure: QNetworkSession is not in Disconnected -state"); - return false; + result = false; } QTRY_NOOP(!configChangeSpy.isEmpty()); if (lastSessionOnConfiguration && configChangeSpy.isEmpty()) { qDebug("tst_QNetworkSession::closeSession() failure: QNetworkConfigurationManager::configurationChanged() - signal not detected."); - return false; + result = false; } if (lastSessionOnConfiguration && session->configuration().state() == QNetworkConfiguration::Active) { qDebug("tst_QNetworkSession::closeSession() failure: session's configuration is still in active state."); - return false; + result = false; } - return true; + if (result == false) { + qDebug() << "tst_QNetworkSession::closeSession() closing session failed."; + } else { + qDebug() << "tst_QNetworkSession::closeSession() closing session succeeded."; + } + qDebug() << "tst_QNetworkSession::closeSession() name of the configuration is: " << session->configuration().name(); + qDebug() << "tst_QNetworkSession::closeSession() configuration state is: " << session->configuration().state(); + qDebug() << "tst_QNetworkSession::closeSession() session state is: " << session->state(); + return result; } QTEST_MAIN(tst_QNetworkSession) diff --git a/tests/auto/qnmeapositioninfosource/qnmeapositioninfosourceproxyfactory.cpp b/tests/auto/qnmeapositioninfosource/qnmeapositioninfosourceproxyfactory.cpp index 0a4abaf546..e5ef4567dc 100644 --- a/tests/auto/qnmeapositioninfosource/qnmeapositioninfosourceproxyfactory.cpp +++ b/tests/auto/qnmeapositioninfosource/qnmeapositioninfosourceproxyfactory.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qnmeapositioninfosource/qnmeapositioninfosourceproxyfactory.h b/tests/auto/qnmeapositioninfosource/qnmeapositioninfosourceproxyfactory.h index d1fc8aa8df..22c71f4118 100644 --- a/tests/auto/qnmeapositioninfosource/qnmeapositioninfosourceproxyfactory.h +++ b/tests/auto/qnmeapositioninfosource/qnmeapositioninfosourceproxyfactory.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qnmeapositioninfosource/tst_dummynmeapositioninfosource.cpp b/tests/auto/qnmeapositioninfosource/tst_dummynmeapositioninfosource.cpp index 22a1fc38fa..d58c6529b6 100644 --- a/tests/auto/qnmeapositioninfosource/tst_dummynmeapositioninfosource.cpp +++ b/tests/auto/qnmeapositioninfosource/tst_dummynmeapositioninfosource.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource.cpp b/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource.cpp index d72efa26f4..b26eb2e9ef 100644 --- a/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource.cpp +++ b/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource.h b/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource.h index 0281340f49..9c358ce290 100644 --- a/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource.h +++ b/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource_realtime.cpp b/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource_realtime.cpp index 606a7e7593..ee5e1a70db 100644 --- a/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource_realtime.cpp +++ b/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource_realtime.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource_realtime_generic.cpp b/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource_realtime_generic.cpp index 631c9461f4..73ae4397b6 100644 --- a/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource_realtime_generic.cpp +++ b/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource_realtime_generic.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource_simulation.cpp b/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource_simulation.cpp index 676c13b4df..d42f042e2d 100644 --- a/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource_simulation.cpp +++ b/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource_simulation.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource_simulation_generic.cpp b/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource_simulation_generic.cpp index 2add9c0110..ae8ce89814 100644 --- a/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource_simulation_generic.cpp +++ b/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource_simulation_generic.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qpacket/tst_qpacket.cpp b/tests/auto/qpacket/tst_qpacket.cpp index ab19a6c668..a9a4790aef 100644 --- a/tests/auto/qpacket/tst_qpacket.cpp +++ b/tests/auto/qpacket/tst_qpacket.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qpacketprotocol/tst_qpacketprotocol.cpp b/tests/auto/qpacketprotocol/tst_qpacketprotocol.cpp index e778aca949..eb4aae9ab1 100644 --- a/tests/auto/qpacketprotocol/tst_qpacketprotocol.cpp +++ b/tests/auto/qpacketprotocol/tst_qpacketprotocol.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qpaintervideosurface/tst_qpaintervideosurface.cpp b/tests/auto/qpaintervideosurface/tst_qpaintervideosurface.cpp index c83262208b..923473bfa6 100644 --- a/tests/auto/qpaintervideosurface/tst_qpaintervideosurface.cpp +++ b/tests/auto/qpaintervideosurface/tst_qpaintervideosurface.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qradioplayer/tst_qradioplayer.cpp b/tests/auto/qradioplayer/tst_qradioplayer.cpp index e8f4485cc6..e0e56a0f34 100644 --- a/tests/auto/qradioplayer/tst_qradioplayer.cpp +++ b/tests/auto/qradioplayer/tst_qradioplayer.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qradiotuner/tst_qradiotuner.cpp b/tests/auto/qradiotuner/tst_qradiotuner.cpp index 7e6cf2189d..b5f3bb138e 100644 --- a/tests/auto/qradiotuner/tst_qradiotuner.cpp +++ b/tests/auto/qradiotuner/tst_qradiotuner.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qsensor/main.cpp b/tests/auto/qsensor/main.cpp index d040b17371..93945348d2 100644 --- a/tests/auto/qsensor/main.cpp +++ b/tests/auto/qsensor/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qsensor/test_sensor.cpp b/tests/auto/qsensor/test_sensor.cpp index 5f67a4da38..c15fcd2b06 100644 --- a/tests/auto/qsensor/test_sensor.cpp +++ b/tests/auto/qsensor/test_sensor.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qsensor/test_sensor.h b/tests/auto/qsensor/test_sensor.h index 9359e36c8f..d3e3934658 100644 --- a/tests/auto/qsensor/test_sensor.h +++ b/tests/auto/qsensor/test_sensor.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qsensor/test_sensor_p.h b/tests/auto/qsensor/test_sensor_p.h index 45da4d6503..63f3fdc33d 100644 --- a/tests/auto/qsensor/test_sensor_p.h +++ b/tests/auto/qsensor/test_sensor_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qsensor/test_sensorimpl.cpp b/tests/auto/qsensor/test_sensorimpl.cpp index 1fabe15230..df2ba28242 100644 --- a/tests/auto/qsensor/test_sensorimpl.cpp +++ b/tests/auto/qsensor/test_sensorimpl.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qsensor/test_sensorimpl.h b/tests/auto/qsensor/test_sensorimpl.h index 065b1e0844..c3ed508f33 100644 --- a/tests/auto/qsensor/test_sensorimpl.h +++ b/tests/auto/qsensor/test_sensorimpl.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qsensor/test_sensorplugin.cpp b/tests/auto/qsensor/test_sensorplugin.cpp index fdfe1265e3..9dadbe51e7 100644 --- a/tests/auto/qsensor/test_sensorplugin.cpp +++ b/tests/auto/qsensor/test_sensorplugin.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qsensor/tst_qsensor.cpp b/tests/auto/qsensor/tst_qsensor.cpp index 457747a71e..42d4cbbd5e 100644 --- a/tests/auto/qsensor/tst_qsensor.cpp +++ b/tests/auto/qsensor/tst_qsensor.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qservicecontext/tst_qservicecontext.cpp b/tests/auto/qservicecontext/tst_qservicecontext.cpp index c08aefa210..dd3df18423 100644 --- a/tests/auto/qservicecontext/tst_qservicecontext.cpp +++ b/tests/auto/qservicecontext/tst_qservicecontext.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qservicefilter/tst_qservicefilter.cpp b/tests/auto/qservicefilter/tst_qservicefilter.cpp index 1b196ac33c..8b3143c61b 100644 --- a/tests/auto/qservicefilter/tst_qservicefilter.cpp +++ b/tests/auto/qservicefilter/tst_qservicefilter.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qserviceinterfacedescriptor/tst_qserviceinterfacedescriptor.cpp b/tests/auto/qserviceinterfacedescriptor/tst_qserviceinterfacedescriptor.cpp index 144b718e8a..0b179c2b24 100644 --- a/tests/auto/qserviceinterfacedescriptor/tst_qserviceinterfacedescriptor.cpp +++ b/tests/auto/qserviceinterfacedescriptor/tst_qserviceinterfacedescriptor.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qservicemanager/tst_qservicemanager.cpp b/tests/auto/qservicemanager/tst_qservicemanager.cpp index b1e1acf958..dcade51b05 100644 --- a/tests/auto/qservicemanager/tst_qservicemanager.cpp +++ b/tests/auto/qservicemanager/tst_qservicemanager.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qsfwtestutil.cpp b/tests/auto/qsfwtestutil.cpp index 06bb401955..858cdfeddc 100644 --- a/tests/auto/qsfwtestutil.cpp +++ b/tests/auto/qsfwtestutil.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qsfwtestutil.h b/tests/auto/qsfwtestutil.h index 9d267c7ced..4033860830 100644 --- a/tests/auto/qsfwtestutil.h +++ b/tests/auto/qsfwtestutil.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qsystemdeviceinfo/tst_qsystemdeviceinfo.cpp b/tests/auto/qsystemdeviceinfo/tst_qsystemdeviceinfo.cpp index 0df83da4bf..66ab6fb695 100644 --- a/tests/auto/qsystemdeviceinfo/tst_qsystemdeviceinfo.cpp +++ b/tests/auto/qsystemdeviceinfo/tst_qsystemdeviceinfo.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qsystemdisplayinfo/tst_qsystemdisplayinfo.cpp b/tests/auto/qsystemdisplayinfo/tst_qsystemdisplayinfo.cpp index bed74d861f..c01878939a 100644 --- a/tests/auto/qsystemdisplayinfo/tst_qsystemdisplayinfo.cpp +++ b/tests/auto/qsystemdisplayinfo/tst_qsystemdisplayinfo.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qsysteminfo/tst_qsysteminfo.cpp b/tests/auto/qsysteminfo/tst_qsysteminfo.cpp index c0cdec4bf5..4a96d11a15 100644 --- a/tests/auto/qsysteminfo/tst_qsysteminfo.cpp +++ b/tests/auto/qsysteminfo/tst_qsysteminfo.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qsysteminfotestcommon.h b/tests/auto/qsysteminfotestcommon.h index 977a22d935..556942af3a 100644 --- a/tests/auto/qsysteminfotestcommon.h +++ b/tests/auto/qsysteminfotestcommon.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qsystemnetworkinfo/tst_qsystemnetworkinfo.cpp b/tests/auto/qsystemnetworkinfo/tst_qsystemnetworkinfo.cpp index 33b2fb8979..50e3c801aa 100644 --- a/tests/auto/qsystemnetworkinfo/tst_qsystemnetworkinfo.cpp +++ b/tests/auto/qsystemnetworkinfo/tst_qsystemnetworkinfo.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qsystemreadwritelock/tst_qsystemreadwritelock.cpp b/tests/auto/qsystemreadwritelock/tst_qsystemreadwritelock.cpp index 3c702d34bf..42c6f6f9eb 100644 --- a/tests/auto/qsystemreadwritelock/tst_qsystemreadwritelock.cpp +++ b/tests/auto/qsystemreadwritelock/tst_qsystemreadwritelock.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qsystemreadwritelock_oop/common.h b/tests/auto/qsystemreadwritelock_oop/common.h index 14acfe611a..c87780579a 100644 --- a/tests/auto/qsystemreadwritelock_oop/common.h +++ b/tests/auto/qsystemreadwritelock_oop/common.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qsystemreadwritelock_oop/lackey/main.cpp b/tests/auto/qsystemreadwritelock_oop/lackey/main.cpp index e5f9c1b458..83d1026773 100644 --- a/tests/auto/qsystemreadwritelock_oop/lackey/main.cpp +++ b/tests/auto/qsystemreadwritelock_oop/lackey/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qsystemreadwritelock_oop/tst_qsystemreadwritelock_oop.cpp b/tests/auto/qsystemreadwritelock_oop/tst_qsystemreadwritelock_oop.cpp index d559db7f95..113eb60145 100644 --- a/tests/auto/qsystemreadwritelock_oop/tst_qsystemreadwritelock_oop.cpp +++ b/tests/auto/qsystemreadwritelock_oop/tst_qsystemreadwritelock_oop.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qsystemscreensaver/tst_qsystemscreensaver.cpp b/tests/auto/qsystemscreensaver/tst_qsystemscreensaver.cpp index 02875ee2f7..afa0951c83 100644 --- a/tests/auto/qsystemscreensaver/tst_qsystemscreensaver.cpp +++ b/tests/auto/qsystemscreensaver/tst_qsystemscreensaver.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qsystemstorageinfo/tst_qsystemstorageinfo.cpp b/tests/auto/qsystemstorageinfo/tst_qsystemstorageinfo.cpp index 270ae96647..c58ae593b7 100644 --- a/tests/auto/qsystemstorageinfo/tst_qsystemstorageinfo.cpp +++ b/tests/auto/qsystemstorageinfo/tst_qsystemstorageinfo.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qvaluespace/tst_qvaluespace.cpp b/tests/auto/qvaluespace/tst_qvaluespace.cpp index 1b9326bb28..5231b72e62 100644 --- a/tests/auto/qvaluespace/tst_qvaluespace.cpp +++ b/tests/auto/qvaluespace/tst_qvaluespace.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qvaluespacepublisher/tst_qvaluespacepublisher.cpp b/tests/auto/qvaluespacepublisher/tst_qvaluespacepublisher.cpp index 34b32880bc..9510604f81 100644 --- a/tests/auto/qvaluespacepublisher/tst_qvaluespacepublisher.cpp +++ b/tests/auto/qvaluespacepublisher/tst_qvaluespacepublisher.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qvaluespacesubscriber/lackey/main.cpp b/tests/auto/qvaluespacesubscriber/lackey/main.cpp index 7c00c33e8d..4c1c79014c 100644 --- a/tests/auto/qvaluespacesubscriber/lackey/main.cpp +++ b/tests/auto/qvaluespacesubscriber/lackey/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qvaluespacesubscriber/tst_qvaluespacesubscriber/tst_qvaluespacesubscriber.cpp b/tests/auto/qvaluespacesubscriber/tst_qvaluespacesubscriber/tst_qvaluespacesubscriber.cpp index 6a422272f8..26e0c638bd 100644 --- a/tests/auto/qvaluespacesubscriber/tst_qvaluespacesubscriber/tst_qvaluespacesubscriber.cpp +++ b/tests/auto/qvaluespacesubscriber/tst_qvaluespacesubscriber/tst_qvaluespacesubscriber.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qvaluespacesubscriber/tst_qvaluespacesubscriber_oop/tst_qvaluespacesubscriber_oop.cpp b/tests/auto/qvaluespacesubscriber/tst_qvaluespacesubscriber_oop/tst_qvaluespacesubscriber_oop.cpp index 8d5ca7f062..9ab8740302 100644 --- a/tests/auto/qvaluespacesubscriber/tst_qvaluespacesubscriber_oop/tst_qvaluespacesubscriber_oop.cpp +++ b/tests/auto/qvaluespacesubscriber/tst_qvaluespacesubscriber_oop/tst_qvaluespacesubscriber_oop.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qvaluespacesubscriber/tst_qvaluespacesubscribershared.cpp b/tests/auto/qvaluespacesubscriber/tst_qvaluespacesubscribershared.cpp index cae0bb5e43..e29fc75c7d 100644 --- a/tests/auto/qvaluespacesubscriber/tst_qvaluespacesubscribershared.cpp +++ b/tests/auto/qvaluespacesubscriber/tst_qvaluespacesubscribershared.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qvaluespacesubscriber/tst_qvaluespacesubscribershared.h b/tests/auto/qvaluespacesubscriber/tst_qvaluespacesubscribershared.h index b627a50a23..145dd8c1a5 100644 --- a/tests/auto/qvaluespacesubscriber/tst_qvaluespacesubscribershared.h +++ b/tests/auto/qvaluespacesubscriber/tst_qvaluespacesubscribershared.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qvcard21writer/tst_qvcard21writer.cpp b/tests/auto/qvcard21writer/tst_qvcard21writer.cpp index ac1719de23..b857297629 100644 --- a/tests/auto/qvcard21writer/tst_qvcard21writer.cpp +++ b/tests/auto/qvcard21writer/tst_qvcard21writer.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qvcard21writer/tst_qvcard21writer.h b/tests/auto/qvcard21writer/tst_qvcard21writer.h index 3f45647397..610569da6d 100644 --- a/tests/auto/qvcard21writer/tst_qvcard21writer.h +++ b/tests/auto/qvcard21writer/tst_qvcard21writer.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qvcard30writer/tst_qvcard30writer.cpp b/tests/auto/qvcard30writer/tst_qvcard30writer.cpp index 1edca870b6..9755330da6 100644 --- a/tests/auto/qvcard30writer/tst_qvcard30writer.cpp +++ b/tests/auto/qvcard30writer/tst_qvcard30writer.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qvcard30writer/tst_qvcard30writer.h b/tests/auto/qvcard30writer/tst_qvcard30writer.h index a054ac351f..9f7eeda84a 100644 --- a/tests/auto/qvcard30writer/tst_qvcard30writer.h +++ b/tests/auto/qvcard30writer/tst_qvcard30writer.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qversit/tst_qversit.cpp b/tests/auto/qversit/tst_qversit.cpp index 9c5fcfdf4c..602253d7ab 100644 --- a/tests/auto/qversit/tst_qversit.cpp +++ b/tests/auto/qversit/tst_qversit.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qversit/tst_qversit.h b/tests/auto/qversit/tst_qversit.h index d6cd555e7e..da82b23c6b 100644 --- a/tests/auto/qversit/tst_qversit.h +++ b/tests/auto/qversit/tst_qversit.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qversitcontactexporter/tst_qversitcontactexporter.cpp b/tests/auto/qversitcontactexporter/tst_qversitcontactexporter.cpp index 0c5f16f983..841300f14f 100644 --- a/tests/auto/qversitcontactexporter/tst_qversitcontactexporter.cpp +++ b/tests/auto/qversitcontactexporter/tst_qversitcontactexporter.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qversitcontactexporter/tst_qversitcontactexporter.h b/tests/auto/qversitcontactexporter/tst_qversitcontactexporter.h index c225fd422c..79346d4520 100644 --- a/tests/auto/qversitcontactexporter/tst_qversitcontactexporter.h +++ b/tests/auto/qversitcontactexporter/tst_qversitcontactexporter.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qversitcontactimporter/tst_qversitcontactimporter.cpp b/tests/auto/qversitcontactimporter/tst_qversitcontactimporter.cpp index d7e96c3c19..a6a5442b9d 100644 --- a/tests/auto/qversitcontactimporter/tst_qversitcontactimporter.cpp +++ b/tests/auto/qversitcontactimporter/tst_qversitcontactimporter.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qversitcontactimporter/tst_qversitcontactimporter.h b/tests/auto/qversitcontactimporter/tst_qversitcontactimporter.h index b9989cea5a..917e9a1b54 100644 --- a/tests/auto/qversitcontactimporter/tst_qversitcontactimporter.h +++ b/tests/auto/qversitcontactimporter/tst_qversitcontactimporter.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qversitdocument/tst_qversitdocument.cpp b/tests/auto/qversitdocument/tst_qversitdocument.cpp index 75128a635c..f17c935da3 100644 --- a/tests/auto/qversitdocument/tst_qversitdocument.cpp +++ b/tests/auto/qversitdocument/tst_qversitdocument.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qversitdocument/tst_qversitdocument.h b/tests/auto/qversitdocument/tst_qversitdocument.h index 83438bf88e..efb765b97c 100644 --- a/tests/auto/qversitdocument/tst_qversitdocument.h +++ b/tests/auto/qversitdocument/tst_qversitdocument.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qversitproperty/tst_qversitproperty.cpp b/tests/auto/qversitproperty/tst_qversitproperty.cpp index f2a261e0f8..c92c65b781 100644 --- a/tests/auto/qversitproperty/tst_qversitproperty.cpp +++ b/tests/auto/qversitproperty/tst_qversitproperty.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qversitproperty/tst_qversitproperty.h b/tests/auto/qversitproperty/tst_qversitproperty.h index db56b0eda2..12ba542320 100644 --- a/tests/auto/qversitproperty/tst_qversitproperty.h +++ b/tests/auto/qversitproperty/tst_qversitproperty.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qversitreader/tst_qversitreader.cpp b/tests/auto/qversitreader/tst_qversitreader.cpp index f982dfcd0f..aad1be27f4 100644 --- a/tests/auto/qversitreader/tst_qversitreader.cpp +++ b/tests/auto/qversitreader/tst_qversitreader.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qversitreader/tst_qversitreader.h b/tests/auto/qversitreader/tst_qversitreader.h index 643790070f..590c97b9d7 100644 --- a/tests/auto/qversitreader/tst_qversitreader.h +++ b/tests/auto/qversitreader/tst_qversitreader.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qversitwriter/tst_qversitwriter.cpp b/tests/auto/qversitwriter/tst_qversitwriter.cpp index c0edb45ec2..cff2c63bf2 100644 --- a/tests/auto/qversitwriter/tst_qversitwriter.cpp +++ b/tests/auto/qversitwriter/tst_qversitwriter.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qversitwriter/tst_qversitwriter.h b/tests/auto/qversitwriter/tst_qversitwriter.h index 087558d02a..d224e1cfe1 100644 --- a/tests/auto/qversitwriter/tst_qversitwriter.h +++ b/tests/auto/qversitwriter/tst_qversitwriter.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qvideowidget/tst_qvideowidget.cpp b/tests/auto/qvideowidget/tst_qvideowidget.cpp index 2caee03e60..649a22bf37 100644 --- a/tests/auto/qvideowidget/tst_qvideowidget.cpp +++ b/tests/auto/qvideowidget/tst_qvideowidget.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/servicedatabase/tst_servicedatabase.cpp b/tests/auto/servicedatabase/tst_servicedatabase.cpp index 017b61a60c..0e0660593e 100644 --- a/tests/auto/servicedatabase/tst_servicedatabase.cpp +++ b/tests/auto/servicedatabase/tst_servicedatabase.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/servicemetadata/tst_servicemetadata.cpp b/tests/auto/servicemetadata/tst_servicemetadata.cpp index 5dd6dd7ac3..5ba579084c 100644 --- a/tests/auto/servicemetadata/tst_servicemetadata.cpp +++ b/tests/auto/servicemetadata/tst_servicemetadata.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/support/support.h b/tests/auto/support/support.h index d230190a3d..0c3402c657 100644 --- a/tests/auto/support/support.h +++ b/tests/auto/support/support.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/support/support_maemo5.cpp b/tests/auto/support/support_maemo5.cpp index 94e081689f..5397993f43 100644 --- a/tests/auto/support/support_maemo5.cpp +++ b/tests/auto/support/support_maemo5.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/support/support_qmf.cpp b/tests/auto/support/support_qmf.cpp index 5c89944afc..bc2d31b21d 100644 --- a/tests/auto/support/support_qmf.cpp +++ b/tests/auto/support/support_qmf.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/support/support_stub.cpp b/tests/auto/support/support_stub.cpp index 206551e20a..a0921df18c 100644 --- a/tests/auto/support/support_stub.cpp +++ b/tests/auto/support/support_stub.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/support/support_symbian.cpp b/tests/auto/support/support_symbian.cpp index 53e444c0ea..edc22e488f 100644 --- a/tests/auto/support/support_symbian.cpp +++ b/tests/auto/support/support_symbian.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/support/support_win.cpp b/tests/auto/support/support_win.cpp index 2561d973a4..e077cdd7b0 100644 --- a/tests/auto/support/support_win.cpp +++ b/tests/auto/support/support_win.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/symbian/qmediaobject_s60/tst_qmediaobject_s60.cpp b/tests/auto/symbian/qmediaobject_s60/tst_qmediaobject_s60.cpp index edae34cc2d..517d15cd20 100644 --- a/tests/auto/symbian/qmediaobject_s60/tst_qmediaobject_s60.cpp +++ b/tests/auto/symbian/qmediaobject_s60/tst_qmediaobject_s60.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/symbian/qmediaplayer_s60/tst_qmediaplayer_s60.cpp b/tests/auto/symbian/qmediaplayer_s60/tst_qmediaplayer_s60.cpp index 914026a106..ca55f62008 100644 --- a/tests/auto/symbian/qmediaplayer_s60/tst_qmediaplayer_s60.cpp +++ b/tests/auto/symbian/qmediaplayer_s60/tst_qmediaplayer_s60.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/symbian/qmediaplaylist_s60/tst_qmediaplaylist_s60.cpp b/tests/auto/symbian/qmediaplaylist_s60/tst_qmediaplaylist_s60.cpp index 201cd6db13..9d7c79da04 100644 --- a/tests/auto/symbian/qmediaplaylist_s60/tst_qmediaplaylist_s60.cpp +++ b/tests/auto/symbian/qmediaplaylist_s60/tst_qmediaplaylist_s60.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/symbian/qmediarecorder_s60/tst_qmediarecorder_s60.cpp b/tests/auto/symbian/qmediarecorder_s60/tst_qmediarecorder_s60.cpp index b0c530b429..2e639ac7ca 100644 --- a/tests/auto/symbian/qmediarecorder_s60/tst_qmediarecorder_s60.cpp +++ b/tests/auto/symbian/qmediarecorder_s60/tst_qmediarecorder_s60.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/symbian/qradiotuner_s60/tst_qradiotuner_s60.cpp b/tests/auto/symbian/qradiotuner_s60/tst_qradiotuner_s60.cpp index 443a71f091..ffc4c34e81 100644 --- a/tests/auto/symbian/qradiotuner_s60/tst_qradiotuner_s60.cpp +++ b/tests/auto/symbian/qradiotuner_s60/tst_qradiotuner_s60.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/testqgeopositioninfosource.cpp b/tests/auto/testqgeopositioninfosource.cpp index ec00b66560..d35504cd9d 100644 --- a/tests/auto/testqgeopositioninfosource.cpp +++ b/tests/auto/testqgeopositioninfosource.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/testqgeopositioninfosource_p.h b/tests/auto/testqgeopositioninfosource_p.h index 2dddb5f533..1c602af2d4 100644 --- a/tests/auto/testqgeopositioninfosource_p.h +++ b/tests/auto/testqgeopositioninfosource_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/testqgeosatelliteinfosource.cpp b/tests/auto/testqgeosatelliteinfosource.cpp index 631413b04d..cbc3d5b747 100644 --- a/tests/auto/testqgeosatelliteinfosource.cpp +++ b/tests/auto/testqgeosatelliteinfosource.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/testqgeosatelliteinfosource_p.h b/tests/auto/testqgeosatelliteinfosource_p.h index 38c4438590..6dd3b36fad 100644 --- a/tests/auto/testqgeosatelliteinfosource_p.h +++ b/tests/auto/testqgeosatelliteinfosource_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/bearerex/bearerex.cpp b/tests/bearerex/bearerex.cpp index f62d8d2eb4..2267335bfe 100644 --- a/tests/bearerex/bearerex.cpp +++ b/tests/bearerex/bearerex.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -299,8 +299,12 @@ SessionTab::SessionTab(QNetworkConfiguration* apNetworkConfiguration, SessionTab::~SessionTab() { + // Need to be nulled, because modal dialogs may return after destruction of this object and + // use already released resources. delete m_NetworkSession; + m_NetworkSession = NULL; delete m_http; + m_http = NULL; } void SessionTab::on_createQHttpButton_clicked() @@ -550,10 +554,16 @@ void SessionTab::done(bool error) msgBox.setText(QString("HTTP request finished successfully.\nReceived ")+QString::number(result.length())+QString(" bytes.")); } msgBox.exec(); - - sentRecDataLineEdit->setText(QString::number(m_NetworkSession->bytesWritten())+ - QString(" / ")+ - QString::number(m_NetworkSession->bytesReceived())); + // Check if the networksession still exists - it may have gone after returning from + // the modal dialog (in the case that app has been closed, and deleting QHttp will + // trigger the done() invokation). + if (m_NetworkSession) { + sentRecDataLineEdit->setText(QString::number(m_NetworkSession->bytesWritten())+ + QString(" / ")+ + QString::number(m_NetworkSession->bytesReceived())); + } else { + sentRecDataLineEdit->setText("Data amounts not available."); + } } // End of file diff --git a/tests/bearerex/bearerex.h b/tests/bearerex/bearerex.h index 4fe0bd27df..56ecbd8b2a 100644 --- a/tests/bearerex/bearerex.h +++ b/tests/bearerex/bearerex.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/bearerex/main.cpp b/tests/bearerex/main.cpp index e13a494ee5..63aa0704be 100644 --- a/tests/bearerex/main.cpp +++ b/tests/bearerex/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/bearerex/xqlistwidget.cpp b/tests/bearerex/xqlistwidget.cpp index 0618725702..f831fdb563 100644 --- a/tests/bearerex/xqlistwidget.cpp +++ b/tests/bearerex/xqlistwidget.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/bearerex/xqlistwidget.h b/tests/bearerex/xqlistwidget.h index 1053328000..23ed21d212 100644 --- a/tests/bearerex/xqlistwidget.h +++ b/tests/bearerex/xqlistwidget.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/benchmarks/contacts/tst_bm_contacts.cpp b/tests/benchmarks/contacts/tst_bm_contacts.cpp index 4e3defa908..db9c7c6cbb 100644 --- a/tests/benchmarks/contacts/tst_bm_contacts.cpp +++ b/tests/benchmarks/contacts/tst_bm_contacts.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/benchmarks/messaging/tst_messaging.cpp b/tests/benchmarks/messaging/tst_messaging.cpp index e170ea5842..1764729fa8 100644 --- a/tests/benchmarks/messaging/tst_messaging.cpp +++ b/tests/benchmarks/messaging/tst_messaging.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/benchmarks/qsysteminfo/tst_qsysteminfo.cpp b/tests/benchmarks/qsysteminfo/tst_qsysteminfo.cpp index b2ca04aa28..9dc4d61b76 100644 --- a/tests/benchmarks/qsysteminfo/tst_qsysteminfo.cpp +++ b/tests/benchmarks/qsysteminfo/tst_qsysteminfo.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/benchmarks/sampleserviceplugin/sampleserviceplugin.cpp b/tests/benchmarks/sampleserviceplugin/sampleserviceplugin.cpp index c2d00f6c8a..1725566614 100644 --- a/tests/benchmarks/sampleserviceplugin/sampleserviceplugin.cpp +++ b/tests/benchmarks/sampleserviceplugin/sampleserviceplugin.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/benchmarks/sampleserviceplugin/sampleserviceplugin.h b/tests/benchmarks/sampleserviceplugin/sampleserviceplugin.h index a1c3d9c0e9..58cc9a0937 100644 --- a/tests/benchmarks/sampleserviceplugin/sampleserviceplugin.h +++ b/tests/benchmarks/sampleserviceplugin/sampleserviceplugin.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/benchmarks/serviceframework/tst_serviceframework.cpp b/tests/benchmarks/serviceframework/tst_serviceframework.cpp index 7a30dd522d..256fa61095 100644 --- a/tests/benchmarks/serviceframework/tst_serviceframework.cpp +++ b/tests/benchmarks/serviceframework/tst_serviceframework.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/messagingex/main.cpp b/tests/messagingex/main.cpp index 413e535842..d4c07f38bd 100644 --- a/tests/messagingex/main.cpp +++ b/tests/messagingex/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/messagingex/messagingex.cpp b/tests/messagingex/messagingex.cpp index a6a35b6325..7df24f6445 100644 --- a/tests/messagingex/messagingex.cpp +++ b/tests/messagingex/messagingex.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/messagingex/messagingex.h b/tests/messagingex/messagingex.h index 132f5aa325..e51004fcf6 100644 --- a/tests/messagingex/messagingex.h +++ b/tests/messagingex/messagingex.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/networkmanager/README b/tests/networkmanager/README deleted file mode 100644 index 4bc7171954..0000000000 --- a/tests/networkmanager/README +++ /dev/null @@ -1,2 +0,0 @@ -This application serves as prototype/test-bed for NetworkManager development. The excellent (non-existing) documentation -for the various NetworkManager interfaces makes this harder than it should be. diff --git a/tests/networkmanager/dialog.ui b/tests/networkmanager/dialog.ui deleted file mode 100644 index 13019086b6..0000000000 --- a/tests/networkmanager/dialog.ui +++ /dev/null @@ -1,213 +0,0 @@ -<?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>919</width> - <height>657</height> - </rect> - </property> - <property name="windowTitle"> - <string>Dialog</string> - </property> - <layout class="QGridLayout" name="gridLayout"> - <item row="0" column="0"> - <layout class="QHBoxLayout" name="horizontalLayout"> - <item> - <widget class="QLabel" name="label"> - <property name="text"> - <string>Connections</string> - </property> - </widget> - </item> - <item> - <widget class="QTreeWidget" name="cons"> - <column> - <property name="text"> - <string>Path</string> - </property> - </column> - <column> - <property name="text"> - <string>State</string> - </property> - </column> - <column> - <property name="text"> - <string>Id</string> - </property> - </column> - <column> - <property name="text"> - <string>Settings</string> - </property> - </column> - </widget> - </item> - </layout> - </item> - <item row="1" column="0"> - <layout class="QHBoxLayout" name="horizontalLayout_2"> - <item> - <widget class="QLabel" name="label_3"> - <property name="text"> - <string>Devices:</string> - </property> - </widget> - </item> - <item> - <widget class="QTreeWidget" name="devicesTreeWidget"> - <column> - <property name="text"> - <string>Path</string> - </property> - </column> - <column> - <property name="text"> - <string>Managed</string> - </property> - </column> - <column> - <property name="text"> - <string>Interface</string> - </property> - </column> - <column> - <property name="text"> - <string>Driver</string> - </property> - </column> - <column> - <property name="text"> - <string>Type</string> - </property> - </column> - <column> - <property name="text"> - <string>State</string> - </property> - </column> - <column> - <property name="text"> - <string>IP4 Address</string> - </property> - </column> - <column> - <property name="text"> - <string>IP4 Config</string> - </property> - </column> - <column> - <property name="text"> - <string>Hostname</string> - </property> - </column> - <column> - <property name="text"> - <string>Domains</string> - </property> - </column> - </widget> - </item> - </layout> - </item> - <item row="2" column="0"> - <spacer name="horizontalSpacer"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>908</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item row="3" column="0"> - <widget class="QTreeWidget" name="accessPointsTreeWidget"> - <property name="sortingEnabled"> - <bool>true</bool> - </property> - <column> - <property name="text"> - <string>SSID</string> - </property> - </column> - <column> - <property name="text"> - <string>Strength</string> - </property> - </column> - <column> - <property name="text"> - <string>Wpa</string> - </property> - </column> - <column> - <property name="text"> - <string>Rsn</string> - </property> - </column> - <column> - <property name="text"> - <string>Freq</string> - </property> - </column> - <column> - <property name="text"> - <string>Hardware Address</string> - </property> - </column> - <column> - <property name="text"> - <string>Mode</string> - </property> - </column> - <column> - <property name="text"> - <string>Max Bitrate</string> - </property> - </column> - </widget> - </item> - <item row="4" column="0"> - <layout class="QHBoxLayout" name="horizontalLayout_3"> - <item> - <widget class="QPushButton" name="startButton"> - <property name="text"> - <string>Start</string> - </property> - </widget> - </item> - <item> - <widget class="QPushButton" name="stopButton"> - <property name="text"> - <string>Stop</string> - </property> - </widget> - </item> - <item> - <widget class="QPushButton" name="scanButton"> - <property name="text"> - <string>Scan</string> - </property> - </widget> - </item> - <item> - <widget class="QPushButton" name="updateButton"> - <property name="text"> - <string>Update</string> - </property> - </widget> - </item> - </layout> - </item> - </layout> - </widget> - <resources/> - <connections/> -</ui> diff --git a/tests/networkmanager/networkmanager.pro b/tests/networkmanager/networkmanager.pro deleted file mode 100644 index 7ff370aaef..0000000000 --- a/tests/networkmanager/networkmanager.pro +++ /dev/null @@ -1,20 +0,0 @@ -SOURCES += networkmanagertest.cpp nmview.cpp -HEADERS += nmview.h -TARGET = tst_networkmanagertest - -QT = core network dbus gui - -#not really a test case but deployment happens same way -CONFIG += testcase - -requires(contains(QT_CONFIG,dbus)) - -INCLUDEPATH += ../../src/bearer -include(../../common.pri) - -CONFIG += mobility -MOBILITY = bearer - -#MOC_DIR = .moc -#OBJECTS_DIR = .obj -FORMS += dialog.ui diff --git a/tests/networkmanager/networkmanagertest.cpp b/tests/networkmanager/networkmanagertest.cpp deleted file mode 100644 index a39b041321..0000000000 --- a/tests/networkmanager/networkmanagertest.cpp +++ /dev/null @@ -1,287 +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 <QDBusConnection> -#include <QDBusError> -#include <QDBusInterface> -#include <QDBusMessage> -#include <QDBusReply> -#include <QtDBus> -#include <QHostAddress> -#include <QDebug> -#include <NetworkManager/NetworkManager.h> -#include <QApplication> -#include <QMainWindow> -#include "nmview.h" - -#include <arpa/inet.h> - -typedef QMap< QString, QMap<QString,QVariant> > SettingsMap; -Q_DECLARE_METATYPE(SettingsMap) - -void printConnectionDetails(const QString& service) -{ - QDBusConnection dbc = QDBusConnection::systemBus(); - if (!dbc.isConnected()) { - qWarning() << "Unable to connect to D-Bus:" << dbc.lastError(); - return; - } - QDBusInterface allCons(service, NM_DBUS_PATH_SETTINGS, NM_DBUS_IFACE_SETTINGS, dbc); - if (allCons.isValid()) { - QDBusReply<QList<QDBusObjectPath> > reply = allCons.call("ListConnections"); - if ( reply.isValid() ) { - qWarning() << "Known connections:"; - QList<QDBusObjectPath> list = reply.value(); - foreach(QDBusObjectPath path, list) { - qWarning() << " " << path.path(); - QDBusInterface sysIface(NM_DBUS_SERVICE_SYSTEM_SETTINGS, path.path(), NM_DBUS_IFACE_SETTINGS_CONNECTION, dbc); - if (sysIface.isValid()) { - QDBusMessage r = sysIface.call("GetSettings"); - QDBusReply< SettingsMap > rep = sysIface.call("GetSettings"); - qWarning() << " GetSettings:" << r.arguments() << r.signature() << rep.isValid() << sysIface.lastError(); - QMap< QString, QMap<QString,QVariant> > map = rep.value(); - QList<QString> list = map.keys(); - foreach (QString key, list) { - QMap<QString,QVariant> innerMap = map[key]; - qWarning() << " Key: " << key; - QMap<QString,QVariant>::const_iterator i = innerMap.constBegin(); - while (i != innerMap.constEnd()) { - QString k = i.key(); - qWarning() << " Key: " << k << " Entry: " << i.value(); - if (k == "addresses" && i.value().canConvert<QDBusArgument>()) { - QDBusArgument arg = i.value().value<QDBusArgument>(); - arg.beginArray(); - while (!arg.atEnd()) { - QDBusVariant addr; - arg >> addr; - uint ip = addr.variant().toUInt(); - qWarning() << ip; - qWarning() << " " << QHostAddress(htonl(ip)).toString(); - } - - } - i++; - } - } - } - } - } - } - - -} - -void readConnectionManagerDetails() -{ - qDBusRegisterMetaType<SettingsMap>(); - QDBusConnection dbc = QDBusConnection::systemBus(); - if (!dbc.isConnected()) { - qWarning() << "Unable to connect to D-Bus:" << dbc.lastError(); - return; - } - - QDBusInterface iface(NM_DBUS_SERVICE, NM_DBUS_PATH, NM_DBUS_INTERFACE, dbc); - if (!iface.isValid()) { - qWarning() << "Could not find NetworkManager"; - return; - } - - uint state = iface.property("State").toUInt(); - switch(state) { - case NM_STATE_UNKNOWN: - qWarning() << "State: Unknown"; break; - case NM_STATE_ASLEEP: - qWarning() << "State: Asleep"; break; - case NM_STATE_CONNECTING: - qWarning() << "State: Connecting"; break; - case NM_STATE_CONNECTED: - qWarning() << "State: Connected"; break; - case NM_STATE_DISCONNECTED: - qWarning() << "State: Disconnected"; break; - } - //get list of network devices - QDBusReply<QList<QDBusObjectPath> > reply = iface.call("GetDevices"); - if ( reply.isValid() ) { - qWarning() << "Current devices:"; - QList<QDBusObjectPath> list = reply.value(); - foreach(QDBusObjectPath path, list) { - qWarning() << " " << path.path(); - QDBusInterface devIface(NM_DBUS_SERVICE, path.path(), NM_DBUS_INTERFACE_DEVICE, dbc); - if (devIface.isValid()) { - qWarning() << " Managed: " << devIface.property("Managed").toBool(); - qWarning() << " Interface: " << devIface.property("Interface").toString(); - qWarning() << " HAL UDI: " << devIface.property("Udi").toString(); - qWarning() << " Driver: " << devIface.property("Driver").toString(); - QVariant v = devIface.property("DeviceType"); - switch(v.toUInt()) { - case DEVICE_TYPE_UNKNOWN: - qWarning() << " DeviceType: Unknown" ; - break; - case DEVICE_TYPE_802_3_ETHERNET: - qWarning() << " DeviceType: Ethernet" ; - break; - case DEVICE_TYPE_802_11_WIRELESS: - qWarning() << " DeviceType: Wireless" ; - break; - case DEVICE_TYPE_GSM: - qWarning() << " DeviceType: GSM" ; - break; - case DEVICE_TYPE_CDMA: - qWarning() << " DeviceType: CDMA" ; - break; - - } - v = devIface.property("State"); - switch(v.toUInt()) { - case NM_DEVICE_STATE_UNKNOWN: - qWarning() << " State: Unknown" ; break; - case NM_DEVICE_STATE_UNMANAGED: - qWarning() << " State: Unmanaged" ; break; - case NM_DEVICE_STATE_UNAVAILABLE: - qWarning() << " State: Unavailable" ; break; - case NM_DEVICE_STATE_DISCONNECTED: - qWarning() << " State: Disconnected" ; break; - case NM_DEVICE_STATE_PREPARE: - qWarning() << " State: Preparing" ; break; - case NM_DEVICE_STATE_CONFIG: - qWarning() << " State: Being configured" ; break; - case NM_DEVICE_STATE_NEED_AUTH: - qWarning() << " State: Awaiting secrets" ; break; - case NM_DEVICE_STATE_IP_CONFIG: - qWarning() << " State: IP requested" ; break; - case NM_DEVICE_STATE_ACTIVATED: - qWarning() << " State: Activated" ; break; - case NM_DEVICE_STATE_FAILED: - qWarning() << " State: FAILED" ; break; - } - quint32 ip = devIface.property("Ip4Address").toUInt(); - qWarning() << " IP4Address: " << QHostAddress(htonl(ip)).toString(); - if (v.toUInt() == NM_DEVICE_STATE_ACTIVATED) { - QString path = devIface.property("Ip4Config").value<QDBusObjectPath>().path(); - qWarning() << " IP4Config: " << path; - QDBusInterface ipIface(NM_DBUS_SERVICE, path, NM_DBUS_INTERFACE_IP4_CONFIG, dbc); - if (ipIface.isValid()) { - qWarning() << " Hostname: " << ipIface.property("Hostname").toString(); - qWarning() << " Domains: " << ipIface.property("Domains").toStringList(); - qWarning() << " NisDomain: " << ipIface.property("NisDomain").toString(); - QDBusArgument arg= ipIface.property("Addresses").value<QDBusArgument>(); - //qWarning() << " " << arg.currentType(); - qWarning() << " Addresses: " << ipIface.property("Addresses"); - qWarning() << " Nameservers: " << ipIface.property("Nameservers"); - qWarning() << " NisServers: " << ipIface.property("NisServers"); - } - - } - - } - } - } - - //get list of active connections - QVariant prop = iface.property("ActiveConnections"); - QList<QDBusObjectPath> connections = prop.value<QList<QDBusObjectPath> >(); - QString activePath; - if ( connections.count() ) - qWarning() << "Active connections:"; - foreach(QDBusObjectPath path, connections) { - qWarning() << " " << path.path(); - activePath = path.path(); - QString serviceName; - QDBusInterface conIface(NM_DBUS_SERVICE, path.path(), NM_DBUS_INTERFACE_ACTIVE_CONNECTION, dbc); - if (conIface.isValid()) { - qWarning() << " default connection: " << conIface.property("Default").toBool(); - serviceName = conIface.property("ServiceName").toString(); - qWarning() << " service name: " << serviceName; - qWarning() << " connection path: " << conIface.property("Connection").value<QDBusObjectPath>().path(); - qWarning() << " specific object:" << conIface.property("SpecificObject").value<QDBusObjectPath>().path(); - qWarning() << " sharedServiceName: " << conIface.property("SharedServiceName").toString(); - QList<QDBusObjectPath> devs = conIface.property("Devices").value<QList<QDBusObjectPath> >(); - qWarning() << " devices: "; - foreach(QDBusObjectPath p, devs) - qWarning() << " " << path.path(); - QVariant v = conIface.property("State"); - switch (v.toInt()) { - case NM_ACTIVE_CONNECTION_STATE_UNKNOWN: - qWarning()<< " State: unknown"; break; - case NM_ACTIVE_CONNECTION_STATE_ACTIVATING: - qWarning()<< " State: activating"; break; - case NM_ACTIVE_CONNECTION_STATE_ACTIVATED: - qWarning()<< " State: activated"; break; - } - } else { - qWarning() << conIface.lastError(); - } - - } - - printConnectionDetails(NM_DBUS_SERVICE_SYSTEM_SETTINGS); - printConnectionDetails(NM_DBUS_SERVICE_USER_SETTINGS); - - - //turn active connection off - /*QDBusObjectPath dbop("/org/freedesktop/NetworkManager/ActiveConnection/1"); - QVariant asd = QVariant::fromValue(dbop); - iface.call(QLatin1String("DeactivateConnection"), asd); - qWarning() << iface.lastError();*/ - - /*QDBusObjectPath p1device("/org/freedesktop/Hal/devices/net_00_60_6e_82_02_65"); - QVariant p1v = QVariant::fromValue(p1device); - QDBusObjectPath p1con("/org/freedesktop/NetworkManagerSettings/0"); - QVariant p1c = QVariant::fromValue(p1con); - QDBusObjectPath p1sp(""); - QVariant p1sp1 = QVariant::fromValue(p1sp); - iface.call(QLatin1String("ActivateConnection"), - QString("/org/freedesktop/NetworkManagerSystemSettings"), p1c,p1v, p1v ); - qWarning() << iface.lastError(); - */ -} - -int main( int argc, char** argv) -{ - QApplication app(argc, argv); - //readConnectionManagerDetails(); - QMainWindow main; - NMView view; - main.setCentralWidget(&view); - main.show(); - return app.exec(); - -} diff --git a/tests/networkmanager/nmview.cpp b/tests/networkmanager/nmview.cpp deleted file mode 100644 index fde5cae2a1..0000000000 --- a/tests/networkmanager/nmview.cpp +++ /dev/null @@ -1,1028 +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 "nmview.h" - -#include <QLabel> -#include <QLayout> -#include <QListWidget> -#include <QDebug> -#include <QPushButton> - -#include <QtDBus> -#include <QtNetwork> -#include <NetworkManager/NetworkManager.h> -#include <arpa/inet.h> - -#include <QDBusConnection> -#include <QDBusError> -#include <QDBusInterface> -#include <QDBusMessage> -#include <QDBusReply> - -#include <QHostAddress> -#include <QNetworkInterface> -#include <QTreeWidgetItem> -#include <QMessageBox> - -//#include "ui_dialog.h" - -#include <qnetworkconfiguration.h> -#include <qnetworkconfigmanager.h> -#include <qnetworksession.h> -#include <qnetworkmanagerservice_p.h> - -//static QDBusConnection dbc = QDBusConnection::systemBus(); -//typedef QMap< QString, QMap<QString,QVariant> > SettingsMap; -//Q_DECLARE_METATYPE(SettingsMap) - - -NMView::NMView(QDialog* parent) - : QDialog(parent, 0), dbc(QDBusConnection::systemBus()) -{ - init(); - - if (!dbc.isConnected()) { - qWarning() << "Unable to connect to D-Bus:" << dbc.lastError(); - return; - } - updateConnections(); - getDevices(); -} - -NMView::~NMView() -{ -} -void NMView::init() -{ - setupUi(this); - sess = 0; -// readSettings(); - connect(startButton, SIGNAL(clicked()), this, SLOT(activate())); - connect(stopButton, SIGNAL(clicked()), this, SLOT(deactivate())); - connect(scanButton, SIGNAL(clicked()), this, SLOT(findAccessPoints())); - connect(updateButton, SIGNAL(clicked()), this, SLOT(update())); - - connect(cons, SIGNAL(itemActivated(QTreeWidgetItem*, int)), - this,SLOT(connectionItemActivated(QTreeWidgetItem*, int))); - - - connect(devicesTreeWidget, SIGNAL(itemActivated(QTreeWidgetItem*, int)), - this, SLOT(deviceItemActivated(QTreeWidgetItem*, int))); - - cons->header()->setResizeMode(QHeaderView::ResizeToContents); - devicesTreeWidget->header()->setResizeMode(QHeaderView::ResizeToContents); - accessPointsTreeWidget->header()->setResizeMode(QHeaderView::ResizeToContents); -// accessPointsTreeWidget->header()->setResizeMode(QHeaderView::ResizeToContents); - - manager = new QNetworkConfigurationManager(this); - - connect(manager, SIGNAL(updateCompleted()), this, SLOT(updateCompleted())); - - connect(manager, SIGNAL(configurationAdded(const QNetworkConfiguration &)), - this, SLOT(configurationAdded(const QNetworkConfiguration&))); - - devicesTreeWidget->header()->hideSection(0); - devicesTreeWidget->header()->hideSection(1); - devicesTreeWidget->header()->hideSection(3); - devicesTreeWidget->header()->hideSection(5); - devicesTreeWidget->header()->hideSection(6); - devicesTreeWidget->header()->hideSection(7); - devicesTreeWidget->header()->hideSection(8); - devicesTreeWidget->header()->hideSection(9); -} - -void NMView::updateConnections() -{ - cons->clear(); - manager->updateConfigurations(); - QList<QNetworkConfiguration> configs = manager->allConfigurations(); - foreach(QNetworkConfiguration p, configs) { - QStringList strlist; - strlist << p.name(); - strlist << stateToString(p.state()); - strlist << p.identifier(); - strlist << typeToString(p.type()); - QTreeWidgetItem *item; - item = new QTreeWidgetItem(strlist); - cons->insertTopLevelItem(0, item); - } - cons->sortItems ( 1, Qt::AscendingOrder); -} - -void NMView::getActiveConnections() -{ - QList<QNetworkConfiguration> configs = manager->allConfigurations(QNetworkConfiguration::Active); - foreach(QNetworkConfiguration p, configs) { - qWarning() << __FUNCTION__ << p.name() << p.identifier(); - } - -// QDBusInterface iface(NM_DBUS_SERVICE, NM_DBUS_PATH, NM_DBUS_INTERFACE, dbc); -// if (!iface.isValid()) { -// qWarning() << "Could not find NetworkManager"; -// return; -// } - -// QVariant prop = iface.property("ActiveConnections"); -// QList<QDBusObjectPath> connections = prop.value<QList<QDBusObjectPath> >(); -// foreach(QDBusObjectPath path, connections) { -// QDBusInterface conDetails(NM_DBUS_SERVICE, path.path(), NM_DBUS_INTERFACE_ACTIVE_CONNECTION, dbc); -// if (conDetails.isValid()) { -// QString desc = path.path(); -// conDetails.property("Connection Path").value<QDBusObjectPath>().path(); - -// QList<QDBusObjectPath> devices = conDetails.property("Devices").value<QList<QDBusObjectPath> >(); -// -// foreach(QDBusObjectPath devpath, devices) { -// QDBusInterface devIface(NM_DBUS_SERVICE, devpath.path(), NM_DBUS_INTERFACE_DEVICE, dbc); -// desc += " "+devIface.property("Interface").toString(); -// desc += " "+QHostAddress(htonl(devIface.property("Ip4Address").toUInt())).toString(); - -// } - -// qWarning() << conDetails.property("Connection").value<QDBusObjectPath>().path() << path.path(); - -// QListWidgetItem* item = new QListWidgetItem(desc, activeCons); -// item->setData(Qt::UserRole, path.path()); -// } -// } -} - -void NMView::update() -{ -// QNetworkManagerInterface *dbIface; -// dbIface = new QNetworkManagerInterface; -// QList <QDBusObjectPath> connections = dbIface->activeConnections(); -// -// foreach(QDBusObjectPath conpath, connections) { -// QNetworkManagerConnectionActive *aConn; -// aConn = new QNetworkManagerConnectionActive(conpath.path()); -// // in case of accesspoint, specificObject will hold the accessPOintObjectPath -// qWarning() << aConn->connection().path() << aConn->specificObject().path() << aConn->devices().count(); -// QList <QDBusObjectPath> devs = aConn->devices(); -// foreach(QDBusObjectPath device, devs) { -// qWarning() << " " << device.path(); -// } -// } - - QStringList connectionServices; - connectionServices << NM_DBUS_SERVICE_SYSTEM_SETTINGS; - connectionServices << NM_DBUS_SERVICE_USER_SETTINGS; - foreach (QString service, connectionServices) { - QDBusInterface allCons(service, - NM_DBUS_PATH_SETTINGS, - NM_DBUS_IFACE_SETTINGS, - dbc); - if (allCons.isValid()) { - QDBusReply<QList<QDBusObjectPath> > reply = allCons.call("ListConnections"); - if ( reply.isValid() ) { - QList<QDBusObjectPath> list = reply.value(); - foreach(QDBusObjectPath path, list) { - QDBusInterface sysIface(service, - path.path(), - NM_DBUS_IFACE_SETTINGS_CONNECTION, - dbc); - if (sysIface.isValid()) { - qWarning() << ""; - qWarning() << path.path(); - - // QDBusMessage r = sysIface.call("GetSettings"); - QDBusReply< QNmSettingsMap > rep = sysIface.call("GetSettings"); - - QMap< QString, QMap<QString,QVariant> > map = rep.value(); - QList<QString> list = map.keys(); - foreach (QString key, list) { - QMap<QString,QVariant> innerMap = map[key]; - qWarning() << " Key: " << key; - QMap<QString,QVariant>::const_iterator i = innerMap.constBegin(); - - while (i != innerMap.constEnd()) { - QString k = i.key(); - qWarning() << " Key: " << k << " Entry: " << i.value(); - i++; - }//end innerMap - }//end foreach key - }//end settings connection - } // foreach path - } //end ListConnections - } //end settingsInterface - }// end services - QDBusInterface iface(NM_DBUS_SERVICE, - NM_DBUS_PATH, - NM_DBUS_INTERFACE, - dbc); - if (iface.isValid()) { - QVariant prop = iface.property("ActiveConnections"); - QList<QDBusObjectPath> connections = prop.value<QList<QDBusObjectPath> >(); - foreach(QDBusObjectPath conpath, connections) { - qWarning() << "Active connection" << conpath.path(); - QDBusInterface conDetails(NM_DBUS_SERVICE, - conpath.path(), - NM_DBUS_INTERFACE_ACTIVE_CONNECTION, - dbc); - if (conDetails.isValid()) { - - QVariant prop = conDetails.property("Connection"); - QDBusObjectPath connection = prop.value<QDBusObjectPath>(); - qWarning() << conDetails.property("Default").toBool() << connection.path(); - -// QVariant Sprop = conDetails.property("Devices"); -// QList<QDBusObjectPath> so = Sprop.value<QList<QDBusObjectPath> >(); -// foreach(QDBusObjectPath device, so) { -// if(device.path() == devicePath) { -// path = connection.path(); -// } -// break; -// } - } - } - } -qWarning() << ""; -} - -void NMView::deactivate() -{ - QList<QNetworkConfiguration> configs = manager->allConfigurations(QNetworkConfiguration::Active); - foreach(QNetworkConfiguration p, configs) { - qWarning() << "Active cons" << p.name(); - if(p.name() == cons->currentItem()->text(0) - && p.identifier() == cons->currentItem()->text(2)) { - qWarning() <<__FUNCTION__<< p.name(); - if(!sess) { - sess = new QNetworkSession(p); - - connect(sess, SIGNAL(stateChanged(QNetworkSession::State)), - this, SLOT(stateChanged(QNetworkSession::State))); - - connect(sess, SIGNAL(error(QNetworkSession::SessionError)), - this, SLOT(networkSessionError(QNetworkSession::SessionError))); - } - sess->close(); - delete sess; - sess = 0; - } - } -} - -void NMView::activate() -{ - qWarning() << __FUNCTION__ << cons->currentItem()->text(0); - - QList<QNetworkConfiguration> configs = manager->allConfigurations(); - foreach(QNetworkConfiguration p, configs) { - if(p.name() == cons->currentItem()->text(0)) { - - sess = new QNetworkSession(p); - - connect(sess, SIGNAL(newConfigurationActivated()), - this, SLOT(getActiveConnections())); - - connect(sess, SIGNAL(stateChanged(QNetworkSession::State)), - this, SLOT(stateChanged(QNetworkSession::State))); - - connect(sess, SIGNAL(error(QNetworkSession::SessionError)), - this, SLOT(networkSessionError(QNetworkSession::SessionError))); - - sess->open(); - } - } -} - -void NMView::getDevices() -{ - qWarning() << ""; - qWarning() << __FUNCTION__; - devicesTreeWidget->clear(); - //qDBusRegisterMetaType<SettingsMap>(); - - if (!dbc.isConnected()) { - qWarning() << "Unable to connect to D-Bus:" << dbc.lastError(); - return; - } - QDBusInterface iface(NM_DBUS_SERVICE, - NM_DBUS_PATH, - NM_DBUS_INTERFACE, - dbc); -//NetworkManager interface - if (!iface.isValid()) { - qWarning() << "Could not find NetworkManager"; - return; - } - -// uint state = iface.property("State").toUInt(); -// switch(state) { -// case NM_STATE_UNKNOWN: -// qWarning() << "State: Unknown"; break; -// case NM_STATE_ASLEEP: -// qWarning() << "State: Asleep"; break; -// case NM_STATE_CONNECTING: -// qWarning() << "State: Connecting"; break; -// case NM_STATE_CONNECTED: -// qWarning() << "State: Connected"; break; -// case NM_STATE_DISCONNECTED: -// qWarning() << "State: Disconnected"; break; -// } - - //get list of network devices - QTreeWidgetItem *item; - QDBusReply<QList<QDBusObjectPath> > reply = iface.call("GetDevices"); - if ( reply.isValid() ) { -// qWarning() << "Current devices:"; - QList<QDBusObjectPath> list = reply.value(); - foreach(QDBusObjectPath path, list) { - QStringList devicesList; - qWarning() << " " << path.path(); - devicesList << path.path(); - - QDBusInterface devIface(NM_DBUS_SERVICE, - path.path(), - NM_DBUS_INTERFACE_DEVICE, - dbc); - if (devIface.isValid()) { - - - - ////// connect the dbus signal -// /*if(*/dbc.connect(NM_DBUS_SERVICE, -// path.path(), -// NM_DBUS_INTERFACE_DEVICE, -// "StateChanged", -// this,SLOT(deviceStateChanged(quint32))); -// { -// qWarning() << "XXXXXXXXXX dbus connect successful" << path.path(); -// } - - - // qWarning() << " Managed: " << devIface.property("Managed").toBool(); - devicesList << devIface.property("Managed").toString(); - // qWarning() << " Interface: " << devIface.property("Interface").toString(); - devicesList << devIface.property("Interface").toString(); - // qWarning() << " HAL UDI: " << devIface.property("Udi").toString(); - // qWarning() << " Driver: " << devIface.property("Driver").toString(); - devicesList << devIface.property("Driver").toString(); - - QString x = deviceTypeToString(devIface.property("DeviceType").toUInt()); - // qWarning() << " Type:" << x; - devicesList << x; - - if( devIface.property("DeviceType").toUInt() == DEVICE_TYPE_802_11_WIRELESS) { - qWarning() << "Device is WIFI"; - // // findAccessPoints(path.path()); - } - - QVariant v = devIface.property("State"); - x = deviceStateToString(v.toUInt()); -// qWarning() << " State:" << x; - devicesList << x; - - quint32 ip = devIface.property("Ip4Address").toUInt(); -// qWarning() << " IP4Address: " << QHostAddress(htonl(ip)).toString(); - devicesList << QHostAddress(htonl(ip)).toString(); - - - if (v.toUInt() == NM_DEVICE_STATE_ACTIVATED) { - QString path = devIface.property("Ip4Config").value<QDBusObjectPath>().path(); -// qWarning() << " IP4Config: " << path; - devicesList << path; - QDBusInterface ipIface(NM_DBUS_SERVICE, - path, - NM_DBUS_INTERFACE_IP4_CONFIG, - dbc); - if (ipIface.isValid()) { - // qWarning() << " Hostname: " << ipIface.property("Hostname").toString(); - devicesList << ipIface.property("Hostname").toString(); -// qWarning() << " Domains: " << ipIface.property("Domains").toStringList(); - devicesList << ipIface.property("Domains").toStringList().join(", "); -// qWarning() << " NisDomain: " << ipIface.property("NisDomain").toString(); - QDBusArgument arg= ipIface.property("Addresses").value<QDBusArgument>(); -// qWarning() << " Addresses: " << ipIface.property("Addresses"); -// qWarning() << " Nameservers: " << ipIface.property("Nameservers"); -// qWarning() << " NisServers: " << ipIface.property("NisServers"); - } - - } - - } - item = new QTreeWidgetItem(devicesList); - devicesTreeWidget->insertTopLevelItem(0, item); - } - } - - -// netconfig(); - -} - -void NMView::readSettings() -{ - QDBusInterface settingsiface(NM_DBUS_SERVICE_SYSTEM_SETTINGS, - NM_DBUS_PATH_SETTINGS, - NM_DBUS_IFACE_SETTINGS, - dbc); - //NetworkManagerSettings interface - if (settingsiface.isValid()) { - QDBusReply<QList<QDBusObjectPath> > reply = settingsiface.call("ListConnections"); - if ( reply.isValid() ) { - QList<QDBusObjectPath> list = reply.value(); - foreach(QDBusObjectPath path, list) { - qWarning() <<__FUNCTION__ << path.path(); - - } - } - } - - QDBusInterface iface(NM_DBUS_SERVICE, NM_DBUS_PATH, NM_DBUS_INTERFACE, dbc); - if (!iface.isValid()) { - qWarning() << "Could not find NetworkManager"; - return; - } - - // QStringList list = item->text().split(" -> "); - - QVariant prop = iface.property("ActiveConnections"); - QList<QDBusObjectPath> connections = prop.value<QList<QDBusObjectPath> >(); - foreach(QDBusObjectPath path, connections) { - QDBusInterface conDetails(NM_DBUS_SERVICE, - path.path(), - NM_DBUS_INTERFACE_ACTIVE_CONNECTION, - dbc); - - if (conDetails.isValid()) { - QString desc = path.path(); - qWarning() << desc; - //if ( item->text(0) == conDetails.property("Connection").value<QDBusObjectPath>().path() ) { - // QListWidgetItem* item = new QTreeWidgetItem( desc, - // cons); - // item->setData(Qt::UserRole, desc); - // activeItemActivated( item ); - //} - } - } -} - -void NMView::printConnectionDetails(const QString& service) -{ - Q_UNUSED(service); - -// -// qWarning() << __FUNCTION__ << service; -// -// QDBusConnection dbc = QDBusConnection::systemBus(); -// if (!dbc.isConnected()) { -// qWarning() << "Unable to connect to D-Bus:" << dbc.lastError(); -// return; -// } -// QDBusInterface allCons(service, -// NM_DBUS_PATH_SETTINGS, -// NM_DBUS_IFACE_SETTINGS, -// dbc); -// -// if (allCons.isValid()) { -// QDBusReply<QList<QDBusObjectPath> > reply = allCons.call("ListConnections"); -// -// if ( reply.isValid() ) { -// qWarning() << "Known connections:"; -// QList<QDBusObjectPath> list = reply.value(); -// -// foreach(QDBusObjectPath path, list) { -// qWarning() << " " << path.path(); -// -// QDBusInterface sysIface(NM_DBUS_SERVICE_SYSTEM_SETTINGS, -// path.path(), -// NM_DBUS_IFACE_SETTINGS_CONNECTION, -// dbc); -// -// if (sysIface.isValid()) { -// QDBusMessage r = sysIface.call("GetSettings"); -// QDBusReply< QSettingsMap > rep = sysIface.call("GetSettings"); -// -// qWarning() << " GetSettings:" << r.arguments() << r.signature() << rep.isValid() << sysIface.lastError(); -// -// QMap< QString, QMap<QString,QVariant> > map = rep.value(); -// QList<QString> list = map.keys(); -// -// foreach (QString key, list) { -// QMap<QString,QVariant> innerMap = map[key]; -// qWarning() << " Key: " << key; -// QMap<QString,QVariant>::const_iterator i = innerMap.constBegin(); -// -// while (i != innerMap.constEnd()) { -// QString k = i.key(); -// qWarning() << " Key: " << k << " Entry: " << i.value(); -// -// if (k == "addresses" && i.value().canConvert<QDBusArgument>()) { -// QDBusArgument arg = i.value().value<QDBusArgument>(); -// arg.beginArray(); -// -// while (!arg.atEnd()) { -// QDBusVariant addr; -// arg >> addr; -// uint ip = addr.variant().toUInt(); -// qWarning() << ip; -// qWarning() << " " << QHostAddress(htonl(ip)).toString(); -// } -// -// } -// i++; -// } -// } -// } -// } -// } -// } - qWarning() << ""; -} - -void NMView::getNetworkDevices() -{ - -} - -void NMView::connectionItemActivated( QTreeWidgetItem * item, int col ) -{ - Q_UNUSED(col); - - qWarning() <<__FUNCTION__<< item->text(0); - QDBusInterface iface(NM_DBUS_SERVICE, - NM_DBUS_PATH, - NM_DBUS_INTERFACE, - dbc); - if (!iface.isValid()) { - qWarning() << "Could not find NetworkManager"; - return; - } - QVariant prop = iface.property("ActiveConnections"); - QList<QDBusObjectPath> connections = prop.value<QList<QDBusObjectPath> >(); - foreach(QDBusObjectPath path, connections) { - QDBusInterface conDetails(NM_DBUS_SERVICE, - path.path(), - NM_DBUS_INTERFACE_ACTIVE_CONNECTION, - dbc); - - if (conDetails.isValid()) { - QString desc = path.path(); - qWarning() << desc; - if ( item->text(0) == conDetails.property("Connection").value<QDBusObjectPath>().path() ) { -// QListWidgetItem* item = new QTreeWidgetItem( desc, -// cons); -// item->setData(Qt::UserRole, desc); -// activeItemActivated( item ); - } - } - } -} - - - -void NMView::deviceItemActivated( QTreeWidgetItem * item , int section) -{ - Q_UNUSED(item); - Q_UNUSED(section); - - // qWarning() << item->text(section) << item->text(4); - //if(item->text(4) == "Wireless") findAccessPoints(item->text(0)); -} - - -void NMView::netconfig() -{ -// qWarning() << __FUNCTION__; - -// qDBusRegisterMetaType<SettingsMap>(); - QDBusConnection dbc = QDBusConnection::systemBus(); - if (!dbc.isConnected()) { - qWarning() << "Unable to connect to D-Bus:" << dbc.lastError(); - return; - } - - QDBusInterface iface(NM_DBUS_SERVICE, - NM_DBUS_PATH, - NM_DBUS_IFACE_SETTINGS_CONNECTION, - dbc); - if (!iface.isValid()) { - qWarning() << "Could not find NetworkManager Settings"; - return; - } else { - QDBusReply<QList<QDBusObjectPath> > reply = iface.call("ListConnections"); - QList<QDBusObjectPath> list = reply.value(); -// qWarning() << reply.value(); - foreach(QDBusObjectPath path, list) { - qWarning() << " " << path.path(); - } - } -} - - -void NMView::findAccessPoints() -{ - accessPointsTreeWidget->clear(); - - QDBusInterface iface(NM_DBUS_SERVICE, - NM_DBUS_PATH, - NM_DBUS_INTERFACE, - dbc); - - QDBusReply<QList<QDBusObjectPath> > reply = iface.call("GetDevices"); - if ( reply.isValid() ) { - QList<QDBusObjectPath> list = reply.value(); - foreach(QDBusObjectPath path, list) { - QDBusInterface devIface(NM_DBUS_SERVICE, - path.path(), - NM_DBUS_INTERFACE_DEVICE, - dbc); - if (devIface.isValid()) { - - if( devIface.property("DeviceType").toUInt() == DEVICE_TYPE_802_11_WIRELESS) { - -// qWarning() <<"deviface"<< devIface.path(); - QDBusInterface wififace(NM_DBUS_SERVICE, - devIface.path(), - NM_DBUS_INTERFACE_DEVICE_WIRELESS, - dbc); - if (!wififace.isValid()) { - qWarning() << "Could not find NetworkManager wireless interface"; - return; - } - -///////////////////////// -// if(dbc.connect(NM_DBUS_SERVICE, -// path.path(), -// NM_DBUS_INTERFACE_DEVICE_WIRELESS, -// "PropertiesChanged", -// this,SLOT(aPPropertiesChanged( QMap<QString,QVariant>))) ) { -// qWarning() << "PropertiesChanged connect"; -// } else { -// qWarning() << "NOT connect"; - -// } -///////////////////////// - qWarning() <<"wififace"<< wififace.path(); - QDBusReply<QList<QDBusObjectPath> > reply2 = wififace.call("GetAccessPoints"); - if ( reply2.isValid() ) { - QTreeWidgetItem *item; - QList<QDBusObjectPath> list2 = reply2.value(); - foreach(QDBusObjectPath path2, list2) { - QDBusInterface accessPointIface(NM_DBUS_SERVICE, - path2.path(), - NM_DBUS_INTERFACE_ACCESS_POINT, - dbc); - if (accessPointIface.isValid()) { -//// qWarning() <<"path2" << path2.path(); - -// if(dbc.connect(NM_DBUS_SERVICE, //signal strength -// path2.path(), -// NM_DBUS_INTERFACE_ACCESS_POINT, -// "PropertiesChanged", -// this,SLOT(aPPropertiesChanged( QMap<QString,QVariant>))) ) { -// qWarning() << "PropertiesChanged connect"; -// } else { -// qWarning() << "NOT connect"; -// -// } - - QStringList accessPoints; - accessPoints << accessPointIface.property("Ssid").toString(); - accessPoints << QString::number(accessPointIface.property("Strength").toInt()); - accessPoints << securityCapabilitiesToString(accessPointIface.property("WpaFlags" ).toInt()); - accessPoints << securityCapabilitiesToString(accessPointIface.property("RsnFlags" ).toInt()); - accessPoints << accessPointIface.property("Frequency" ).toString(); - accessPoints << accessPointIface.property("HwAddress" ).toString(); - accessPoints << deviceModeToString(accessPointIface.property("Mode" ).toInt()); - accessPoints << accessPointIface.property("MaxBitrate" ).toString(); - //HwAddress - // if(accessPointIface.property("Flags" ).toInt() == NM_802_11_AP_FLAGS_PRIVACY ) { - // qWarning() << "Secure"; - // } - item = new QTreeWidgetItem(accessPoints); - accessPointsTreeWidget->insertTopLevelItem(0, item); - } - } - } - } - } - } - } -} - -QString NMView::deviceStateToString(int state) -{ - QString ret; - switch(state) { - case NM_DEVICE_STATE_UNKNOWN: - ret = "Unknown"; - break; - case NM_DEVICE_STATE_UNMANAGED: - ret = "Unmanaged"; - break; - case NM_DEVICE_STATE_UNAVAILABLE: - ret = "Unavailable"; - break; - case NM_DEVICE_STATE_DISCONNECTED: - ret = "Disconnected"; - break; - case NM_DEVICE_STATE_PREPARE: - ret = "Preparing to connect"; - break; - case NM_DEVICE_STATE_CONFIG: - ret = "Being configured"; - break; - case NM_DEVICE_STATE_NEED_AUTH: - ret = "Awaiting secrets"; - break; - case NM_DEVICE_STATE_IP_CONFIG: - ret = "IP requested"; - break; - case NM_DEVICE_STATE_ACTIVATED: - ret = "Activated"; - break; - case NM_DEVICE_STATE_FAILED: - ret = "FAILED"; - break; - }; - return ret; -} - -QString NMView::deviceTypeToString(int device) -{ - QString ret; - switch(device) { - case DEVICE_TYPE_UNKNOWN: - ret = "Unknown"; - break; - case DEVICE_TYPE_802_3_ETHERNET: - ret = "Ethernet"; - break; - case DEVICE_TYPE_802_11_WIRELESS: - ret = "Wireless"; - break; - case DEVICE_TYPE_GSM: - ret = "GSM"; - break; - case DEVICE_TYPE_CDMA: - ret = "CDMA"; - break; - }; - return ret; -} - -QString NMView::securityCapabilitiesToString(int caps) -{ - int check = caps; -// qWarning() << __FUNCTION__<< caps; - QString ret; - if( check == 0 ) - ret += "None."; - if( (check & NM_802_11_AP_SEC_PAIR_WEP40)) - ret += " 40-bit WEP encryption. "; - if( (check & NM_802_11_AP_SEC_PAIR_WEP104) ) - ret += " 104-bit WEP encryption. "; - if( (check & NM_802_11_AP_SEC_PAIR_TKIP) ) - ret += " TKIP encryption. "; - if( (check & NM_802_11_AP_SEC_PAIR_CCMP) ) - ret += " CCMP encryption. "; - if( (check & NM_802_11_AP_SEC_GROUP_WEP40)) - ret += " 40-bit WEP cipher. "; - if( (check & NM_802_11_AP_SEC_GROUP_WEP104)) - ret += " 104-bit WEP cipher. "; - if( (check & NM_802_11_AP_SEC_GROUP_TKIP) ) - ret += " TKIP cipher. "; - if( (check & NM_802_11_AP_SEC_GROUP_CCMP) ) - ret += " CCMP cipher. "; - if( (check & NM_802_11_AP_SEC_KEY_MGMT_PSK)) - ret += " PSK key management. "; - if( (check & NM_802_11_AP_SEC_KEY_MGMT_802_1X) ) - ret += " 802.1x key management. "; - return ret; -} - -QString NMView::deviceModeToString(int mode) -{ - QString ret; - switch (mode) { - case NM_802_11_MODE_UNKNOWN: - ret = "Unknown"; - break; - case NM_802_11_MODE_ADHOC: - ret = " (Adhoc)."; - break; - case NM_802_11_MODE_INFRA: - ret = " (Infrastructure)"; - }; - return ret; -} - -void NMView::netManagerState(quint32 state) -{ - qWarning() << __FUNCTION__ << state;// << old << reason; - switch(state) { - case NM_STATE_UNKNOWN: - qWarning() << "The NetworkManager daemon is in an unknown state. "; - break; - case NM_STATE_ASLEEP: - qWarning() << "The NetworkManager daemon is asleep and all interfaces managed by it are inactive. "; - break; - case NM_STATE_CONNECTING: - qWarning() << "The NetworkManager daemon is connecting a device. FIXME: What does this mean when one device is active and another is connecting? "; - break; - case NM_STATE_CONNECTED: - qWarning() <<"The NetworkManager daemon is connected. "; - break; - case NM_STATE_DISCONNECTED: - qWarning() << "The NetworkManager daemon is disconnected."; - break; - - }; -} - -void NMView::deviceStateChanged(quint32 state) -{ - qWarning() << __FUNCTION__ << state; - switch(state) { - case NM_DEVICE_STATE_UNKNOWN : - qWarning() <<"The device is in an unknown state. "; - break; - case NM_DEVICE_STATE_UNMANAGED: - qWarning() <<"The device is not managed by NetworkManager."; - break; - case NM_DEVICE_STATE_UNAVAILABLE: - qWarning() <<"The device cannot be used (carrier off, rfkill, etc)."; - break; - case NM_DEVICE_STATE_DISCONNECTED: - qWarning() <<"The device is not connected."; - break; - case NM_DEVICE_STATE_PREPARE: - qWarning() <<"The device is preparing to connect."; - break; - case NM_DEVICE_STATE_CONFIG: - qWarning() <<"The device is being configured."; - break; - case NM_DEVICE_STATE_NEED_AUTH: - qWarning() <<"The device is awaiting secrets necessary to continue connection."; - break; - case NM_DEVICE_STATE_IP_CONFIG: - qWarning() <<"The IP settings of the device are being requested and configured."; - break; - case NM_DEVICE_STATE_ACTIVATED: - qWarning() <<"The device is active."; - break; - case NM_DEVICE_STATE_FAILED: - qWarning() <<"The device is in a failure state following an attempt to activate it."; - break; - }; -} - -void NMView::updateCompleted() -{ - qWarning() << __FUNCTION__; -} - -void NMView::newConfigurationActivated() -{ - qWarning() << __FUNCTION__; - getActiveConnections(); -} - -void NMView::stateChanged(QNetworkSession::State state) -{ - // QString stateStringstr; - switch (state) { - case QNetworkSession::Invalid: - stateString = "Invalid session"; - break; - case QNetworkSession::NotAvailable: - stateString = "Session is defined but not yet discovered"; - break; - case QNetworkSession::Connecting: - stateString = "Session is being established"; - break; - case QNetworkSession::Connected: - stateString = "Session is active and can be used for socket operations"; - cons->currentItem()->setText(1, "Active"); - break; - case QNetworkSession::Closing: - stateString = "Session is being shutdown"; - break; - case QNetworkSession::Disconnected: - qWarning() << __FUNCTION__; - manager->updateConfigurations(); - stateString = "Session disconnected"; - cons->currentItem()->setText(1,"Discovered") ; - break; - case QNetworkSession::Roaming: - stateString = "session is roaming from one AP to another"; - break; - }; - qWarning() << __FUNCTION__ << state << stateString; -} - -QString NMView::stateToString(int state) -{ - switch (state) { - case QNetworkConfiguration::Undefined: - return "Undefined"; - break; - case QNetworkConfiguration::Defined: - return "Defined"; - break; - case QNetworkConfiguration::Discovered: - return "Discovered"; - break; - case QNetworkConfiguration::Active: - return "Active"; - break; - }; - return ""; -} - -void NMView::configurationAdded(const QNetworkConfiguration &config) -{ - qWarning() << __FUNCTION__<< config.name() << config.identifier(); -} - -QString NMView::typeToString(int type) -{ - switch(type) { - case QNetworkConfiguration::InternetAccessPoint: - return "Internet AccessPoint"; - break; - case QNetworkConfiguration::ServiceNetwork: - return "Service Network"; - break; - }; - return QString(); -} - -void NMView::aPPropertiesChanged( QMap<QString,QVariant> map) -{ - //QMap<QString, QVariant>::const_iterator iterator = d->values.find(type + QLatin1String("Path")) - QMapIterator<QString, QVariant> i(map); - while (i.hasNext()) { - i.next(); - if( i.key() == "State") { - qWarning() << __FUNCTION__ << i.key() << ": " << i.value().toUInt(); -// deviceStateChanged(i.value().toUInt()); - } else if( i.key() == "ActiveAccessPoint") { - qWarning() << __FUNCTION__ << i.key() << ": " << i.value().value<QDBusObjectPath>().path(); - } else if( i.key() == "Strength") - qWarning() << __FUNCTION__ << i.key() << ": " << i.value().toUInt(); - else - qWarning() << __FUNCTION__ << i.key() << ": " << i.value(); - } -} - -void NMView::networkSessionError(QNetworkSession::SessionError error) -{ - QString errorStr; - switch(error) { - case QNetworkSession::RoamingError: - errorStr = "Roaming error"; - break; - case QNetworkSession::SessionAbortedError: - errorStr = "Session aborted by user or system"; - break; - default: - case QNetworkSession::UnknownSessionError: - errorStr = "Unidentified Error"; - break; - }; - - QMessageBox::warning(this, tr("NMView"), errorStr, QMessageBox::Ok); -} diff --git a/tests/networkmanager/nmview.h b/tests/networkmanager/nmview.h deleted file mode 100644 index e15aacdcfb..0000000000 --- a/tests/networkmanager/nmview.h +++ /dev/null @@ -1,109 +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 <QWidget> -#include <QDBusConnection> -#include <qnetworkconfigmanager.h> -#include <qnetworksession.h> -#include <qnetworkconfiguration.h> - -#include "ui_dialog.h" - -QTM_USE_NAMESPACE - -QT_BEGIN_NAMESPACE -class QListWidget; -class QTreeWidget; -class QTreeWidgetItem; -QT_END_NAMESPACE - -class NMView : public QDialog, private Ui::Dialog -{ - Q_OBJECT -public: - NMView(QDialog* parent = 0); - virtual ~NMView(); - -private: - void init(); - QString stateString; - - QDBusConnection dbc; - void printConnectionDetails(const QString&); - - QString deviceStateToString(int state); - QString deviceTypeToString(int device); - QString securityCapabilitiesToString(int caps); - QString deviceModeToString(int mode); -//QDBusInterface getInterface(); - QNetworkConfigurationManager *manager; - QNetworkSession *sess; - QString stateToString(int state); - QString typeToString(int type); - -private slots: - void update(); - void deactivate(); - void activate(); - void getActiveConnections(); - void updateConnections(); - void getDevices(); - // void readConnectionManagerDetails(); - void getNetworkDevices(); - void connectionItemActivated( QTreeWidgetItem *, int); -// void activeItemActivated( QListWidgetItem *); - void deviceItemActivated( QTreeWidgetItem *, int); - void netconfig(); - void findAccessPoints(); - - void netManagerState(quint32); - void readSettings(); - void updateCompleted(); - void newConfigurationActivated(); - - void stateChanged(QNetworkSession::State); - void deviceStateChanged(quint32 state); - - void configurationAdded(const QNetworkConfiguration &config); - void aPPropertiesChanged( QMap<QString,QVariant> map); - void networkSessionError(QNetworkSession::SessionError); - -}; diff --git a/tests/networkmanager/startdlg.cpp b/tests/networkmanager/startdlg.cpp deleted file mode 100644 index 4720932bd0..0000000000 --- a/tests/networkmanager/startdlg.cpp +++ /dev/null @@ -1,95 +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 "startdlg.h" -#include <NetworkManager/NetworkManager.h> - - -StartDialog::StartDialog(QWidget * parent) - :QDialog(parent) -{ - QVBoxLayout *layout = new QVBoxLayout(this); - box = new QComboBox(); - layout->addWidget(box); - - QHBoxLayout* hbox = new QHBoxLayout(); - QPushButton* start = new QPushButton("Start"); - connect(start, SIGNAL(clicked()), this, SLOT(accept())); - QPushButton* cancel = new QPushButton("Cancel"); - connect(cancel, SIGNAL(clicked()), this, SLOT(reject())); - - - hbox->addWidget(start); - hbox->addWidget(cancel); - - layout->addLayout(hbox); - - QDBusConnection dbc = QDBusConnection::systemBus(); - if (!dbc.isConnected()) { - qWarning() << "Unable to connect to D-Bus:" << dbc.lastError(); - return; - } - QDBusInterface iface(NM_DBUS_SERVICE, NM_DBUS_PATH, NM_DBUS_INTERFACE, dbc); - if (!iface.isValid()) { - qWarning() << "Could not find NetworkManager"; - return; - } - QDBusReply<QList<QDBusObjectPath> > reply = iface.call("GetDevices"); - if ( reply.isValid() ) { - QList<QDBusObjectPath> list = reply.value(); - foreach(QDBusObjectPath path, list) { - QDBusInterface devIface(NM_DBUS_SERVICE, path.path(), NM_DBUS_INTERFACE_DEVICE, dbc); - if ( devIface.isValid() ) { - box->addItem(devIface.property("Interface").toString(), QVariant(path.path())); - } - } - } -} - -QString StartDialog::device() const -{ - return dev; -} - -void StartDialog::accept() -{ - dev = box->itemData(box->currentIndex(), Qt::UserRole).toString(); - QDialog::accept(); -} diff --git a/tests/publishsubscribeex/main.cpp b/tests/publishsubscribeex/main.cpp index 8fcce24721..3370f10334 100644 --- a/tests/publishsubscribeex/main.cpp +++ b/tests/publishsubscribeex/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/publishsubscribeex/publishsubscribemainwindow.cpp b/tests/publishsubscribeex/publishsubscribemainwindow.cpp index c77066197b..9ae4d72040 100644 --- a/tests/publishsubscribeex/publishsubscribemainwindow.cpp +++ b/tests/publishsubscribeex/publishsubscribemainwindow.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/publishsubscribeex/publishsubscribemainwindow.h b/tests/publishsubscribeex/publishsubscribemainwindow.h index 49cfe7c7c0..dc89e09ba6 100644 --- a/tests/publishsubscribeex/publishsubscribemainwindow.h +++ b/tests/publishsubscribeex/publishsubscribemainwindow.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/sampleserviceplugin/sampleserviceplugin.cpp b/tests/sampleserviceplugin/sampleserviceplugin.cpp index f47c1f5337..c0f4a30584 100644 --- a/tests/sampleserviceplugin/sampleserviceplugin.cpp +++ b/tests/sampleserviceplugin/sampleserviceplugin.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/sampleserviceplugin/sampleserviceplugin.h b/tests/sampleserviceplugin/sampleserviceplugin.h index a1c3d9c0e9..58cc9a0937 100644 --- a/tests/sampleserviceplugin/sampleserviceplugin.h +++ b/tests/sampleserviceplugin/sampleserviceplugin.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/sampleserviceplugin2/sampleserviceplugin2.cpp b/tests/sampleserviceplugin2/sampleserviceplugin2.cpp index 2aaf66794b..eb62806dca 100644 --- a/tests/sampleserviceplugin2/sampleserviceplugin2.cpp +++ b/tests/sampleserviceplugin2/sampleserviceplugin2.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/sampleserviceplugin2/sampleserviceplugin2.h b/tests/sampleserviceplugin2/sampleserviceplugin2.h index 9f5660cd05..288469177d 100644 --- a/tests/sampleserviceplugin2/sampleserviceplugin2.h +++ b/tests/sampleserviceplugin2/sampleserviceplugin2.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/tests.pro b/tests/tests.pro index 05ed9fc201..6c3f2ac130 100644 --- a/tests/tests.pro +++ b/tests/tests.pro @@ -5,9 +5,6 @@ SUBDIRS += auto benchmarks contains(mobility_modules,serviceframework): SUBDIRS += testservice2 sampleserviceplugin sampleserviceplugin2 contains(mobility_modules,bearer) { - contains(QT_CONFIG,dbus) { - !symbian:!mac:!maemo6:!maemo5:unix:SUBDIRS += networkmanager - } symbian:SUBDIRS += bearerex } diff --git a/tests/testservice2/testservice.h b/tests/testservice2/testservice.h index fe654a9e0a..65f1e58cf1 100644 --- a/tests/testservice2/testservice.h +++ b/tests/testservice2/testservice.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/testservice2/testserviceinterface.h b/tests/testservice2/testserviceinterface.h index 5e0455daae..b0cc448c1a 100644 --- a/tests/testservice2/testserviceinterface.h +++ b/tests/testservice2/testserviceinterface.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/testservice2/testserviceplugin.cpp b/tests/testservice2/testserviceplugin.cpp index 32ecbe818c..a58e23d489 100644 --- a/tests/testservice2/testserviceplugin.cpp +++ b/tests/testservice2/testserviceplugin.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/testservice2/testserviceplugin.h b/tests/testservice2/testserviceplugin.h index 86b44f3aa3..84059ee786 100644 --- a/tests/testservice2/testserviceplugin.h +++ b/tests/testservice2/testserviceplugin.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tools/qcrmlgen/main.cpp b/tools/qcrmlgen/main.cpp index e35c601032..36e3a4631c 100644 --- a/tools/qcrmlgen/main.cpp +++ b/tools/qcrmlgen/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tools/qcrmlgen/qcrmlgen.cpp b/tools/qcrmlgen/qcrmlgen.cpp index 94cb0bc956..0ac785fadb 100644 --- a/tools/qcrmlgen/qcrmlgen.cpp +++ b/tools/qcrmlgen/qcrmlgen.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tools/qcrmlgen/qcrmlgen.h b/tools/qcrmlgen/qcrmlgen.h index bbd5454ee1..d54d0f8a58 100644 --- a/tools/qcrmlgen/qcrmlgen.h +++ b/tools/qcrmlgen/qcrmlgen.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tools/servicefw/servicefw.cpp b/tools/servicefw/servicefw.cpp index fec5f24e1f..355d3d7495 100644 --- a/tools/servicefw/servicefw.cpp +++ b/tools/servicefw/servicefw.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tools/servicexmlgen/errorcollector.cpp b/tools/servicexmlgen/errorcollector.cpp index 13f59103a4..56c835ee89 100644 --- a/tools/servicexmlgen/errorcollector.cpp +++ b/tools/servicexmlgen/errorcollector.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tools/servicexmlgen/errorcollector.h b/tools/servicexmlgen/errorcollector.h index ad78df20d3..894671f409 100644 --- a/tools/servicexmlgen/errorcollector.h +++ b/tools/servicexmlgen/errorcollector.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tools/servicexmlgen/interfacestabwidget.cpp b/tools/servicexmlgen/interfacestabwidget.cpp index 7ffbb7e94a..37b6b4e404 100644 --- a/tools/servicexmlgen/interfacestabwidget.cpp +++ b/tools/servicexmlgen/interfacestabwidget.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tools/servicexmlgen/interfacestabwidget.h b/tools/servicexmlgen/interfacestabwidget.h index 765254a480..94f3fc8541 100644 --- a/tools/servicexmlgen/interfacestabwidget.h +++ b/tools/servicexmlgen/interfacestabwidget.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tools/servicexmlgen/interfacewidget.cpp b/tools/servicexmlgen/interfacewidget.cpp index f3bff0c373..7d6e9c60b4 100644 --- a/tools/servicexmlgen/interfacewidget.cpp +++ b/tools/servicexmlgen/interfacewidget.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tools/servicexmlgen/interfacewidget.h b/tools/servicexmlgen/interfacewidget.h index e0f7b3bbeb..a5e5d7cf9d 100644 --- a/tools/servicexmlgen/interfacewidget.h +++ b/tools/servicexmlgen/interfacewidget.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tools/servicexmlgen/mandatorylineedit.cpp b/tools/servicexmlgen/mandatorylineedit.cpp index 263cf5789d..6f2e207769 100644 --- a/tools/servicexmlgen/mandatorylineedit.cpp +++ b/tools/servicexmlgen/mandatorylineedit.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tools/servicexmlgen/mandatorylineedit.h b/tools/servicexmlgen/mandatorylineedit.h index 28984ce480..f2b09ea052 100644 --- a/tools/servicexmlgen/mandatorylineedit.h +++ b/tools/servicexmlgen/mandatorylineedit.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tools/servicexmlgen/servicewidget.cpp b/tools/servicexmlgen/servicewidget.cpp index 856e37c610..cb418e89e8 100644 --- a/tools/servicexmlgen/servicewidget.cpp +++ b/tools/servicexmlgen/servicewidget.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tools/servicexmlgen/servicewidget.h b/tools/servicexmlgen/servicewidget.h index dbbeee0127..96f3daed54 100644 --- a/tools/servicexmlgen/servicewidget.h +++ b/tools/servicexmlgen/servicewidget.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tools/servicexmlgen/servicexmlgen.cpp b/tools/servicexmlgen/servicexmlgen.cpp index 02c2756cfd..4e757ee219 100644 --- a/tools/servicexmlgen/servicexmlgen.cpp +++ b/tools/servicexmlgen/servicexmlgen.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tools/servicexmlgen/servicexmlgen.h b/tools/servicexmlgen/servicexmlgen.h index b916420aae..4a3b8d85de 100644 --- a/tools/servicexmlgen/servicexmlgen.h +++ b/tools/servicexmlgen/servicexmlgen.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tools/vsexplorer/vsexplorer.cpp b/tools/vsexplorer/vsexplorer.cpp index 5546c692d7..1b8f57b497 100644 --- a/tools/vsexplorer/vsexplorer.cpp +++ b/tools/vsexplorer/vsexplorer.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** |
