diff --git a/CHANGELOG b/CHANGELOG index a2de87996..0fa301c87 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,8 @@ +Version 2.0.0 + * released 30 March 2016 + * switch to QtWebEngine - much better compatibility and stability + * some features from older versions are missing (will come back later) + Version 1.8.9 * released 11 November 2015 * new QupZilla logo diff --git a/README.md b/README.md index 73a398c70..4fb1a539a 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -QupZilla Web Browser - QtWebEngine +QupZilla Web Browser ---------------------------------------------------------------------------------------- [![Build Status](https://travis-ci.org/QupZilla/qupzilla.svg?branch=master)](https://travis-ci.org/QupZilla/qupzilla) @@ -7,14 +7,6 @@ Blog: [http://blog.qupzilla.com](http://blog.qupzilla.com) IRC: `#qupzilla` at `irc.freenode.net` Translations: [https://www.transifex.com](https://www.transifex.com/projects/p/qupzilla) -THIS IS QTWEBENGINE BRANCH ----------------------------------------------------------------------------------------- - -Master branch is now for QtWebEngine (>= 5.6). - -For QtWebEngine (= 5.5), please use [qt5.5](https://github.com/QupZilla/qupzilla/tree/qt5.5) -For QtWebKit, please use [v1.8](https://github.com/QupZilla/qupzilla/tree/v1.8) - About QupZilla ---------------------------------------------------------------------------------------- @@ -73,19 +65,13 @@ You need to specify path to `macdeployqt` only if it is not in PATH. Current version ---------------------------------------------------------------------------------------- -The current stable version of QupZilla is 1.8.9. You can download precompiled packages +The current stable version of QupZilla is 2.0.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: $ git clone git://github.com/QupZilla/qupzilla.git -If you are using Ubuntu, you can download QupZilla from PPA: - - $ sudo add-apt-repository ppa:nowrep/qupzilla - $ sudo apt-get update - $ sudo apt-get install qupzilla - FAQ and Changelog ---------------------------------------------------------------------------------------- diff --git a/haiku/QupZilla.rdef b/haiku/QupZilla.rdef index 68c47f240..9103f6a32 100644 --- a/haiku/QupZilla.rdef +++ b/haiku/QupZilla.rdef @@ -1,8 +1,8 @@ resource app_signature "application/x-vnd.QupZilla"; resource app_flags B_SINGLE_LAUNCH; resource app_version { - major = 1, - middle = 9, + major = 2, + middle = 0, minor = 0, /* Application "variety" can be set to one of the following: diff --git a/src/defines.pri b/src/defines.pri index ebcf85778..d195e5d7a 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.9.99 +QZ_VERSION = 2.0.0 unix: VERSION = $$QZ_VERSION DEFINES *= QUPZILLA_VERSION=\\\"""$$QZ_VERSION"\\\"" diff --git a/src/main/Info.plist b/src/main/Info.plist index ba9711e37..e9f9f08e8 100644 --- a/src/main/Info.plist +++ b/src/main/Info.plist @@ -7,9 +7,9 @@ CFBundlePackageType APPL CFBundleGetInfoString - 1.9.0 + 2.0.0 CFBundleVersion - 1.9.0 + 2.0.0 CFBundleSignature @TYPEINFO@ CFBundleExecutable diff --git a/src/main/appicon.rc b/src/main/appicon.rc index db753a1be..d93155d9f 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,9,0,0 - PRODUCTVERSION 1,9,0,0 + FILEVERSION 2,0,0,0 + PRODUCTVERSION 2,0,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.9.0" + VALUE "FileVersion", "2.0.0" VALUE "LegalCopyright", "Copyright (C) 2010-2014 David Rosca" VALUE "InternalName", "qupzilla" VALUE "OriginalFilename", "qupzilla.exe" VALUE "ProductName", "QupZilla" - VALUE "ProductVersion", "1.9.0" + VALUE "ProductVersion", "2.0.0" END END BLOCK "VarFileInfo" diff --git a/windows/installer.nsi b/windows/installer.nsi index 16a97b22c..ad8d7e9a5 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.9.9" +!define /date PRODUCT_VERSION "2.0.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"