From 6658ff760db4c5cb71a2a02ca792be8b99264112 Mon Sep 17 00:00:00 2001 From: Lorenz Meier Date: Tue, 31 May 2016 09:19:00 +0200 Subject: [PATCH] Update more license terms --- CodingStyle.cc | 31 +++++++++---------------------- CodingStyle.h | 31 +++++++++---------------------- CodingStyle.qml | 29 ++++++++--------------------- QGCCommon.pri | 12 +----------- QGCInstaller.pri | 12 +----------- QGCSetup.pri | 12 +----------- README.md | 1 + qgroundcontrol.pro | 12 +----------- 8 files changed, 31 insertions(+), 109 deletions(-) diff --git a/CodingStyle.cc b/CodingStyle.cc index d448fa94a..9c5d7527a 100644 --- a/CodingStyle.cc +++ b/CodingStyle.cc @@ -1,25 +1,12 @@ -/*===================================================================== - - QGroundControl Open Source Ground Control Station - - (c) 2009 - 2015 QGROUNDCONTROL PROJECT - - This file is part of the QGROUNDCONTROL project - - QGROUNDCONTROL 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. - - QGROUNDCONTROL is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with QGROUNDCONTROL. If not, see . - - ======================================================================*/ +/**************************************************************************** + * + * (c) 2009-2016 QGROUNDCONTROL PROJECT + * + * QGroundControl is licensed according to the terms in the file + * COPYING.md in the root of the source code directory. + * + ****************************************************************************/ + // This is an example class c++ file which is used to describe the QGroundControl // coding style. In general almost everything in here has some coding style meaning. diff --git a/CodingStyle.h b/CodingStyle.h index 05fc19419..49ce95812 100644 --- a/CodingStyle.h +++ b/CodingStyle.h @@ -1,25 +1,12 @@ -/*===================================================================== - - QGroundControl Open Source Ground Control Station - - (c) 2009 - 2015 QGROUNDCONTROL PROJECT - - This file is part of the QGROUNDCONTROL project - - QGROUNDCONTROL 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. - - QGROUNDCONTROL is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with QGROUNDCONTROL. If not, see . - - ======================================================================*/ +/**************************************************************************** + * + * (c) 2009-2016 QGROUNDCONTROL PROJECT + * + * QGroundControl is licensed according to the terms in the file + * COPYING.md in the root of the source code directory. + * + ****************************************************************************/ + // This is an example class header file which is used to describe the QGroundControl // coding style. In general almost everything in here has some coding style meaning. diff --git a/CodingStyle.qml b/CodingStyle.qml index 5962951ad..204f3ee72 100644 --- a/CodingStyle.qml +++ b/CodingStyle.qml @@ -1,25 +1,12 @@ -/*===================================================================== +/**************************************************************************** + * + * (c) 2009-2016 QGROUNDCONTROL PROJECT + * + * QGroundControl is licensed according to the terms in the file + * COPYING.md in the root of the source code directory. + * + ****************************************************************************/ -QGroundControl Open Source Ground Control Station - -(c) 2009, 2015 QGROUNDCONTROL PROJECT - -This file is part of the QGROUNDCONTROL project - - QGROUNDCONTROL 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. - - QGROUNDCONTROL is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with QGROUNDCONTROL. If not, see . - -======================================================================*/ import QtQuick 2.5 import QtQuick.Controls 1.3 diff --git a/QGCCommon.pri b/QGCCommon.pri index 067adf58a..67f4e25ad 100644 --- a/QGCCommon.pri +++ b/QGCCommon.pri @@ -4,17 +4,7 @@ # Maintainer: # Lorenz Meier # (c) 2009-2014 QGroundControl Developers -# This file is part of the open groundstation project -# QGroundControl 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. -# QGroundControl is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# You should have received a copy of the GNU General Public License -# along with QGroundControl. If not, see . +# License terms set in COPYING.md # ------------------------------------------------- # diff --git a/QGCInstaller.pri b/QGCInstaller.pri index 920da885c..6e2f9c440 100644 --- a/QGCInstaller.pri +++ b/QGCInstaller.pri @@ -4,17 +4,7 @@ # Maintainer: # Lorenz Meier # (c) 2009-2014 QGroundControl Developers -# This file is part of the open groundstation project -# QGroundControl 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. -# QGroundControl is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# You should have received a copy of the GNU General Public License -# along with QGroundControl. If not, see . +# License terms set in COPYING.md # ------------------------------------------------- installer { diff --git a/QGCSetup.pri b/QGCSetup.pri index c8e09e840..775e4fa79 100644 --- a/QGCSetup.pri +++ b/QGCSetup.pri @@ -4,17 +4,7 @@ # Maintainer: # Lorenz Meier # (c) 2009-2011 QGroundControl Developers -# This file is part of the open groundstation project -# QGroundControl 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. -# QGroundControl is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# You should have received a copy of the GNU General Public License -# along with QGroundControl. If not, see . +# License terms set in COPYING.md # ------------------------------------------------- QMAKE_POST_LINK += echo "Copying files" diff --git a/README.md b/README.md index fa997627e..1ec565e4f 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,7 @@ [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/mavlink/qgroundcontrol?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) +The license terms are set in the COPYING.md file. * Project: diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro index d3265a21a..20e79d2cf 100644 --- a/qgroundcontrol.pro +++ b/qgroundcontrol.pro @@ -4,17 +4,7 @@ # Maintainer: # Lorenz Meier # (c) 2009-2015 QGroundControl Developers -# This file is part of the open groundstation project -# QGroundControl 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. -# QGroundControl is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# You should have received a copy of the GNU General Public License -# along with QGroundControl. If not, see . +# License terms set in COPYING.md # ------------------------------------------------- exists($${OUT_PWD}/qgroundcontrol.pro) { -- 2.22.0