diff --git a/CodingStyle.cc b/CodingStyle.cc index d448fa94a59c1ef074787ced10fcc23b0a682f37..9c5d7527a32f6474ce9c45f167c0a0f583ded2b9 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 05fc19419595f9f5c42fd9cda7475eb7b11a559b..49ce95812427587d768acffa55ca355ab27da2b5 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 5962951adaa8f1a2e4d37b0f500602d1aeef8282..204f3ee729dec5208b0ec8109c06ad2a93a4f79a 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 067adf58adb8937416e98ece6a8f54edb9b1ae66..67f4e25ad54e722e65b9da0825c66031b95299bd 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 920da885cc1e5922e9721a9d88a410fe14a4d40f..6e2f9c440bb4c548896739e9e2cd0b3041ede56c 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 c8e09e840e32eefb4074bff2ace559de9ba28527..775e4fa792467c2c59afb9516cb6a1f424354d53 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 fa997627e6ea86cef301ba0a087bf90c4b8b3942..1ec565e4fd17bddae823204690bda894b4faaa47 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 d3265a21a1724b0b7bddd7fe44b405df51b416fd..20e79d2cf2c84d944a136a0ad3babc059865b98a 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) {