[kdeclarative] src/qmlcontrols/kquickcontrolsaddons: Relicense some files to LGPL2.1+
Luca Beltrame
null at kde.org
Mon Sep 18 13:06:42 UTC 2017
Git commit db3bc821814117d765acec2d773ca6a1a40fddcd by Luca Beltrame.
Committed on 18/09/2017 at 13:03.
Pushed by lbeltrame into branch 'master'.
Relicense some files to LGPL2.1+
This has been done with approval from the original authors (including
myself).
Some are still GPL-2.0. I will contact the author(s) to handle that.
CCMAIL: mart at kde.org
CCMAIL: hein at kde.org
CCMAIL: kde at privat.broulik.de
CCMAIL: kde-frameworks-devel at kde.org
M +16 -17 src/qmlcontrols/kquickcontrolsaddons/eventgenerator.cpp
M +17 -17 src/qmlcontrols/kquickcontrolsaddons/eventgenerator.h
M +18 -18 src/qmlcontrols/kquickcontrolsaddons/kcmshell.cpp
M +18 -18 src/qmlcontrols/kquickcontrolsaddons/kcmshell.h
M +21 -20 src/qmlcontrols/kquickcontrolsaddons/qiconitem.h
M +20 -19 src/qmlcontrols/kquickcontrolsaddons/qimageitem.h
M +20 -19 src/qmlcontrols/kquickcontrolsaddons/qpixmapitem.h
https://commits.kde.org/kdeclarative/db3bc821814117d765acec2d773ca6a1a40fddcd
diff --git a/src/qmlcontrols/kquickcontrolsaddons/eventgenerator.cpp b/src/qmlcontrols/kquickcontrolsaddons/eventgenerator.cpp
index b361e79..4931117 100644
--- a/src/qmlcontrols/kquickcontrolsaddons/eventgenerator.cpp
+++ b/src/qmlcontrols/kquickcontrolsaddons/eventgenerator.cpp
@@ -1,23 +1,22 @@
-/***************************************************************************
+/*
* Copyright (C) 2015 by Eike Hein <hein at kde.org>
* Copyright (C) 2015 Marco Martin <notmart at gmail.com>
*
- * *
- * This program 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 2 of the License, or *
- * (at your option) any later version. *
- * *
- * This program 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 this program; if not, write to the *
- * Free Software Foundation, Inc., *
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA . *
- ***************************************************************************/
+ * This library 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 library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
#include "eventgenerator.h"
diff --git a/src/qmlcontrols/kquickcontrolsaddons/eventgenerator.h b/src/qmlcontrols/kquickcontrolsaddons/eventgenerator.h
index 402a964..d456a76 100644
--- a/src/qmlcontrols/kquickcontrolsaddons/eventgenerator.h
+++ b/src/qmlcontrols/kquickcontrolsaddons/eventgenerator.h
@@ -1,23 +1,23 @@
-/***************************************************************************
+/*
* Copyright (C) 2015 by Eike Hein <hein at kde.org>
* Copyright (C) 2015 Marco Martin <notmart at gmail.com>
*
- * *
- * This program 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 2 of the License, or *
- * (at your option) any later version. *
- * *
- * This program 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 this program; if not, write to the *
- * Free Software Foundation, Inc., *
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA . *
- ***************************************************************************/
+ * This library 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 library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
#ifndef EventGenerator_H
#define EventGenerator_H
diff --git a/src/qmlcontrols/kquickcontrolsaddons/kcmshell.cpp b/src/qmlcontrols/kquickcontrolsaddons/kcmshell.cpp
index 809de44..08d0916 100644
--- a/src/qmlcontrols/kquickcontrolsaddons/kcmshell.cpp
+++ b/src/qmlcontrols/kquickcontrolsaddons/kcmshell.cpp
@@ -1,21 +1,21 @@
-/***************************************************************************
- * Copyright 2015 Kai Uwe Broulik <kde at privat.broulik.de> *
- * *
- * This program 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 2 of the License, or *
- * (at your option) any later version. *
- * *
- * This program 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 this program; if not, write to the *
- * Free Software Foundation, Inc., *
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA . *
- ***************************************************************************/
+/*
+ * Copyright 2015 Kai Uwe Broulik <kde at privat.broulik.de>
+ *
+ * This library 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 library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
#include "kcmshell.h"
diff --git a/src/qmlcontrols/kquickcontrolsaddons/kcmshell.h b/src/qmlcontrols/kquickcontrolsaddons/kcmshell.h
index daef2c1..be15864 100644
--- a/src/qmlcontrols/kquickcontrolsaddons/kcmshell.h
+++ b/src/qmlcontrols/kquickcontrolsaddons/kcmshell.h
@@ -1,21 +1,21 @@
-/***************************************************************************
- * Copyright 2015 Kai Uwe Broulik <kde at privat.broulik.de> *
- * *
- * This program 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 2 of the License, or *
- * (at your option) any later version. *
- * *
- * This program 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 this program; if not, write to the *
- * Free Software Foundation, Inc., *
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA . *
- ***************************************************************************/
+/*
+ * Copyright 2015 Kai Uwe Broulik <kde at privat.broulik.de>
+ *
+ * This library 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 library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
#ifndef KCMSHELL_H
#define KCMSHELL_H
diff --git a/src/qmlcontrols/kquickcontrolsaddons/qiconitem.h b/src/qmlcontrols/kquickcontrolsaddons/qiconitem.h
index 5068637..6f2b4a1 100644
--- a/src/qmlcontrols/kquickcontrolsaddons/qiconitem.h
+++ b/src/qmlcontrols/kquickcontrolsaddons/qiconitem.h
@@ -1,21 +1,22 @@
-/***************************************************************************
- * Copyright 2011 Marco Martin <mart at kde.org> *
- * *
- * This program 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 2 of the License, or *
- * (at your option) any later version. *
- * *
- * This program 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 this program; if not, write to the *
- * Free Software Foundation, Inc., *
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA . *
- ***************************************************************************/
+/*
+ * Copyright 2011 Marco Martin <mart at kde.org>
+ *
+ * This library 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 library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
#ifndef QICONITEM_H
#define QICONITEM_H
@@ -37,8 +38,8 @@ class QIconItem : public QQuickItem
public:
enum State {
- DefaultState, ///The default state.
- ActiveState, ///Icon is active.
+ DefaultState, ///The default state.
+ ActiveState, ///Icon is active.
DisabledState, ///Icon is disabled.
SelectedState ///Icon is selected
};
diff --git a/src/qmlcontrols/kquickcontrolsaddons/qimageitem.h b/src/qmlcontrols/kquickcontrolsaddons/qimageitem.h
index cc355f6..3af9aa2 100644
--- a/src/qmlcontrols/kquickcontrolsaddons/qimageitem.h
+++ b/src/qmlcontrols/kquickcontrolsaddons/qimageitem.h
@@ -1,22 +1,23 @@
-/***************************************************************************
- * Copyright 2011 Marco Martin <mart at kde.org> *
- * Copyright 2015 Luca Beltrame <lbeltrame at kde.org> *
- * *
- * This program 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 2 of the License, or *
- * (at your option) any later version. *
- * *
- * This program 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 this program; if not, write to the *
- * Free Software Foundation, Inc., *
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA . *
- ***************************************************************************/
+/*
+ * Copyright 2011 Marco Martin <mart at kde.org>
+ * Copyright 2015 Luca Beltrame <lbeltrame at kde.org>
+ *
+ * This library 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 library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
#ifndef QIMAGEITEM_H
#define QIMAGEITEM_H
diff --git a/src/qmlcontrols/kquickcontrolsaddons/qpixmapitem.h b/src/qmlcontrols/kquickcontrolsaddons/qpixmapitem.h
index 4de3005..7dec859 100644
--- a/src/qmlcontrols/kquickcontrolsaddons/qpixmapitem.h
+++ b/src/qmlcontrols/kquickcontrolsaddons/qpixmapitem.h
@@ -1,22 +1,23 @@
-/***************************************************************************
- * Copyright 2011 Marco Martin <mart at kde.org> *
- * Copyright 2015 Luca Beltrame <lbeltrame at kde.org> *
- * *
- * This program 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 2 of the License, or *
- * (at your option) any later version. *
- * *
- * This program 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 this program; if not, write to the *
- * Free Software Foundation, Inc., *
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA . *
- ***************************************************************************/
+/*
+ * Copyright 2011 Marco Martin <mart at kde.org>
+ * Copyright 2015 Luca Beltrame <lbeltrame at kde.org>
+ *
+ * This library 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 library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
#ifndef QPIXMAPITEM_H
#define QPIXMAPITEM_H
More information about the Kde-frameworks-devel
mailing list