diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2011-07-13 15:47:08 +1000 |
|---|---|---|
| committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2011-07-13 16:34:34 +1000 |
| commit | bebaf4b6411b0729f73ed977798e4024bdb562ac (patch) | |
| tree | a04686679cf5f63892d610d66b8e35a5e4d5200e /tests/auto/geotestplugin/qgeoserviceproviderplugin_test.h | |
| parent | 31b9ab4141bfc5b2c548e8385d91c90944c91f63 (diff) | |
| parent | 47db4be971b687c74d40b798c400c8ca99147aed (diff) | |
| download | qtlocation-bebaf4b6411b0729f73ed977798e4024bdb562ac.tar.gz | |
Merge remote branch 'origin/master' into places-base
Conflicts:
examples/declarative/mapviewer/mapviewer.qml
src/location/maps/qgeosearchmanager.h
src/location/maps/qgeosearchmanager_p.h
Change-Id: I7ae2e6b1b748cd8eee3a5cc7520a956a1fcde0cd
Diffstat (limited to 'tests/auto/geotestplugin/qgeoserviceproviderplugin_test.h')
| -rw-r--r-- | tests/auto/geotestplugin/qgeoserviceproviderplugin_test.h | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/tests/auto/geotestplugin/qgeoserviceproviderplugin_test.h b/tests/auto/geotestplugin/qgeoserviceproviderplugin_test.h index f747f38d..915b20b2 100644 --- a/tests/auto/geotestplugin/qgeoserviceproviderplugin_test.h +++ b/tests/auto/geotestplugin/qgeoserviceproviderplugin_test.h @@ -7,29 +7,29 @@ ** 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. +** 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 +** 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. -** -** +** 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. ** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. ** ** ** |