Skip to content

Commit

Permalink
Switch license to LGPL 2.1.
Browse files Browse the repository at this point in the history
I talked to everyone mentioned in copyright headers and asked people I know from the commit log. If you claim copyright and disagree with this change please let me know.
  • Loading branch information
dschmidt committed Jan 28, 2019
1 parent 293bdfb commit 4536182
Show file tree
Hide file tree
Showing 13 changed files with 609 additions and 758 deletions.
5 changes: 4 additions & 1 deletion 3rdparty/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
add_subdirectory(breakpad)
add_subdirectory(drkonqi-parser)

if(ENABLE_GPL_CODE)
add_subdirectory(drkonqi-parser)
endif()
6 changes: 3 additions & 3 deletions 3rdparty/breakpad/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# PROJECT(breakpad)
# cmake_minimum_required(VERSION 2.8)
#
#
# set( CMAKE_MODULE_PATH
# ${CMAKE_MODULE_PATH}
# ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules
# )
#
#
# if( CMAKE_COMPILER_IS_GNUCXX )
# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++98")
# endif()
#
#
# if(${CMAKE_BUILD_TYPE} MATCHES "Release")
# add_definitions(-DNDEBUG)
# endif(${CMAKE_BUILD_TYPE} MATCHES "Release")
Expand Down
2 changes: 2 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ if(POLICY CMP0071)
cmake_policy(SET CMP0071 NEW)
endif()

option(ENABLE_GPL_CODE OFF)

find_package(Qt5 COMPONENTS Core Network Widgets)

if((CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_FLAGS) OR
Expand Down
502 changes: 502 additions & 0 deletions LICENSE.LGPL2.1

Large diffs are not rendered by default.

7 changes: 6 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,14 @@ libcrashreporter-qt
This library is supposed to provide an easy integration of Google Breakpad crash reporting into a Qt application

#### Features
* Cross-platform (Linux and Windows currently, Mac OS X probably slightly broken/WIP)
* Cross-platform (Linux and Windows currently, macOS)
* Simple API to launch an external crash reporter GUI

#### License

The library itself is licensed LGPLv2.1, but the drkonqi integration for Linux is licensed GPL.
If you need the drkonqi integration, you need to use this lib as GPLv2.

#### TODO
* Add documentation/examples
* Make lib installable/packagable
Expand Down
5 changes: 4 additions & 1 deletion src/libcrashreporter-gui/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
if(NOT ENABLE_GPL_CODE)
message(FATAL_ERROR "Using the Linux build requires ENABLE_GPL_CODE to be true.")
endif()

set(crashreporter_SOURCES CrashReporter.cpp CrashReporterGzip.cpp)
set(crashreporter_UI CrashReporter.ui)
set(crashreporter_RC ../../resources.qrc)
set(crashreporter_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_LIST_DIR}/.. ${CMAKE_CURRENT_BINARY_DIR} ${QT_INCLUDES})


if(UNIX AND NOT APPLE)
list(APPEND crashreporter_INCLUDE_DIRECTORIES
${CMAKE_CURRENT_LIST_DIR}/../../3rdparty/drkonqi-parser
Expand Down
28 changes: 15 additions & 13 deletions src/libcrashreporter-gui/CrashReporter.cpp
Original file line number Diff line number Diff line change
@@ -1,22 +1,24 @@
/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
/*
* libcrashreporter-qt
*
* Copyright 2010-2011, Christian Muehlhaeuser <[email protected]>
* Copyright 2016, Teo Mrnjavac <[email protected]>
* Copyright (C) 2010-2011 Christian Muehlhaeuser <[email protected]>
* Copyright (C) 2016 Teo Mrnjavac <[email protected]>
*
* Tomahawk 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.
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* Tomahawk 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.
* 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
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/


#include "CrashReporter.h"

#ifdef Q_OS_LINUX
Expand Down
28 changes: 15 additions & 13 deletions src/libcrashreporter-gui/CrashReporter.h
Original file line number Diff line number Diff line change
@@ -1,22 +1,24 @@
/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
/*
* libcrashreporter-qt
*
* Copyright 2010-2011, Christian Muehlhaeuser <[email protected]>
* Copyright 2016, Teo Mrnjavac <[email protected]>
* Copyright (C) 2010-2011 Christian Muehlhaeuser <[email protected]>
* Copyright (C) 2016 Teo Mrnjavac <[email protected]>
*
* Tomahawk 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.
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* Tomahawk 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.
* 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
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/


#ifndef CRASHREPORTER_H
#define CRASHREPORTER_H

Expand Down
27 changes: 14 additions & 13 deletions src/libcrashreporter-gui/CrashReporterGzip.cpp
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
/* === This file is part of Calamares - <http://github.com/calamares> ===
/*
* libcrashreporter-qt
*
* Copyright 2010-2011, Christian Muehlhaeuser <[email protected]>
* Copyright 2015-2016, Teo Mrnjavac <[email protected]>
* Copyright (C) 2010-2011 Christian Muehlhaeuser <[email protected]>
* Copyright (C) 2015-2016 Teo Mrnjavac <[email protected]>
*
* Calamares 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.
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* Calamares 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.
* 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
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Calamares. If not, see <http://www.gnu.org/licenses/>.
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/

#include "CrashReporterGzip.h"
Expand Down
27 changes: 14 additions & 13 deletions src/libcrashreporter-gui/CrashReporterGzip.h
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
/* === This file is part of Calamares - <http://github.com/calamares> ===
/*
* libcrashreporter-qt
*
* Copyright 2010-2011, Christian Muehlhaeuser <[email protected]>
* Copyright 2015-2016, Teo Mrnjavac <[email protected]>
* Copyright (C) 2010-2011 Christian Muehlhaeuser <[email protected]>
* Copyright (C) 2015-2016 Teo Mrnjavac <[email protected]>
*
* Calamares 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.
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* Calamares 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.
* 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
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Calamares. If not, see <http://www.gnu.org/licenses/>.
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/

#ifndef CRASHREPORTER_GZIP_H
Expand Down
28 changes: 15 additions & 13 deletions src/libcrashreporter-handler/Handler.cpp
Original file line number Diff line number Diff line change
@@ -1,20 +1,22 @@
/*
* Copyright 2010-2011, Christian Muehlhaeuser <[email protected]>
* Copyright 2014, Dominik Schmidt <[email protected]>
* Copyright 2016, Teo Mrnjavac <[email protected]>
* libcrashreporter-qt
*
* libcrashreporter 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.
* Copyright (C) 2010-2011 Christian Muehlhaeuser <[email protected]>
* Copyright (C) 2014 Dominik Schmidt <[email protected]>
* Copyright (C) 2016 Teo Mrnjavac <[email protected]>
*
* Tomahawk 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.
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* You should have received a copy of the GNU General Public License
* along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
* 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
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/

#include "Handler.h"
Expand Down
28 changes: 15 additions & 13 deletions src/libcrashreporter-handler/Handler.h
Original file line number Diff line number Diff line change
@@ -1,20 +1,22 @@
/*
* Copyright 2010-2011, Christian Muehlhaeuser <[email protected]>
* Copyright 2014, Dominik Schmidt <[email protected]>
* Copyright 2016, Teo Mrnjavac <[email protected]>
* libcrashreporter-qt
*
* libcrashreporter 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.
* Copyright (C) 2010-2011 Christian Muehlhaeuser <[email protected]>
* Copyright (C) 2014 Dominik Schmidt <[email protected]>
* Copyright (C) 2016 Teo Mrnjavac <[email protected]>
*
* Tomahawk 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.
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* You should have received a copy of the GNU General Public License
* along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
* 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
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/

#include <QtGlobal>
Expand Down
Loading

0 comments on commit 4536182

Please sign in to comment.