summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/src/examples/declarative-flickr.qdoc2
-rw-r--r--doc/src/examples/declarative-mapviewer.qdoc2
-rw-r--r--doc/src/examples/declarative-places.qdoc2
-rw-r--r--doc/src/examples/logfilepositionsource.qdoc2
-rw-r--r--doc/src/examples/qtlocation-examples.qdoc2
-rw-r--r--doc/src/examples/weatherinfo.qdoc2
-rw-r--r--doc/src/imports/qtlocation5.qdoc2
-rw-r--r--doc/src/maps.qdoc2
-rw-r--r--doc/src/places.qdoc2
-rw-r--r--doc/src/plugins/jsondb.qdoc2
-rw-r--r--doc/src/plugins/nokia.qdoc2
-rw-r--r--doc/src/plugins/places-backend.qdoc2
-rw-r--r--doc/src/plugins/qml-location.qdoc2
-rw-r--r--doc/src/position.qdoc2
-rw-r--r--doc/src/qml-maps.qdoc2
-rw-r--r--doc/src/qtlocation-cpp.qdoc2
-rw-r--r--doc/src/qtlocation-geoservices.qdoc2
-rw-r--r--doc/src/qtlocation.qdoc2
-rw-r--r--doc/src/snippets/cpp/cppqml.cpp2
-rw-r--r--doc/src/snippets/cpp/main.cpp2
-rw-r--r--doc/src/snippets/declarative/content/Cell.qml2
-rw-r--r--doc/src/snippets/declarative/declarative-location.qml2
-rw-r--r--doc/src/snippets/declarative/declarative-map.qml2
-rw-r--r--doc/src/snippets/declarative/places.qml2
-rw-r--r--doc/src/snippets/declarative/plugin.qml2
-rw-r--r--doc/src/snippets/declarative/testpolymapobjects.qml2
-rw-r--r--doc/src/snippets/places/main.cpp2
-rw-r--r--doc/src/snippets/places/requesthandler.h2
-rw-r--r--doc/src/tutorials/maps.qdoc2
29 files changed, 29 insertions, 29 deletions
diff --git a/doc/src/examples/declarative-flickr.qdoc b/doc/src/examples/declarative-flickr.qdoc
index 97073a0b..ccdd95be 100644
--- a/doc/src/examples/declarative-flickr.qdoc
+++ b/doc/src/examples/declarative-flickr.qdoc
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the documentation of the Qt Toolkit.
@@ -21,6 +20,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/doc/src/examples/declarative-mapviewer.qdoc b/doc/src/examples/declarative-mapviewer.qdoc
index 0f4251f9..30f73a07 100644
--- a/doc/src/examples/declarative-mapviewer.qdoc
+++ b/doc/src/examples/declarative-mapviewer.qdoc
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the documentation of the Qt Toolkit.
@@ -21,6 +20,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/doc/src/examples/declarative-places.qdoc b/doc/src/examples/declarative-places.qdoc
index 74c8e736..4ae6d00d 100644
--- a/doc/src/examples/declarative-places.qdoc
+++ b/doc/src/examples/declarative-places.qdoc
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the documentation of the Qt Toolkit.
@@ -21,6 +20,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/doc/src/examples/logfilepositionsource.qdoc b/doc/src/examples/logfilepositionsource.qdoc
index 4c544bed..fdd54d48 100644
--- a/doc/src/examples/logfilepositionsource.qdoc
+++ b/doc/src/examples/logfilepositionsource.qdoc
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the documentation of the Qt Toolkit.
@@ -21,6 +20,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/doc/src/examples/qtlocation-examples.qdoc b/doc/src/examples/qtlocation-examples.qdoc
index 40224ab0..be4f77d5 100644
--- a/doc/src/examples/qtlocation-examples.qdoc
+++ b/doc/src/examples/qtlocation-examples.qdoc
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the documentation of the Qt Toolkit.
@@ -21,6 +20,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/doc/src/examples/weatherinfo.qdoc b/doc/src/examples/weatherinfo.qdoc
index d0d8f7b3..b517785b 100644
--- a/doc/src/examples/weatherinfo.qdoc
+++ b/doc/src/examples/weatherinfo.qdoc
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the documentation of the Qt Toolkit.
@@ -21,6 +20,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/doc/src/imports/qtlocation5.qdoc b/doc/src/imports/qtlocation5.qdoc
index 9e92ffa8..2b1a5791 100644
--- a/doc/src/imports/qtlocation5.qdoc
+++ b/doc/src/imports/qtlocation5.qdoc
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the documentation of the Qt Toolkit.
@@ -21,6 +20,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/doc/src/maps.qdoc b/doc/src/maps.qdoc
index 1b9ff69c..c1e0928f 100644
--- a/doc/src/maps.qdoc
+++ b/doc/src/maps.qdoc
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the documentation of the Qt Toolkit.
@@ -21,6 +20,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/doc/src/places.qdoc b/doc/src/places.qdoc
index ff6e297e..d7e703c6 100644
--- a/doc/src/places.qdoc
+++ b/doc/src/places.qdoc
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the documentation of the Qt Toolkit.
@@ -21,6 +20,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/doc/src/plugins/jsondb.qdoc b/doc/src/plugins/jsondb.qdoc
index 1ac1bf8e..3ada3c8e 100644
--- a/doc/src/plugins/jsondb.qdoc
+++ b/doc/src/plugins/jsondb.qdoc
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the documentation of the Qt Toolkit.
@@ -21,6 +20,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/doc/src/plugins/nokia.qdoc b/doc/src/plugins/nokia.qdoc
index 44079f10..5765e420 100644
--- a/doc/src/plugins/nokia.qdoc
+++ b/doc/src/plugins/nokia.qdoc
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the documentation of the Qt Toolkit.
@@ -21,6 +20,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/doc/src/plugins/places-backend.qdoc b/doc/src/plugins/places-backend.qdoc
index 3abeb826..ad1e2893 100644
--- a/doc/src/plugins/places-backend.qdoc
+++ b/doc/src/plugins/places-backend.qdoc
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the documentation of the Qt Toolkit.
@@ -21,6 +20,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/doc/src/plugins/qml-location.qdoc b/doc/src/plugins/qml-location.qdoc
index f05542c1..48f9bcc9 100644
--- a/doc/src/plugins/qml-location.qdoc
+++ b/doc/src/plugins/qml-location.qdoc
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the documentation of the Qt Toolkit.
@@ -21,6 +20,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/doc/src/position.qdoc b/doc/src/position.qdoc
index 9b47c525..f18d03fb 100644
--- a/doc/src/position.qdoc
+++ b/doc/src/position.qdoc
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the documentation of the Qt Toolkit.
@@ -21,6 +20,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/doc/src/qml-maps.qdoc b/doc/src/qml-maps.qdoc
index 0d07e962..640b1484 100644
--- a/doc/src/qml-maps.qdoc
+++ b/doc/src/qml-maps.qdoc
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the documentation of the Qt Toolkit.
@@ -21,6 +20,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/doc/src/qtlocation-cpp.qdoc b/doc/src/qtlocation-cpp.qdoc
index 38f19440..681670b9 100644
--- a/doc/src/qtlocation-cpp.qdoc
+++ b/doc/src/qtlocation-cpp.qdoc
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the documentation of the Qt Toolkit.
@@ -21,6 +20,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/doc/src/qtlocation-geoservices.qdoc b/doc/src/qtlocation-geoservices.qdoc
index d0f494b2..9cd9ed3e 100644
--- a/doc/src/qtlocation-geoservices.qdoc
+++ b/doc/src/qtlocation-geoservices.qdoc
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the documentation of the Qt Toolkit.
@@ -21,6 +20,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/doc/src/qtlocation.qdoc b/doc/src/qtlocation.qdoc
index c309f5f5..0480abed 100644
--- a/doc/src/qtlocation.qdoc
+++ b/doc/src/qtlocation.qdoc
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the documentation of the Qt Toolkit.
@@ -21,6 +20,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/doc/src/snippets/cpp/cppqml.cpp b/doc/src/snippets/cpp/cppqml.cpp
index 14300ffc..71af96a7 100644
--- a/doc/src/snippets/cpp/cppqml.cpp
+++ b/doc/src/snippets/cpp/cppqml.cpp
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the QtLocation module of the Qt Toolkit.
@@ -34,6 +33,7 @@
** 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/doc/src/snippets/cpp/main.cpp b/doc/src/snippets/cpp/main.cpp
index 5f68df53..12d1453f 100644
--- a/doc/src/snippets/cpp/main.cpp
+++ b/doc/src/snippets/cpp/main.cpp
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the QtLocation module of the Qt Toolkit.
@@ -34,6 +33,7 @@
** 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/doc/src/snippets/declarative/content/Cell.qml b/doc/src/snippets/declarative/content/Cell.qml
index 5dbdb874..829b3067 100644
--- a/doc/src/snippets/declarative/content/Cell.qml
+++ b/doc/src/snippets/declarative/content/Cell.qml
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the examples of the Qt Mobility Components.
@@ -34,6 +33,7 @@
** 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/doc/src/snippets/declarative/declarative-location.qml b/doc/src/snippets/declarative/declarative-location.qml
index b37f9de8..06cd3b53 100644
--- a/doc/src/snippets/declarative/declarative-location.qml
+++ b/doc/src/snippets/declarative/declarative-location.qml
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the examples of the Qt Mobility Components.
@@ -34,6 +33,7 @@
** 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/doc/src/snippets/declarative/declarative-map.qml b/doc/src/snippets/declarative/declarative-map.qml
index 1282297b..92636782 100644
--- a/doc/src/snippets/declarative/declarative-map.qml
+++ b/doc/src/snippets/declarative/declarative-map.qml
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the examples of the Qt Mobility Components.
@@ -34,6 +33,7 @@
** 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/doc/src/snippets/declarative/places.qml b/doc/src/snippets/declarative/places.qml
index 472b0045..0fdcdd8b 100644
--- a/doc/src/snippets/declarative/places.qml
+++ b/doc/src/snippets/declarative/places.qml
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the documentation of the Qt Toolkit.
@@ -34,6 +33,7 @@
** 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/doc/src/snippets/declarative/plugin.qml b/doc/src/snippets/declarative/plugin.qml
index b96758fa..cafd2c70 100644
--- a/doc/src/snippets/declarative/plugin.qml
+++ b/doc/src/snippets/declarative/plugin.qml
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the documentation of the Qt Toolkit.
@@ -34,6 +33,7 @@
** 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/doc/src/snippets/declarative/testpolymapobjects.qml b/doc/src/snippets/declarative/testpolymapobjects.qml
index 8636364a..c2d8110b 100644
--- a/doc/src/snippets/declarative/testpolymapobjects.qml
+++ b/doc/src/snippets/declarative/testpolymapobjects.qml
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the examples of the Qt Mobility Components.
@@ -34,6 +33,7 @@
** 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/doc/src/snippets/places/main.cpp b/doc/src/snippets/places/main.cpp
index 5a868994..d5d12563 100644
--- a/doc/src/snippets/places/main.cpp
+++ b/doc/src/snippets/places/main.cpp
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the QtLocation module of the Qt Toolkit.
@@ -34,6 +33,7 @@
** 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/doc/src/snippets/places/requesthandler.h b/doc/src/snippets/places/requesthandler.h
index 6b52728a..5bce9bc6 100644
--- a/doc/src/snippets/places/requesthandler.h
+++ b/doc/src/snippets/places/requesthandler.h
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the QtLocation module of the Qt Toolkit.
@@ -34,6 +33,7 @@
** 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/doc/src/tutorials/maps.qdoc b/doc/src/tutorials/maps.qdoc
index 19934833..ba2aa0c7 100644
--- a/doc/src/tutorials/maps.qdoc
+++ b/doc/src/tutorials/maps.qdoc
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the documentation of the Qt Toolkit.
@@ -21,6 +20,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/