Merge branch 'v2.0'

CHANGELOG

@@ -1,3 +1,15 @@
+Version 2.0.1
+    * released 8 June 2016
+    * don't force enabling HighDPI scaling by default
+    * fix crash when unloading AutoScroll plugin
+    * fix showing Inspect Element action when web inspector is disabled
+    * fix showing context menu when page zoom is not 100%
+    * fix destroying WebPage when opened as popup
+    * fix setting default font families
+    * fix saving last download path in download manager
+    * fix using external download manager
+    * fix canceliing http and proxy authentication dialogs
+
 Version 2.0.0
     * released 30 March 2016
     * switch to QtWebEngine - much better compatibility and stability

README.md

@@ -65,7 +65,7 @@ You need to specify path to `macdeployqt` only if it is not in PATH.
 Current version
 ----------------------------------------------------------------------------------------
 
-The current stable version of QupZilla is 2.0.0. You can download precompiled packages
+The current stable version of QupZilla is 2.0.1. 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:

haiku/QupZilla.rdef

@@ -3,7 +3,7 @@ resource app_flags B_SINGLE_LAUNCH;
 resource app_version {
 	major  = 2,
 	middle = 0,
-	minor  = 0,
+	minor  = 1,
 
 	/* Application "variety" can be set to one of the following:
 	*	B_APPV_DEVELOPMENT,

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 = 2.0.0
+QZ_VERSION = 2.0.1
 unix: VERSION = $$QZ_VERSION
 DEFINES *= QUPZILLA_VERSION=\\\"""$$QZ_VERSION"\\\""
 

src/lib/app/profilemanager.cpp

@@ -193,6 +193,11 @@ void ProfileManager::updateProfile(const QString &current, const QString &profil
         return;
     }
 
+    // No change in 2.0
+    if (prof < Updater::Version("2.0.99")) {
+        return;
+    }
+
     // Nothing for now
 }
 

src/main/Info.plist

@@ -7,9 +7,9 @@
     <key>CFBundlePackageType</key>
     <string>APPL</string>
     <key>CFBundleGetInfoString</key>
-    <string>2.0.0</string>
+    <string>2.0.1</string>
     <key>CFBundleVersion</key>
-    <string>2.0.0</string>
+    <string>2.0.1</string>
     <key>CFBundleSignature</key>
     <string>@TYPEINFO@</string>
     <key>CFBundleExecutable</key>

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 2,0,0,0
- PRODUCTVERSION 2,0,0,0
+ FILEVERSION 2,0,0,1
+ PRODUCTVERSION 2,0,0,1
  FILEFLAGS 0x0L
  FILEFLAGSMASK 0x3fL
  FILEOS 0x00040004L
@@ -18,12 +18,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "QupZilla Team"
             VALUE "FileDescription", "QupZilla Web Browser"
-            VALUE "FileVersion", "2.0.0"
+            VALUE "FileVersion", "2.0.1"
             VALUE "LegalCopyright", "Copyright (C) 2010-2014 David Rosca"
             VALUE "InternalName", "qupzilla"
             VALUE "OriginalFilename", "qupzilla.exe"
             VALUE "ProductName", "QupZilla"
-            VALUE "ProductVersion", "2.0.0"
+            VALUE "ProductVersion", "2.0.1"
         END
     END
     BLOCK "VarFileInfo"

windows/installer.nsi

@@ -24,7 +24,7 @@ RequestExecutionLevel admin
 SetCompressor /SOLID /FINAL lzma
 
 !define PRODUCT_NAME "QupZilla"
-!define /date PRODUCT_VERSION "2.0.0"
+!define /date PRODUCT_VERSION "2.0.1"
 !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"