Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 02:36:34 +01:00
Code Releases Activity

master branch is now 1.9.0 development version

Browse Source
This commit is contained in:
David Rosca 2014-10-11 13:11:49 +02:00
parent b353c1a748
commit 160190dfb3
6 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
haiku/QupZilla.rdef
View File

@ -2,7 +2,7 @@ resource app_signature "application/x-vnd.QupZilla";
resource app_flags B_SINGLE_LAUNCH; resource app_flags B_SINGLE_LAUNCH;
resource app_version { resource app_version {
major = 1, major = 1,
middle = 8, middle = 9,
minor = 0, minor = 0,
/* Application "variety" can be set to one of the following: /* Application "variety" can be set to one of the following:

2
src/defines.pri
View File

@ -8,7 +8,7 @@ UI_DIR = $$PWD/../build
# workaround for #849: see https://bugreports.qt-project.org/browse/QTBUG-23196 # workaround for #849: see https://bugreports.qt-project.org/browse/QTBUG-23196
mocinclude.CONFIG *= fix_target mocinclude.CONFIG *= fix_target
QZ_VERSION = 1.8.0 QZ_VERSION = 1.9.0
unix: VERSION = $$QZ_VERSION unix: VERSION = $$QZ_VERSION
DEFINES *= QUPZILLA_VERSION=\\\"""$$QZ_VERSION"\\\"" DEFINES *= QUPZILLA_VERSION=\\\"""$$QZ_VERSION"\\\""

5
src/lib/app/profilemanager.cpp
View File

@ -214,6 +214,11 @@ void ProfileManager::updateProfile(const QString &current, const QString &profil
return; return;
} }
if (prof >= Updater::Version("1.8.0") && prof < Updater::Version("1.9.0")) {
// do nothing
return;
}
std::cout << "QupZilla: Incompatible profile version detected (" << qPrintable(profile) << "), overwriting profile data..." << std::endl; std::cout << "QupZilla: Incompatible profile version detected (" << qPrintable(profile) << "), overwriting profile data..." << std::endl;
copyDataToProfile(); copyDataToProfile();

4
src/main/Info.plist
View File

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

8
src/main/appicon.rc
View File

@ -4,8 +4,8 @@ IDI_ICON1 ICON DISCARDABLE "..\lib\data\icons\exeicons\qupzilla.ico"
IDI_ICON2 ICON DISCARDABLE "..\lib\data\icons\exeicons\page.ico" IDI_ICON2 ICON DISCARDABLE "..\lib\data\icons\exeicons\page.ico"
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,8,0,0 FILEVERSION 1,9,0,0
PRODUCTVERSION 1,8,0,0 PRODUCTVERSION 1,9,0,0
FILEFLAGS 0x0L FILEFLAGS 0x0L
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
FILEOS 0x00040004L FILEOS 0x00040004L
@ -18,12 +18,12 @@ BEGIN
BEGIN BEGIN
VALUE "CompanyName", "QupZilla Team" VALUE "CompanyName", "QupZilla Team"
VALUE "FileDescription", "QupZilla Web Browser" VALUE "FileDescription", "QupZilla Web Browser"
VALUE "FileVersion", "1.8.0" VALUE "FileVersion", "1.9.0"
VALUE "LegalCopyright", "Copyright (C) 2010-2014 David Rosca" VALUE "LegalCopyright", "Copyright (C) 2010-2014 David Rosca"
VALUE "InternalName", "qupzilla" VALUE "InternalName", "qupzilla"
VALUE "OriginalFilename", "qupzilla.exe" VALUE "OriginalFilename", "qupzilla.exe"
VALUE "ProductName", "QupZilla" VALUE "ProductName", "QupZilla"
VALUE "ProductVersion", "1.8.0" VALUE "ProductVersion", "1.9.0"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

2
windows/installer.nsi
View File

@ -24,7 +24,7 @@ RequestExecutionLevel admin
SetCompressor /SOLID /FINAL lzma SetCompressor /SOLID /FINAL lzma
!define PRODUCT_NAME "QupZilla" !define PRODUCT_NAME "QupZilla"
!define /date PRODUCT_VERSION "1.8.0" !define /date PRODUCT_VERSION "1.9.0"
!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\qupzilla.exe" !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_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
!define PRODUCT_UNINST_ROOT_KEY "HKLM" !define PRODUCT_UNINST_ROOT_KEY "HKLM"