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

Fixed building on Windows + updated v1.3.0 tag

Browse Source
This commit is contained in:
nowrep 2012-07-12 10:43:47 +02:00
parent 625c9a38f3
commit 274c234988
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/defines.pri
View File

@ -3,7 +3,7 @@ OBJECTS_DIR = $$PWD/../build
MOC_DIR = $$PWD/../build MOC_DIR = $$PWD/../build
RCC_DIR = $$PWD/../build RCC_DIR = $$PWD/../build
UI_DIR = $$PWD/../build UI_DIR = $$PWD/../build
unix: VERSION = 1.2.0 unix: VERSION = 1.3.0
# Please read BUILD information # # Please read BUILD information #
#DEFINES *= NO_SYSTEM_DATAPATH #DEFINES *= NO_SYSTEM_DATAPATH

2
src/lib/data/data/bundle_version
View File

@ -1 +1 @@
2 3

3
src/lib/plugins/plugininterface.h
View File

@ -20,6 +20,7 @@
#include <QPixmap> #include <QPixmap>
#include <QtPlugin> #include <QtPlugin>
#include <QNetworkRequest>
#include <QWebHitTestResult> #include <QWebHitTestResult>
#include "qz_namespace.h" #include "qz_namespace.h"
@ -85,6 +86,6 @@ public:
virtual QNetworkReply* createRequest(QNetworkAccessManager::Operation op, const QNetworkRequest &request, QIODevice* outgoingData) { Q_UNUSED(op) Q_UNUSED(request) Q_UNUSED(outgoingData) return 0; } virtual QNetworkReply* createRequest(QNetworkAccessManager::Operation op, const QNetworkRequest &request, QIODevice* outgoingData) { Q_UNUSED(op) Q_UNUSED(request) Q_UNUSED(outgoingData) return 0; }
}; };
Q_DECLARE_INTERFACE(PluginInterface, "QupZilla.Browser.PluginInterface/1.1") Q_DECLARE_INTERFACE(PluginInterface, "QupZilla.Browser.PluginInterface/1.2")
#endif // PLUGININTERFACE_H #endif // PLUGININTERFACE_H

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,2,0,0 FILEVERSION 1,3,0,0
PRODUCTVERSION 1,2,0,0 PRODUCTVERSION 1,3,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.2.0" VALUE "FileVersion", "1.3.0"
VALUE "LegalCopyright", "Copyright (C) 2010-2012 David Rosca" VALUE "LegalCopyright", "Copyright (C) 2010-2012 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.2.0" VALUE "ProductVersion", "1.3.0"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"