diff options
| author | Michael Goddard <michael.goddard@nokia.com> | 2010-05-18 16:52:21 +1000 |
|---|---|---|
| committer | Michael Goddard <michael.goddard@nokia.com> | 2010-05-18 16:52:21 +1000 |
| commit | bfe7bdb223dc1cb6e0a8fa08cd1d37811fb89399 (patch) | |
| tree | 5347f20c78c688ee413457c7b7dbbd03dcfb237c /doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.cpp | |
| parent | 1a046c110a194daa8d103b09e171bd1b322b6cec (diff) | |
| parent | acc08dcc707feed6836ed1190794ddc9f66ea964 (diff) | |
Merge branch '1.0' of scm.dev.nokia.troll.no:qtmobility/qtmobility into 1.0
Conflicts:
configure
examples/qmlcontacts/qmlcontact.cpp
examples/qmlcontacts/qmlcontact.h
examples/qmlcontacts/qmlcontacts.cpp
examples/qmlcontacts/qmlcontactsa.h
plugins/contacts/qtcontacts-tracker/qcontacttrackerbackend.cpp
plugins/contacts/qtcontacts-tracker/qcontacttrackerbackend_p.h
plugins/contacts/qtcontacts-tracker/qtcontacts-tracker.pro
plugins/contacts/qtcontacts-tracker/qtrackercontactasyncrequest.h
plugins/contacts/qtcontacts-tracker/qtrackercontactfetchrequest.cpp
plugins/contacts/qtcontacts-tracker/qtrackercontactfetchrequest.h
plugins/contacts/qtcontacts-tracker/qtrackercontactidfetchrequest.cpp
plugins/contacts/qtcontacts-tracker/qtrackercontactidfetchrequest.h
plugins/contacts/qtcontacts-tracker/qtrackercontactsaverequest.cpp
plugins/contacts/qtcontacts-tracker/qtrackercontactsaverequest.h
plugins/contacts/qtcontacts-tracker/qtrackercontactslive.cpp
plugins/contacts/qtcontacts-tracker/qtrackercontactslive.h
plugins/contacts/qtcontacts-tracker/qtrackerrelationshipfetchrequest.cpp
plugins/contacts/qtcontacts-tracker/qtrackerrelationshipfetchrequest.h
plugins/contacts/qtcontacts-tracker/qtrackerrelationshipsaverequest.cpp
plugins/contacts/qtcontacts-tracker/qtrackerrelationshipsaverequest.h
plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_add_async/ut_qtcontacts_add_async.cpp
plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_add_async/ut_qtcontacts_add_async.h
plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_common/ut_qtcontacts_common.h
plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_fetch/ut_qtcontacts_fetch.cpp
plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_fetch/ut_qtcontacts_fetch.h
plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_sparql/ut_qtcontacts_sparql.cpp
plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_sparql/ut_qtcontacts_sparql.h
plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_trackerplugin/contactmanager.cpp
plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_trackerplugin/contactmanager.h
plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_trackerplugin/ut_qtcontacts_trackerplugin.cpp
plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_trackerplugin/ut_qtcontacts_trackerplugin.h
plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_trackerplugin_definitions/ut_qtcontacts_trackerplugin_definitions.cpp
plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_trackerplugin_definitions/ut_qtcontacts_trackerplugin_definitions.h
plugins/contacts/qtcontacts-tracker/trackerchangelistener.cpp
plugins/contacts/qtcontacts-tracker/trackerchangelistener.h
Diffstat (limited to 'doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.cpp')
| -rw-r--r-- | doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.cpp b/doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.cpp index f12b16548a..5dee651f9c 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) ** |