diff options
| author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-02-25 15:48:41 +0100 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-02-26 08:17:31 +0000 |
| commit | 3ca6b6c2ea271a8ba0719afd7e51b4d04fef4e4a (patch) | |
| tree | d8b587c654c21cae1b7a85389b0182f227bcd752 /src/location/doc/src/plugins | |
| parent | 4de705b32c14f1b528a934c5ca91088ed4c89c6d (diff) | |
| download | qtlocation-3ca6b6c2ea271a8ba0719afd7e51b4d04fef4e4a.tar.gz | |
Remove all Nokia specific license details.
The terms and conditions were not accurate anymore. Instead we refer to
the relevant URL. In general the Nokia plugin is no different than
other plugins. The user must comply with each services T&Cs.
Nokia and Ovi don't exist anymore. The service runs under the Here
term these days.
Change-Id: Ie73b5cc9577946a2e1ce433ed67e0bca0b894a57
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
Diffstat (limited to 'src/location/doc/src/plugins')
| -rw-r--r-- | src/location/doc/src/plugins/nokia.qdoc | 2 | ||||
| -rw-r--r-- | src/location/doc/src/plugins/nokia_terms.qdoc | 41 |
2 files changed, 1 insertions, 42 deletions
diff --git a/src/location/doc/src/plugins/nokia.qdoc b/src/location/doc/src/plugins/nokia.qdoc index d70640db..427126ef 100644 --- a/src/location/doc/src/plugins/nokia.qdoc +++ b/src/location/doc/src/plugins/nokia.qdoc @@ -36,7 +36,7 @@ Included with Qt Location is a geo services plugin which accesses the relevant Nokia services provided by Nokia. The use of these services is governed by the terms and conditions -available at \l {Qt Location Nokia Plugin - Nokia Services Terms and Conditions}. +available at \l {https://developer.here.com/terms-conditions}. Note that accepting the terms and conditions only applies those terms and conditions to the use of the Nokia geo services plugin and does not limit the use of the other geo services plugins that may diff --git a/src/location/doc/src/plugins/nokia_terms.qdoc b/src/location/doc/src/plugins/nokia_terms.qdoc deleted file mode 100644 index 45514dec..00000000 --- a/src/location/doc/src/plugins/nokia_terms.qdoc +++ /dev/null @@ -1,41 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -/*! -\page location-plugin-nokia-terms.html -\title Qt Location Nokia Plugin - Nokia Services Terms and Conditions -\previouspage {Qt Location Nokia Plugin} - -Use of the relevant Nokia services provided by Nokia via the \l {Qt Location Nokia Plugin} are -governed by the terms and conditions available in the file -src/plugins/geoservices/nokia/NOKIA_TERMS_AND_CONDITIONS.txt in the Qt Location source -package. The terms and conditions are reproduced below for convenience. - -\legalese -\include NOKIA_TERMS_AND_CONDITIONS.txt.qdocinc -\endlegalese -*/ |