Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-11 01:22:10 +01:00
Code Releases Activity

Added link to Oxygen icon set into COPYRIGHT

Browse Source
This commit is contained in:
nowrep 2013-05-26 16:08:14 +02:00
parent 3259abef09
commit 5e929d764f
2 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
COPYRIGHT
View File

@ -48,19 +48,19 @@
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
QtSingleApplication class: QtSingleApplication class:
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
** **
** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). ** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved. ** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com) ** Contact: Nokia Corporation (qt-info@nokia.com)
** **
** This file is part of a Qt Solutions component. ** This file is part of a Qt Solutions component.
** **
** Commercial Usage ** Commercial Usage
** Licensees holding valid Qt Commercial licenses may use this file in ** Licensees holding valid Qt Commercial licenses may use this file in
** accordance with the Qt Solutions Commercial License Agreement provided ** accordance with the Qt Solutions Commercial License Agreement provided
** with the Software or, alternatively, in accordance with the terms ** with the Software or, alternatively, in accordance with the terms
** contained in a written agreement between you and Nokia. ** contained in a written agreement between you and Nokia.
** **
** GNU Lesser General Public License Usage ** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser ** 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 ** General Public License version 2.1 as published by the Free Software
@ -68,29 +68,29 @@
** packaging of this file. Please review the following information to ** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 2.1 requirements ** 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. ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
** **
** In addition, as a special exception, Nokia gives you certain ** In addition, as a special exception, Nokia gives you certain
** additional rights. These rights are described in the Nokia Qt LGPL ** additional rights. These rights are described in the Nokia Qt LGPL
** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this ** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
** package. ** package.
** **
** GNU General Public License Usage ** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU ** Alternatively, this file may be used under the terms of the GNU
** General Public License version 3.0 as published by the Free Software ** General Public License version 3.0 as published by the Free Software
** Foundation and appearing in the file LICENSE.GPL included in the ** Foundation and appearing in the file LICENSE.GPL included in the
** packaging of this file. Please review the following information to ** packaging of this file. Please review the following information to
** ensure the GNU General Public License version 3.0 requirements will be ** ensure the GNU General Public License version 3.0 requirements will be
** met: http://www.gnu.org/copyleft/gpl.html. ** met: http://www.gnu.org/copyleft/gpl.html.
** **
** Please note Third Party Software included with Qt Solutions may impose ** Please note Third Party Software included with Qt Solutions may impose
** additional restrictions and it is the user's responsibility to ensure ** additional restrictions and it is the user's responsibility to ensure
** that they have met the licensing requirements of the GPL, LGPL, or Qt ** that they have met the licensing requirements of the GPL, LGPL, or Qt
** Solutions Commercial license and the relevant license of the Third ** Solutions Commercial license and the relevant license of the Third
** Party Software they are using. ** Party Software they are using.
** **
** If you are unsure which license is appropriate for your use, please ** If you are unsure which license is appropriate for your use, please
** contact Nokia at qt-info@nokia.com. ** contact Nokia at qt-info@nokia.com.
** **
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
HtmlHighlighter and PlainTextEditorWithLines classes: HtmlHighlighter and PlainTextEditorWithLines classes:
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
@ -181,7 +181,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
OpenSearchReader + OpenSearchEngine class: OpenSearchReader + OpenSearchEngine class:
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
@ -211,25 +211,25 @@
# License Version 1.1 (the "License"); you may not use this file # License Version 1.1 (the "License"); you may not use this file
# except in compliance with the License. You may obtain a copy of # except in compliance with the License. You may obtain a copy of
# the License at http://www.mozilla.org/MPL/ # the License at http://www.mozilla.org/MPL/
# #
# Software distributed under the License is distributed on an "AS # Software distributed under the License is distributed on an "AS
# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
# implied. See the License for the specific language governing # implied. See the License for the specific language governing
# rights and limitations under the License. # rights and limitations under the License.
# #
# The Original Code is the Netscape security libraries. # The Original Code is the Netscape security libraries.
# #
# The Initial Developer of the Original Code is Netscape # The Initial Developer of the Original Code is Netscape
# Communications Corporation. Portions created by Netscape are # Communications Corporation. Portions created by Netscape are
# Copyright (C) 1994-2000 Netscape Communications Corporation. All # Copyright (C) 1994-2000 Netscape Communications Corporation. All
# Rights Reserved. # Rights Reserved.
# #
# Contributor(s): # Contributor(s):
# #
# Alternatively, the contents of this file may be used under the # Alternatively, the contents of this file may be used under the
# terms of the GNU General Public License Version 2 or later (the # terms of the GNU General Public License Version 2 or later (the
# "GPL"), in which case the provisions of the GPL are applicable # "GPL"), in which case the provisions of the GPL are applicable
# instead of those above. If you wish to allow use of your # instead of those above. If you wish to allow use of your
# version of this file only under the terms of the GPL and not to # version of this file only under the terms of the GPL and not to
# allow others to use your version of this file under the MPL, # allow others to use your version of this file under the MPL,
# indicate your decision by deleting the provisions above and # indicate your decision by deleting the provisions above and
@ -242,7 +242,8 @@
QtWin class from QtWin class from
http://labs.qt.nokia.com/2009/09/15/using-blur-behind-on-windows/ http://labs.qt.nokia.com/2009/09/15/using-blur-behind-on-windows/
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
In application are used also some icons from Faenza icon set, which are In application are used also some icons from Faenza and Oxygen icon sets,
licensed under the GNU/GPL license. which are licensed under the GNU/GPL license.
More info at http://tiheum.deviantart.com/art/Faenza-Icons-173323228 More info at http://tiheum.deviantart.com/art/Faenza-Icons-173323228 and
http://www.oxygen-icons.org/
----------------------------------------------------------------------------- -----------------------------------------------------------------------------

2
README.md
View File

@ -37,7 +37,7 @@ Compiling
---------------------------------------------------------------------------------------- ----------------------------------------------------------------------------------------
Before you start compiling, make sure that you have installed the Qt (>=4.7) development libraries Before you start compiling, make sure that you have installed the Qt (>=4.7) development libraries
and you have read the BUILDING information. and you have read the [BUILDING](https://github.com/QupZilla/qupzilla/blob/master/BUILDING) information.
**Linux** **Linux**