Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-09-21 09:42:10 +02:00
Code Releases Activity

Version 1.4.0

Browse Source
This commit is contained in:
nowrep 2013-03-11 17:45:48 +01:00
parent c36e13da32
commit 79c57f61b6
12 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG
View File

@ -1,5 +1,5 @@
Version 1.4.0 Version 1.4.0
* not yet released * released 11 March 2013
* highlighting host in address in locationbar * highlighting host in address in locationbar
* can now be compiled using Qt 5 * can now be compiled using Qt 5
* QtWebKit 2.3 new features - caret browsing, animated scrolling * QtWebKit 2.3 new features - caret browsing, animated scrolling

2
README.md
View File

@ -70,7 +70,7 @@ You need to specify path to `macdeployqt` only if it is not in PATH.
Current version Current version
---------------------------------------------------------------------------------------- ----------------------------------------------------------------------------------------
The current released version of QupZilla is 1.3.5. You can download precompiled packages The current released version of QupZilla is 1.4.0. You can download precompiled packages
and the sources from the download section at [homepage](http://www.qupzilla.com/download). and the sources from the download section at [homepage](http://www.qupzilla.com/download).
However, if you want the latest revision, just take the latest code snapshot either by However, if you want the latest revision, just take the latest code snapshot either by
downloading a tarball or running: downloading a tarball or running:

2
src/defines.pri
View File

@ -3,7 +3,7 @@ OBJECTS_DIR = $$PWD/../build
MOC_DIR = $$PWD/../build MOC_DIR = $$PWD/../build
RCC_DIR = $$PWD/../build RCC_DIR = $$PWD/../build
UI_DIR = $$PWD/../build UI_DIR = $$PWD/../build
unix: VERSION = 1.3.5 unix: VERSION = 1.4.0
# Please read BUILD information # # Please read BUILD information #
#DEFINES *= NO_SYSTEM_DATAPATH #DEFINES *= NO_SYSTEM_DATAPATH

7
src/lib/app/profileupdater.cpp
View File

@ -1,6 +1,6 @@
/* ============================================================ /* ============================================================
* QupZilla - WebKit based browser * QupZilla - WebKit based browser
* Copyright (C) 2010-2012 David Rosca <nowrep@gmail.com> * Copyright (C) 2010-2013 David Rosca <nowrep@gmail.com>
* *
* This program is free software: you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -100,6 +100,11 @@ void ProfileUpdater::updateProfile(const QString &current, const QString &profil
return; return;
} }
// 1.3.5 - no changes
if (profileVersion == Updater::parseVersionFromString("1.3.5")) {
return;
}
std::cout << "QupZilla: Incompatible profile version detected, overwriting profile data..." << std::endl; std::cout << "QupZilla: Incompatible profile version detected, overwriting profile data..." << std::endl;
copyDataToProfile(); copyDataToProfile();

2
src/lib/app/qupzilla.cpp
View File

@ -101,7 +101,7 @@
#define MENU_RECEIVER mApp->macMenuReceiver() #define MENU_RECEIVER mApp->macMenuReceiver()
#endif #endif
const QString QupZilla::VERSION = "1.3.5"; const QString QupZilla::VERSION = "1.4.0";
const QString QupZilla::BUILDTIME = __DATE__" "__TIME__; const QString QupZilla::BUILDTIME = __DATE__" "__TIME__;
const QString QupZilla::AUTHOR = "David Rosca"; const QString QupZilla::AUTHOR = "David Rosca";
const QString QupZilla::COPYRIGHT = "2010-2013"; const QString QupZilla::COPYRIGHT = "2010-2013";

10
src/main/appicon.rc
View File

@ -4,8 +4,8 @@ IDI_ICON1 ICON DISCARDABLE "..\lib\data\icons\exeicons\qupzilla.ico"
IDI_ICON2 ICON DISCARDABLE "..\lib\data\icons\exeicons\page.ico" IDI_ICON2 ICON DISCARDABLE "..\lib\data\icons\exeicons\page.ico"
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,3,5,0 FILEVERSION 1,4,0,0
PRODUCTVERSION 1,3,5,0 PRODUCTVERSION 1,4,0,0
FILEFLAGS 0x0L FILEFLAGS 0x0L
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
FILEOS 0x00040004L FILEOS 0x00040004L
@ -18,12 +18,12 @@ BEGIN
BEGIN BEGIN
VALUE "CompanyName", "QupZilla Team" VALUE "CompanyName", "QupZilla Team"
VALUE "FileDescription", "QupZilla Web Browser" VALUE "FileDescription", "QupZilla Web Browser"
VALUE "FileVersion", "1.3.5" VALUE "FileVersion", "1.4.0"
VALUE "LegalCopyright", "Copyright (C) 2010-2012 David Rosca" VALUE "LegalCopyright", "Copyright (C) 2010-2013 David Rosca"
VALUE "InternalName", "qupzilla" VALUE "InternalName", "qupzilla"
VALUE "OriginalFilename", "qupzilla.exe" VALUE "OriginalFilename", "qupzilla.exe"
VALUE "ProductName", "QupZilla" VALUE "ProductName", "QupZilla"
VALUE "ProductVersion", "1.3.5" VALUE "ProductVersion", "1.4.0"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

4
src/plugins/AccessKeysNavigation/akn_plugin.cpp
View File

@ -1,6 +1,6 @@
/* ============================================================ /* ============================================================
* Access Keys Navigation plugin for QupZilla * Access Keys Navigation plugin for QupZilla
* Copyright (C) 2012 David Rosca <nowrep@gmail.com> * Copyright (C) 2012-2013 David Rosca <nowrep@gmail.com>
* *
* This program is free software: you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -62,7 +62,7 @@ bool AKN_Plugin::testPlugin()
{ {
// Let's be sure, require latest version of QupZilla // Let's be sure, require latest version of QupZilla
return (QupZilla::VERSION == QLatin1String("1.3.5")); return (QupZilla::VERSION == QLatin1String("1.4.0"));
} }
QTranslator* AKN_Plugin::getTranslator(const QString &locale) QTranslator* AKN_Plugin::getTranslator(const QString &locale)

2
src/plugins/GreaseMonkey/gm_plugin.cpp
View File

@ -62,7 +62,7 @@ void GM_Plugin::unload()
bool GM_Plugin::testPlugin() bool GM_Plugin::testPlugin()
{ {
return (QupZilla::VERSION == QLatin1String("1.3.5")); return (QupZilla::VERSION == QLatin1String("1.4.0"));
} }
QTranslator* GM_Plugin::getTranslator(const QString &locale) QTranslator* GM_Plugin::getTranslator(const QString &locale)

4
src/plugins/MouseGestures/mousegesturesplugin.cpp
View File

@ -1,6 +1,6 @@
/* ============================================================ /* ============================================================
* Mouse Gestures plugin for QupZilla * Mouse Gestures plugin for QupZilla
* Copyright (C) 2012 David Rosca <nowrep@gmail.com> * Copyright (C) 2012-2013 David Rosca <nowrep@gmail.com>
* *
* This program is free software: you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -64,7 +64,7 @@ bool MouseGesturesPlugin::testPlugin()
{ {
// Let's be sure, require latest version of QupZilla // Let's be sure, require latest version of QupZilla
return (QupZilla::VERSION == QLatin1String("1.3.5")); return (QupZilla::VERSION == QLatin1String("1.4.0"));
} }
QTranslator* MouseGesturesPlugin::getTranslator(const QString &locale) QTranslator* MouseGesturesPlugin::getTranslator(const QString &locale)

6
src/plugins/PIM/PIM_plugin.cpp
View File

@ -1,7 +1,7 @@
/* ============================================================ /* ============================================================
* Personal Information Manager plugin for QupZilla * Personal Information Manager plugin for QupZilla
* Copyright (C) 2012 David Rosca <nowrep@gmail.com> * Copyright (C) 2012-2013 David Rosca <nowrep@gmail.com>
* Copyright (C) 2012 Mladen Pejaković <pejakm@gmail.com> * Copyright (C) 2012-2013 Mladen Pejaković <pejakm@gmail.com>
* *
* This program is free software: you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -65,7 +65,7 @@ bool PIM_Plugin::testPlugin()
{ {
// Let's be sure, require latest version of QupZilla // Let's be sure, require latest version of QupZilla
return (QupZilla::VERSION == QLatin1String("1.3.5")); return (QupZilla::VERSION == QLatin1String("1.4.0"));
} }
QTranslator* PIM_Plugin::getTranslator(const QString &locale) QTranslator* PIM_Plugin::getTranslator(const QString &locale)

4
src/plugins/TestPlugin/testplugin.cpp
View File

@ -1,6 +1,6 @@
/* ============================================================ /* ============================================================
* QupZilla - WebKit based browser * QupZilla - WebKit based browser
* Copyright (C) 2010-2012 David Rosca <nowrep@gmail.com> * Copyright (C) 2010-2013 David Rosca <nowrep@gmail.com>
* *
* This program is free software: you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -92,7 +92,7 @@ bool TestPlugin::testPlugin()
//There should be some testing if plugin is loaded correctly //There should be some testing if plugin is loaded correctly
//If this function returns false, plugin is automatically unloaded //If this function returns false, plugin is automatically unloaded
return (QupZilla::VERSION == QLatin1String("1.3.5")); return (QupZilla::VERSION == QLatin1String("1.4.0"));
} }
QTranslator* TestPlugin::getTranslator(const QString &locale) QTranslator* TestPlugin::getTranslator(const QString &locale)

5
windows/installer.nsi
View File

@ -1,5 +1,6 @@
; QupZilla Windows Installer NSIS Script ; QupZilla Windows Installer NSIS Script
; Copyright (C) 2010-2013 David Rosca <nowrep@gmail.com> ; Copyright (C) 2010-2013 David Rosca <nowrep@gmail.com>
; 2012-2013 S. Razi Alavizadeh <s.r.alavizadeh@gmail.com>
; ;
; For compiling this script you need following plugins: ; For compiling this script you need following plugins:
; FindProcDLL_plug-in, KillProcDLL_plug-in and 'AllAssociation.nsh' needs ; FindProcDLL_plug-in, KillProcDLL_plug-in and 'AllAssociation.nsh' needs
@ -23,7 +24,7 @@ RequestExecutionLevel admin
SetCompressor /SOLID /FINAL lzma SetCompressor /SOLID /FINAL lzma
!define PRODUCT_NAME "QupZilla" !define PRODUCT_NAME "QupZilla"
!define /date PRODUCT_VERSION "1.3.5" !define /date PRODUCT_VERSION "1.4.0"
!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\qupzilla.exe" !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\qupzilla.exe"
!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
!define PRODUCT_UNINST_ROOT_KEY "HKLM" !define PRODUCT_UNINST_ROOT_KEY "HKLM"
@ -300,7 +301,7 @@ SectionGroup $(TITLE_SecTranslations) SecTranslations
File "locale\fa_IR.qm" File "locale\fa_IR.qm"
File "locale\qt_fa.qm" File "locale\qt_fa.qm"
SectionEnd SectionEnd
Section "Catalan" Section "Catalan"
SetOutPath "$INSTDIR\locale" SetOutPath "$INSTDIR\locale"
File "locale\ca_ES.qm" File "locale\ca_ES.qm"