diff --git a/CHANGELOG b/CHANGELOG index 527db400b..a3a321881 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,8 +1,9 @@ -Version 1.7.0 - * development version +Version 1.8.0 + * released 25 September 2014 * added support for window.beforeunload event * added support for external.AddSearchProvider js function * added undo/redo actions to context menu in forms + * added new theme Breathe * added new commandline option to toggle fullscreen * added new commandline option to enable portable mode * added new context menu action to open links in private window diff --git a/README.md b/README.md index 8157c9840..3ca7151aa 100644 --- a/README.md +++ b/README.md @@ -74,7 +74,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.6.6. You can download precompiled packages +The current stable version of QupZilla is 1.8.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/haiku/QupZilla.rdef b/haiku/QupZilla.rdef index 0ca7f9617..14cdca865 100644 --- a/haiku/QupZilla.rdef +++ b/haiku/QupZilla.rdef @@ -2,7 +2,7 @@ resource app_signature "application/x-vnd.QupZilla"; resource app_flags B_SINGLE_LAUNCH; resource app_version { major = 1, - middle = 7, + middle = 8, minor = 0, /* Application "variety" can be set to one of the following: diff --git a/src/defines.pri b/src/defines.pri index aeb79aecb..d7df04432 100644 --- a/src/defines.pri +++ b/src/defines.pri @@ -8,7 +8,7 @@ UI_DIR = $$PWD/../build # workaround for #849: see https://bugreports.qt-project.org/browse/QTBUG-23196 mocinclude.CONFIG *= fix_target -QZ_VERSION = 1.7.0 +QZ_VERSION = 1.8.0 unix: VERSION = $$QZ_VERSION DEFINES *= QUPZILLA_VERSION=\\\"""$$QZ_VERSION"\\\"" diff --git a/src/lib/app/profilemanager.cpp b/src/lib/app/profilemanager.cpp index 1a4b0762d..fbb717d27 100644 --- a/src/lib/app/profilemanager.cpp +++ b/src/lib/app/profilemanager.cpp @@ -209,8 +209,8 @@ void ProfileManager::updateProfile(const QString ¤t, const QString &profil return; } - // 1.7.0 development version if (prof >= Updater::Version("1.6.0") && prof < Updater::Version("1.8.0")) { + update160(); return; } @@ -344,3 +344,8 @@ void ProfileManager::update140() QSqlQuery query; query.exec("ALTER TABLE search_engines ADD COLUMN postData TEXT"); } + +void ProfileManager::update160() +{ + // Nothing to upgrade +} diff --git a/src/lib/app/profilemanager.h b/src/lib/app/profilemanager.h index 99b429f47..2594c2674 100644 --- a/src/lib/app/profilemanager.h +++ b/src/lib/app/profilemanager.h @@ -59,6 +59,7 @@ private: void update120(); void update130(); void update140(); + void update160(); bool m_databaseConnected; }; diff --git a/src/main/appicon.rc b/src/main/appicon.rc index 3dfbb07c5..be4c3493a 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,7,0,0 - PRODUCTVERSION 1,7,0,0 + FILEVERSION 1,8,0,0 + PRODUCTVERSION 1,8,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.7.0" + VALUE "FileVersion", "1.8.0" VALUE "LegalCopyright", "Copyright (C) 2010-2014 David Rosca" VALUE "InternalName", "qupzilla" VALUE "OriginalFilename", "qupzilla.exe" VALUE "ProductName", "QupZilla" - VALUE "ProductVersion", "1.7.0" + VALUE "ProductVersion", "1.8.0" END END BLOCK "VarFileInfo" diff --git a/windows/installer.nsi b/windows/installer.nsi index 7a9ad79d3..f573fbf7f 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.6.1" +!define /date PRODUCT_VERSION "1.8.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"