From 47743a7b8b6a26a27df05675fcd7ddb4927d2605 Mon Sep 17 00:00:00 2001 From: David Rosca Date: Mon, 6 Feb 2017 18:40:48 +0100 Subject: [PATCH 1/3] Windows: Update installer.nsi --- windows/installer.nsi | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/windows/installer.nsi b/windows/installer.nsi index 950a18e44..501b2394c 100644 --- a/windows/installer.nsi +++ b/windows/installer.nsi @@ -61,7 +61,6 @@ SetCompressor /SOLID /FINAL lzma !insertmacro MUI_LANGUAGE "French" !insertmacro MUI_LANGUAGE "Italian" !insertmacro MUI_LANGUAGE "Romanian" -!insertmacro MUI_LANGUAGE "Hongkongese" !insertmacro MUI_LANGUAGE "Tradchinese" !insertmacro MUI_LANGUAGE "Simpchinese" !insertmacro MUI_LANGUAGE "Indonesian" @@ -110,11 +109,11 @@ notRunning: File "qupzilla.dll" File "libeay32.dll" File "ssleay32.dll" - File "Microsoft.VC120.CRT.manifest" File "qt.conf" - File "msvcp120.dll" - File "msvcr120.dll" - File "vccorlib120.dll" + File "concrt140.dll" + File "msvcp140.dll" + File "vccorlib140.dll" + File "vcruntime140.dll" File "icudt54.dll" File "icuin54.dll" File "icuuc54.dll" @@ -132,6 +131,7 @@ notRunning: File "Qt5QuickWidgets.dll" File "Qt5Sql.dll" File "Qt5Svg.dll" + File "Qt5WinExtras.dll" File "Qt5WebEngine.dll" File "Qt5WebEngineCore.dll" File "Qt5WebEngineWidgets.dll" @@ -354,8 +354,6 @@ Function .onInit Push Italian Push ${LANG_ROMANIAN} Push Romanian - Push ${LANG_HONGKONG} - Push Hongkongese Push ${LANG_TRADCHINESE} Push TraditionalChinese Push ${LANG_SIMPCHINESE} From bfa5234ea2b02eb6d3a2faff43564dd81f5c3854 Mon Sep 17 00:00:00 2001 From: David Rosca Date: Mon, 6 Feb 2017 18:47:02 +0100 Subject: [PATCH 2/3] Update AdBlock known subscriptions urls --- src/lib/adblock/adblockaddsubscriptiondialog.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/lib/adblock/adblockaddsubscriptiondialog.cpp b/src/lib/adblock/adblockaddsubscriptiondialog.cpp index 05fad7325..7571eb7ec 100644 --- a/src/lib/adblock/adblockaddsubscriptiondialog.cpp +++ b/src/lib/adblock/adblockaddsubscriptiondialog.cpp @@ -1,6 +1,6 @@ /* ============================================================ -* QupZilla - WebKit based browser -* Copyright (C) 2010-2014 David Rosca +* QupZilla - Qt web browser +* Copyright (C) 2010-2017 David Rosca * * 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 @@ -25,22 +25,18 @@ AdBlockAddSubscriptionDialog::AdBlockAddSubscriptionDialog(QWidget* parent) ui->setupUi(this); m_knownSubscriptions << Subscription("EasyList (English)", ADBLOCK_EASYLIST_URL) - << Subscription("Adversity (English)", "http://adversity.googlecode.com/hg/Adversity.txt") << Subscription("BSI Lista Polska (Polish)", "http://www.bsi.info.pl/filtrABP.txt") << Subscription("Czech List (Czech)", "http://adblock.dajbych.net/adblock.txt") << Subscription("dutchblock (Dutch)", "http://groenewoudt.net/dutchblock/list.txt") << Subscription("Filtros Nauscopicos (Spanish)", "http://abp.mozilla-hispano.org/nauscopio/filtros.txt") - << Subscription("hufilter (Hungarian)", "http://www.hufilter.hu/hufilter.txt") << Subscription("IsraelList (Hebrew)", "http://secure.fanboy.co.nz/israelilist/IsraelList.txt") - << Subscription("Lista Basa (Polish)", "http://plok.studentlive.pl/abp.txt") << Subscription("NLBlock (Dutch)", "http://www.verzijlbergh.com/adblock/nlblock.txt") << Subscription("Peter Lowe's list (English)", "http://pgl.yoyo.org/adservers/serverlist.php?hostformat=adblockplus&mimetype=plaintext") << Subscription("PLgeneral (Polish)", "http://www.niecko.pl/adblock/adblock.txt") << Subscription("Schacks Adblock Plus liste (Danish)", "http://adblock.schack.dk/block.txt") << Subscription("Xfiles (Italian)", "http://mozilla.gfsolone.com/filtri.txt") << Subscription("EasyPrivacy (English)", "http://easylist-downloads.adblockplus.org/easyprivacy.txt") - << Subscription("Antisocial (English)", "http://adversity.googlecode.com/hg/Antisocial.txt") - << Subscription("RU Adlist (Russian)", "https://ruadlist.googlecode.com/hg/advblock.txt") + << Subscription("RU Adlist (Russian)", "https://easylist-downloads.adblockplus.org/advblock.txt") << Subscription("ABPindo (Indonesian)", "https://raw.githubusercontent.com/heradhis/indonesianadblockrules/master/subscriptions/abpindo.txt") << Subscription("Easylist China (Chinese)", "https://easylist-downloads.adblockplus.org/easylistchina.txt") << Subscription("Anti-Adblock Killer", "https://raw.githubusercontent.com/reek/anti-adblock-killer/master/anti-adblock-killer-filters.txt") From 118427db86dc1c1735520962b6dc8872cab22b1e Mon Sep 17 00:00:00 2001 From: David Rosca Date: Mon, 6 Feb 2017 19:31:35 +0100 Subject: [PATCH 3/3] Update COPYRIGHT --- COPYRIGHT | 134 +----------------------------------- src/lib/data/html/copyright | 21 ------ 2 files changed, 3 insertions(+), 152 deletions(-) diff --git a/COPYRIGHT b/COPYRIGHT index 7ded04443..c94b9ba92 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* QupZilla - Qt web browser * Copyright (C) 2010-2017 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -91,96 +91,6 @@ ** If you are unsure which license is appropriate for your use, please ** contact Nokia at qt-info@nokia.com. ** ------------------------------------------------------------------------------ - HtmlHighlighter and PlainTextEditorWithLines classes: ------------------------------------------------------------------------------ -/**************************************************************************** - ** - ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). - ** All rights reserved. - ** Contact: Nokia Corporation (qt-info@nokia.com) - ** - ** This file is part of the examples of the Qt Toolkit. - ** - ** $QT_BEGIN_LICENSE:BSD$ - ** You may use this file under the terms of the BSD license as follows: - ** - ** "Redistribution and use in source and binary forms, with or without - ** modification, are permitted provided that the following conditions are - ** met: - ** * Redistributions of source code must retain the above copyright - ** notice, this list of conditions and the following disclaimer. - ** * Redistributions in binary form must reproduce the above copyright - ** notice, this list of conditions and the following disclaimer in - ** the documentation and/or other materials provided with the - ** distribution. - ** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor - ** the names of its contributors may be used to endorse or promote - ** products derived from this software without specific prior written - ** permission. - ** - ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - ** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - ** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - ** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - ** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - ** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - ** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - ** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." - ** $QT_END_LICENSE$ - ** - ****************************************************************************/ - ---------------------------------------------------------------------------- - Click2Flash plugin: ---------------------------------------------------------------------------- -/* ============================================================ -* -* Copyright (C) 2009 by Benjamin C. Meyer -* Copyright (C) 2010 by Matthieu Gicquel -* -* 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) version 3 or any later version -* accepted by the membership of KDE e.V. (or its successor approved -* by the membership of KDE e.V.), which shall act as a proxy -* defined in Section 14 of version 3 of the license. -* -* 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, see . -* -* ============================================================ */ - ------------------------------------------------------------------------------ - EcWin7 class: ------------------------------------------------------------------------------ -/* EcWin7 - Support library for integrating Windows 7 taskbar features - * into any Qt application - * Copyright (C) 2010 Emanuele Colombo - * - * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ ----------------------------------------------------------------------------- OpenSearchReader + OpenSearchEngine class: @@ -205,46 +115,8 @@ */ ----------------------------------------------------------------------------- - CA certificates from Mozilla included in ca-bundle.crt: ------------------------------------------------------------------------------ -# The contents of this file are subject to the Mozilla Public -# License Version 1.1 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS -# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -# implied. See the License for the specific language governing -# rights and limitations under the License. -# -# The Original Code is the Netscape security libraries. -# -# The Initial Developer of the Original Code is Netscape -# Communications Corporation. Portions created by Netscape are -# Copyright (C) 1994-2000 Netscape Communications Corporation. All -# Rights Reserved. -# -# Contributor(s): -# -# Alternatively, the contents of this file may be used under the -# terms of the GNU General Public License Version 2 or later (the -# "GPL"), in which case the provisions of the GPL are applicable -# 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 -# allow others to use your version of this file under the MPL, -# indicate your decision by deleting the provisions above and -# replace them with the notice and other provisions required by -# the GPL. If you do not delete the provisions above, a recipient -# may use your version of this file under either the MPL or the -# GPL. - ------------------------------------------------------------------------------ - QtWin class from - http://labs.qt.nokia.com/2009/09/15/using-blur-behind-on-windows/ ------------------------------------------------------------------------------ - In application are used also some icons from Oxygen icon set, which are - licensed under the GNU/LGPL license. - More info at http://www.oxygen-icons.org/ + In application are used also some icons from Breeze icon set. + More info at https://cgit.kde.org/breeze-icons.git ----------------------------------------------------------------------------- Speed Dial uses some icons from Faenza icon set, which are licensed under the GNU/GPL license. diff --git a/src/lib/data/html/copyright b/src/lib/data/html/copyright index 8b3c5b99b..c94b9ba92 100644 --- a/src/lib/data/html/copyright +++ b/src/lib/data/html/copyright @@ -91,27 +91,6 @@ ** If you are unsure which license is appropriate for your use, please ** contact Nokia at qt-info@nokia.com. ** ------------------------------------------------------------------------------ - EcWin7 class: ------------------------------------------------------------------------------ -/* EcWin7 - Support library for integrating Windows 7 taskbar features - * into any Qt application - * Copyright (C) 2010 Emanuele Colombo - * - * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ ----------------------------------------------------------------------------- OpenSearchReader + OpenSearchEngine class: