From 79c57f61b6aa8e6c696226362e9b7e2f212ee350 Mon Sep 17 00:00:00 2001 From: nowrep Date: Mon, 11 Mar 2013 17:45:48 +0100 Subject: [PATCH] Version 1.4.0 --- CHANGELOG | 2 +- README.md | 2 +- src/defines.pri | 2 +- src/lib/app/profileupdater.cpp | 7 ++++++- src/lib/app/qupzilla.cpp | 2 +- src/main/appicon.rc | 10 +++++----- src/plugins/AccessKeysNavigation/akn_plugin.cpp | 4 ++-- src/plugins/GreaseMonkey/gm_plugin.cpp | 2 +- src/plugins/MouseGestures/mousegesturesplugin.cpp | 4 ++-- src/plugins/PIM/PIM_plugin.cpp | 6 +++--- src/plugins/TestPlugin/testplugin.cpp | 4 ++-- windows/installer.nsi | 5 +++-- 12 files changed, 28 insertions(+), 22 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 899af6535..bfaea5e34 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,5 @@ Version 1.4.0 - * not yet released + * released 11 March 2013 * highlighting host in address in locationbar * can now be compiled using Qt 5 * QtWebKit 2.3 new features - caret browsing, animated scrolling diff --git a/README.md b/README.md index e1a14d491..ad2581413 100644 --- a/README.md +++ b/README.md @@ -70,7 +70,7 @@ You need to specify path to `macdeployqt` only if it is not in PATH. 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). However, if you want the latest revision, just take the latest code snapshot either by downloading a tarball or running: diff --git a/src/defines.pri b/src/defines.pri index 84deb65af..36223b085 100644 --- a/src/defines.pri +++ b/src/defines.pri @@ -3,7 +3,7 @@ OBJECTS_DIR = $$PWD/../build MOC_DIR = $$PWD/../build RCC_DIR = $$PWD/../build UI_DIR = $$PWD/../build -unix: VERSION = 1.3.5 +unix: VERSION = 1.4.0 # Please read BUILD information # #DEFINES *= NO_SYSTEM_DATAPATH diff --git a/src/lib/app/profileupdater.cpp b/src/lib/app/profileupdater.cpp index 803d5a96b..128aebb7b 100644 --- a/src/lib/app/profileupdater.cpp +++ b/src/lib/app/profileupdater.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2012 David Rosca +* Copyright (C) 2010-2013 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 @@ -100,6 +100,11 @@ void ProfileUpdater::updateProfile(const QString ¤t, const QString &profil 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; copyDataToProfile(); diff --git a/src/lib/app/qupzilla.cpp b/src/lib/app/qupzilla.cpp index d2db9b589..53264ca5b 100644 --- a/src/lib/app/qupzilla.cpp +++ b/src/lib/app/qupzilla.cpp @@ -101,7 +101,7 @@ #define MENU_RECEIVER mApp->macMenuReceiver() #endif -const QString QupZilla::VERSION = "1.3.5"; +const QString QupZilla::VERSION = "1.4.0"; const QString QupZilla::BUILDTIME = __DATE__" "__TIME__; const QString QupZilla::AUTHOR = "David Rosca"; const QString QupZilla::COPYRIGHT = "2010-2013"; diff --git a/src/main/appicon.rc b/src/main/appicon.rc index 8ac7eacfa..9f6912e07 100644 --- a/src/main/appicon.rc +++ b/src/main/appicon.rc @@ -4,8 +4,8 @@ IDI_ICON1 ICON DISCARDABLE "..\lib\data\icons\exeicons\qupzilla.ico" IDI_ICON2 ICON DISCARDABLE "..\lib\data\icons\exeicons\page.ico" VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,3,5,0 - PRODUCTVERSION 1,3,5,0 + FILEVERSION 1,4,0,0 + PRODUCTVERSION 1,4,0,0 FILEFLAGS 0x0L FILEFLAGSMASK 0x3fL FILEOS 0x00040004L @@ -18,12 +18,12 @@ BEGIN BEGIN VALUE "CompanyName", "QupZilla Team" VALUE "FileDescription", "QupZilla Web Browser" - VALUE "FileVersion", "1.3.5" - VALUE "LegalCopyright", "Copyright (C) 2010-2012 David Rosca" + VALUE "FileVersion", "1.4.0" + VALUE "LegalCopyright", "Copyright (C) 2010-2013 David Rosca" VALUE "InternalName", "qupzilla" VALUE "OriginalFilename", "qupzilla.exe" VALUE "ProductName", "QupZilla" - VALUE "ProductVersion", "1.3.5" + VALUE "ProductVersion", "1.4.0" END END BLOCK "VarFileInfo" diff --git a/src/plugins/AccessKeysNavigation/akn_plugin.cpp b/src/plugins/AccessKeysNavigation/akn_plugin.cpp index 521441653..ff4ea42b4 100644 --- a/src/plugins/AccessKeysNavigation/akn_plugin.cpp +++ b/src/plugins/AccessKeysNavigation/akn_plugin.cpp @@ -1,6 +1,6 @@ /* ============================================================ * Access Keys Navigation plugin for QupZilla -* Copyright (C) 2012 David Rosca +* Copyright (C) 2012-2013 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 @@ -62,7 +62,7 @@ bool AKN_Plugin::testPlugin() { // 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) diff --git a/src/plugins/GreaseMonkey/gm_plugin.cpp b/src/plugins/GreaseMonkey/gm_plugin.cpp index 4b2345d43..16c7acd8d 100644 --- a/src/plugins/GreaseMonkey/gm_plugin.cpp +++ b/src/plugins/GreaseMonkey/gm_plugin.cpp @@ -62,7 +62,7 @@ void GM_Plugin::unload() 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) diff --git a/src/plugins/MouseGestures/mousegesturesplugin.cpp b/src/plugins/MouseGestures/mousegesturesplugin.cpp index 8e7c97b31..b6f87fd41 100644 --- a/src/plugins/MouseGestures/mousegesturesplugin.cpp +++ b/src/plugins/MouseGestures/mousegesturesplugin.cpp @@ -1,6 +1,6 @@ /* ============================================================ * Mouse Gestures plugin for QupZilla -* Copyright (C) 2012 David Rosca +* Copyright (C) 2012-2013 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 @@ -64,7 +64,7 @@ bool MouseGesturesPlugin::testPlugin() { // 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) diff --git a/src/plugins/PIM/PIM_plugin.cpp b/src/plugins/PIM/PIM_plugin.cpp index 89d837688..cec2b4341 100644 --- a/src/plugins/PIM/PIM_plugin.cpp +++ b/src/plugins/PIM/PIM_plugin.cpp @@ -1,7 +1,7 @@ /* ============================================================ * Personal Information Manager plugin for QupZilla -* Copyright (C) 2012 David Rosca -* Copyright (C) 2012 Mladen Pejaković +* Copyright (C) 2012-2013 David Rosca +* Copyright (C) 2012-2013 Mladen Pejaković * * 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 @@ -65,7 +65,7 @@ bool PIM_Plugin::testPlugin() { // 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) diff --git a/src/plugins/TestPlugin/testplugin.cpp b/src/plugins/TestPlugin/testplugin.cpp index 1b118a164..889519100 100644 --- a/src/plugins/TestPlugin/testplugin.cpp +++ b/src/plugins/TestPlugin/testplugin.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2012 David Rosca +* Copyright (C) 2010-2013 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 @@ -92,7 +92,7 @@ bool TestPlugin::testPlugin() //There should be some testing if plugin is loaded correctly //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) diff --git a/windows/installer.nsi b/windows/installer.nsi index 9e42b9f64..549e745c9 100644 --- a/windows/installer.nsi +++ b/windows/installer.nsi @@ -1,5 +1,6 @@ ; QupZilla Windows Installer NSIS Script ; Copyright (C) 2010-2013 David Rosca +; 2012-2013 S. Razi Alavizadeh ; ; For compiling this script you need following plugins: ; FindProcDLL_plug-in, KillProcDLL_plug-in and 'AllAssociation.nsh' needs @@ -23,7 +24,7 @@ RequestExecutionLevel admin SetCompressor /SOLID /FINAL lzma !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_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" !define PRODUCT_UNINST_ROOT_KEY "HKLM" @@ -300,7 +301,7 @@ SectionGroup $(TITLE_SecTranslations) SecTranslations File "locale\fa_IR.qm" File "locale\qt_fa.qm" SectionEnd - + Section "Catalan" SetOutPath "$INSTDIR\locale" File "locale\ca_ES.qm"