From 4e4e653f9f0805745819b2e936c13311be48e8a7 Mon Sep 17 00:00:00 2001 From: nowrep Date: Wed, 1 Jan 2014 20:55:33 +0100 Subject: [PATCH] Version 1.6.0 --- CHANGELOG | 4 ++-- README.md | 2 +- src/defines.pri | 2 +- src/lib/app/qupzilla.cpp | 2 +- src/lib/opensearch/searchenginesmanager.cpp | 1 - src/main/appicon.rc | 8 ++++---- src/plugins/AccessKeysNavigation/akn_plugin.cpp | 2 +- src/plugins/GnomeKeyringPasswords/gnomekeyringplugin.cpp | 2 +- src/plugins/GreaseMonkey/gm_plugin.cpp | 2 +- src/plugins/KWalletPasswords/kwalletplugin.cpp | 2 +- src/plugins/MouseGestures/mousegesturesplugin.cpp | 2 +- src/plugins/PIM/PIM_plugin.cpp | 2 +- src/plugins/StatusBarIcons/statusbariconsplugin.cpp | 2 +- src/plugins/TestPlugin/testplugin.cpp | 2 +- windows/installer.nsi | 2 +- 15 files changed, 18 insertions(+), 19 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 225da46a9..c18795097 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,5 @@ -Version 1.5.0 - * development version +Version 1.6.0 + * released 1 January 2014 * added support for Proxy Auto-Config (PAC) * added option to open another private window from private window * added option to detach tabs from window diff --git a/README.md b/README.md index fecf32dea..2a50c1f42 100644 --- a/README.md +++ b/README.md @@ -73,7 +73,7 @@ You need to specify path to `macdeployqt` only if it is not in PATH. Current version ---------------------------------------------------------------------------------------- -The current stable version of QupZilla is 1.4.4. You can download precompiled packages +The current stable version of QupZilla is 1.6.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 18a234a90..d139370d8 100644 --- a/src/defines.pri +++ b/src/defines.pri @@ -7,7 +7,7 @@ UI_DIR = $$PWD/../build # workaround for #849: see https://bugreports.qt-project.org/browse/QTBUG-23196 mocinclude.CONFIG *= fix_target -unix: VERSION = 1.5.0 +unix: VERSION = 1.6.0 # Please read BUILD information # #DEFINES *= NO_SYSTEM_DATAPATH diff --git a/src/lib/app/qupzilla.cpp b/src/lib/app/qupzilla.cpp index ef9e4de3f..0517d7090 100644 --- a/src/lib/app/qupzilla.cpp +++ b/src/lib/app/qupzilla.cpp @@ -105,7 +105,7 @@ #define MENU_RECEIVER mApp->macMenuReceiver() #endif -const QString QupZilla::VERSION = "1.5.0"; +const QString QupZilla::VERSION = "1.6.0"; const QString QupZilla::BUILDTIME = __DATE__" "__TIME__; const QString QupZilla::AUTHOR = "David Rosca"; const QString QupZilla::COPYRIGHT = "2010-2013"; diff --git a/src/lib/opensearch/searchenginesmanager.cpp b/src/lib/opensearch/searchenginesmanager.cpp index 77ab8d011..ff2638141 100644 --- a/src/lib/opensearch/searchenginesmanager.cpp +++ b/src/lib/opensearch/searchenginesmanager.cpp @@ -493,7 +493,6 @@ void SearchEnginesManager::saveSettings() QSqlQuery query; query.exec("DELETE FROM search_engines"); - query.exec("ALTER TABLE search_engines ADD COLUMN postData TEXT"); // FIXME: Delete on release! foreach (const Engine &en, m_allEngines) { query.prepare("INSERT INTO search_engines (name, icon, url, shortcut, suggestionsUrl, suggestionsParameters, postData) VALUES (?, ?, ?, ?, ?, ?, ?)"); diff --git a/src/main/appicon.rc b/src/main/appicon.rc index a9d84ae40..96fed17ff 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,5,0,0 - PRODUCTVERSION 1,5,0,0 + FILEVERSION 1,6,0,0 + PRODUCTVERSION 1,6,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.5.0" + VALUE "FileVersion", "1.6.0" VALUE "LegalCopyright", "Copyright (C) 2010-2013 David Rosca" VALUE "InternalName", "qupzilla" VALUE "OriginalFilename", "qupzilla.exe" VALUE "ProductName", "QupZilla" - VALUE "ProductVersion", "1.5.0" + VALUE "ProductVersion", "1.6.0" END END BLOCK "VarFileInfo" diff --git a/src/plugins/AccessKeysNavigation/akn_plugin.cpp b/src/plugins/AccessKeysNavigation/akn_plugin.cpp index 3d2304127..0ccdfa112 100644 --- a/src/plugins/AccessKeysNavigation/akn_plugin.cpp +++ b/src/plugins/AccessKeysNavigation/akn_plugin.cpp @@ -64,7 +64,7 @@ bool AKN_Plugin::testPlugin() { // Let's be sure, require latest version of QupZilla - return (QupZilla::VERSION == QLatin1String("1.5.0")); + return (QupZilla::VERSION == QLatin1String("1.6.0")); } QTranslator* AKN_Plugin::getTranslator(const QString &locale) diff --git a/src/plugins/GnomeKeyringPasswords/gnomekeyringplugin.cpp b/src/plugins/GnomeKeyringPasswords/gnomekeyringplugin.cpp index 9e5d2b560..2a9f212f6 100644 --- a/src/plugins/GnomeKeyringPasswords/gnomekeyringplugin.cpp +++ b/src/plugins/GnomeKeyringPasswords/gnomekeyringplugin.cpp @@ -59,7 +59,7 @@ void GnomeKeyringPlugin::unload() bool GnomeKeyringPlugin::testPlugin() { - return (QupZilla::VERSION == QLatin1String("1.5.0")); + return (QupZilla::VERSION == QLatin1String("1.6.0")); } QTranslator* GnomeKeyringPlugin::getTranslator(const QString &locale) diff --git a/src/plugins/GreaseMonkey/gm_plugin.cpp b/src/plugins/GreaseMonkey/gm_plugin.cpp index cb623725a..24c35b23e 100644 --- a/src/plugins/GreaseMonkey/gm_plugin.cpp +++ b/src/plugins/GreaseMonkey/gm_plugin.cpp @@ -81,7 +81,7 @@ void GM_Plugin::unload() bool GM_Plugin::testPlugin() { - return (QupZilla::VERSION == QLatin1String("1.5.0")); + return (QupZilla::VERSION == QLatin1String("1.6.0")); } QTranslator* GM_Plugin::getTranslator(const QString &locale) diff --git a/src/plugins/KWalletPasswords/kwalletplugin.cpp b/src/plugins/KWalletPasswords/kwalletplugin.cpp index a48556670..6d82e99c1 100644 --- a/src/plugins/KWalletPasswords/kwalletplugin.cpp +++ b/src/plugins/KWalletPasswords/kwalletplugin.cpp @@ -59,7 +59,7 @@ void KWalletPlugin::unload() bool KWalletPlugin::testPlugin() { - return (QupZilla::VERSION == QLatin1String("1.5.0")); + return (QupZilla::VERSION == QLatin1String("1.6.0")); } QTranslator* KWalletPlugin::getTranslator(const QString &locale) diff --git a/src/plugins/MouseGestures/mousegesturesplugin.cpp b/src/plugins/MouseGestures/mousegesturesplugin.cpp index a87dce006..aec85abd0 100644 --- a/src/plugins/MouseGestures/mousegesturesplugin.cpp +++ b/src/plugins/MouseGestures/mousegesturesplugin.cpp @@ -65,7 +65,7 @@ bool MouseGesturesPlugin::testPlugin() { // Let's be sure, require latest version of QupZilla - return (QupZilla::VERSION == QLatin1String("1.5.0")); + return (QupZilla::VERSION == QLatin1String("1.6.0")); } QTranslator* MouseGesturesPlugin::getTranslator(const QString &locale) diff --git a/src/plugins/PIM/PIM_plugin.cpp b/src/plugins/PIM/PIM_plugin.cpp index 94c2fc7bd..ba49b941b 100644 --- a/src/plugins/PIM/PIM_plugin.cpp +++ b/src/plugins/PIM/PIM_plugin.cpp @@ -67,7 +67,7 @@ bool PIM_Plugin::testPlugin() { // Let's be sure, require latest version of QupZilla - return (QupZilla::VERSION == QLatin1String("1.5.0")); + return (QupZilla::VERSION == QLatin1String("1.6.0")); } QTranslator* PIM_Plugin::getTranslator(const QString &locale) diff --git a/src/plugins/StatusBarIcons/statusbariconsplugin.cpp b/src/plugins/StatusBarIcons/statusbariconsplugin.cpp index 8924f71f0..225cd5a37 100644 --- a/src/plugins/StatusBarIcons/statusbariconsplugin.cpp +++ b/src/plugins/StatusBarIcons/statusbariconsplugin.cpp @@ -72,7 +72,7 @@ void StatusBarIconsPlugin::unload() bool StatusBarIconsPlugin::testPlugin() { - return (QupZilla::VERSION == QLatin1String("1.5.0")); + return (QupZilla::VERSION == QLatin1String("1.6.0")); } QTranslator* StatusBarIconsPlugin::getTranslator(const QString &locale) diff --git a/src/plugins/TestPlugin/testplugin.cpp b/src/plugins/TestPlugin/testplugin.cpp index 715a0d046..fe4afc23e 100644 --- a/src/plugins/TestPlugin/testplugin.cpp +++ b/src/plugins/TestPlugin/testplugin.cpp @@ -97,7 +97,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.5.0")); + return (QupZilla::VERSION == QLatin1String("1.6.0")); } QTranslator* TestPlugin::getTranslator(const QString &locale) diff --git a/windows/installer.nsi b/windows/installer.nsi index 1fd7fcdce..cfa545cc6 100644 --- a/windows/installer.nsi +++ b/windows/installer.nsi @@ -24,7 +24,7 @@ RequestExecutionLevel admin SetCompressor /SOLID /FINAL lzma !define PRODUCT_NAME "QupZilla" -!define /date PRODUCT_VERSION "1.4.4" +!define /date PRODUCT_VERSION "1.6.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"