Skip to content

Commit

Permalink
updates to licenses
Browse files Browse the repository at this point in the history
Again some updates to clean the whole QGIS tree of unlicensed files.
Main purpose is to make the source tree checkable by debian licensechecker to clearly state the license of QGIS and find out if everything is compatible.
  • Loading branch information
mach0 committed Dec 11, 2012
1 parent dcf3ede commit d5bc39c
Show file tree
Hide file tree
Showing 9 changed files with 34 additions and 3 deletions.
6 changes: 6 additions & 0 deletions mac/xcode/src/x_qgsspatialitesourceselect.cpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
/*
* This file is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*/
#if !SQLITE_QSYSTEM

#include "../../src/app/qgsspatialitesourceselect.cpp"
Expand Down
6 changes: 6 additions & 0 deletions mac/xcode/src/x_spatialite.c
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
/*
* This file is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*/
#if SQLITE_QINTERNAL

#include "../../src/core/spatialite/spatialite.c"
Expand Down
6 changes: 6 additions & 0 deletions mac/xcode/src/x_sqlite3.c
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
/*
* This file is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*/
#if SQLITE_QINTERNAL

#include "../../src/core/spatialite/sqlite3.c"
Expand Down
1 change: 1 addition & 0 deletions qgis.dtd
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<!-- DTD for QGIS project file
* This DTD describes the maplayers and their symbology and
* is used when saving/restoring a QGIS project.
* This file is in the public domain
-->

<!--
Expand Down
1 change: 1 addition & 0 deletions src/core/spatialite/headers/spatialite/sqlite3.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
** alias MACROs to avoid any potential collision
** for linker symbols declared into the sqlite3 code
** internally embedded into SpatiaLite
** This file is in the public domain
*/
#define sqlite3_version SPLite3_version
#define sqlite3_libversion SPLite3_libversion
Expand Down
1 change: 1 addition & 0 deletions src/core/spatialite/headers/spatialite/sqlite3ext.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
** alias MACROs to avoid any potential collision
** for linker symbols declared into the sqlite3 code
** internally embedded into SpatiaLite
** This file is in the public domain.
*/
#define sqlite3_version SPLite3_version
#define sqlite3_libversion SPLite3_libversion
Expand Down
1 change: 1 addition & 0 deletions src/core/spatialite/sqlite3.c
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
** code internally embedded in SpatiaLite never defines
** any linker symbol potentially conflicting with
** an external sqlite3 library
** This file is in the public domain
*/
#define sqlite3_version SPLite3_version
#define sqlite3_libversion SPLite3_libversion
Expand Down
10 changes: 7 additions & 3 deletions src/gui/symbology-ng/characterwidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
** This library/program is free software; you can redistribute it
** and/or modify it under the terms of the GNU Library General Public
** License as published by the Free Software Foundation; either
** version 2 of the License, or ( at your option ) any later version.
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
Expand All @@ -14,13 +19,12 @@
** 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
** 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.
Expand Down
5 changes: 5 additions & 0 deletions src/gui/symbology-ng/characterwidget.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
** This library/program is free software; you can redistribute it
** and/or modify it under the terms of the GNU Library General Public
** License as published by the Free Software Foundation; either
** version 2 of the License, or ( at your option ) any later version.
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
Expand Down

0 comments on commit d5bc39c

Please sign in to comment.