1
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-13 10:32:11 +01:00

Merge branch 'master' of github.com:nowrep/QupZilla

This commit is contained in:
nowrep 2011-04-07 21:48:35 +02:00
commit 723c5e3395
4 changed files with 7 additions and 7 deletions

2
README
View File

@ -1,7 +1,7 @@
################################# #################################
## QUPZILLA - WEB BROWSER ## ## QUPZILLA - WEB BROWSER ##
################################# #################################
Version: 0.9.9 Version: 1.0.0-b1
QupZilla is new and very fast open source browser based on WebKit core http://www.webkit.org QupZilla is new and very fast open source browser based on WebKit core http://www.webkit.org
Written in Qt Framework http://qt.nokia.com Written in Qt Framework http://qt.nokia.com

View File

@ -47,7 +47,7 @@
#include "adblockmanager.h" #include "adblockmanager.h"
#include "clickablelabel.h" #include "clickablelabel.h"
const QString QupZilla::VERSION = "0.9.9"; const QString QupZilla::VERSION = "1.0.0-b1";
//const QString QupZilla::BUILDTIME = QLocale(QLocale::English).toDateTime(__DATE__" "__TIME__, "MMM d yyyy hh:mm:ss").toString("MM/dd/yyyy hh:ss"); //const QString QupZilla::BUILDTIME = QLocale(QLocale::English).toDateTime(__DATE__" "__TIME__, "MMM d yyyy hh:mm:ss").toString("MM/dd/yyyy hh:ss");
const QString QupZilla::BUILDTIME = __DATE__" "__TIME__; const QString QupZilla::BUILDTIME = __DATE__" "__TIME__;
const QString QupZilla::AUTHOR = "nowrep"; const QString QupZilla::AUTHOR = "nowrep";

View File

@ -19,7 +19,7 @@
#define QUPZILLA_H #define QUPZILLA_H
//Comment for release building //Comment for release building
//#define DEVELOPING #define DEVELOPING
//Check if i don't fuck anything //Check if i don't fuck anything
#ifdef QT_NO_DEBUG #ifdef QT_NO_DEBUG

View File

@ -3,8 +3,8 @@
IDI_ICON1 ICON DISCARDABLE "icon.ico" IDI_ICON1 ICON DISCARDABLE "icon.ico"
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 0,9,9,0 FILEVERSION 1,0,0,0
PRODUCTVERSION 0,9,9,0 PRODUCTVERSION 1,0,0,0
FILEFLAGS 0x0L FILEFLAGS 0x0L
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
FILEOS 0x00040004L FILEOS 0x00040004L
@ -17,12 +17,12 @@ BEGIN
BEGIN BEGIN
VALUE "CompanyName", "QupZilla Association" VALUE "CompanyName", "QupZilla Association"
VALUE "FileDescription", "QupZilla Web Browser" VALUE "FileDescription", "QupZilla Web Browser"
VALUE "FileVersion", "0.9.9.0" VALUE "FileVersion", "1.0.0.b1"
VALUE "LegalCopyright", "Copyright (C) 2010-2011 nowrep" VALUE "LegalCopyright", "Copyright (C) 2010-2011 nowrep"
VALUE "InternalName", "qupzilla" VALUE "InternalName", "qupzilla"
VALUE "OriginalFilename", "qupzilla.exe" VALUE "OriginalFilename", "qupzilla.exe"
VALUE "ProductName", "QupZilla" VALUE "ProductName", "QupZilla"
VALUE "ProductVersion", "0.9.9.0" VALUE "ProductVersion", "1.0.0.b1"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"