From 274c2349887a80e8c655eee86cbfffb7e92d3dbf Mon Sep 17 00:00:00 2001 From: nowrep Date: Thu, 12 Jul 2012 10:43:47 +0200 Subject: [PATCH] Fixed building on Windows + updated v1.3.0 tag --- src/defines.pri | 2 +- src/lib/data/data/bundle_version | 2 +- src/lib/plugins/plugininterface.h | 3 ++- src/main/appicon.rc | 8 ++++---- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/defines.pri b/src/defines.pri index 8ff773ec4..32e1b82f9 100644 --- a/src/defines.pri +++ b/src/defines.pri @@ -3,7 +3,7 @@ OBJECTS_DIR = $$PWD/../build MOC_DIR = $$PWD/../build RCC_DIR = $$PWD/../build UI_DIR = $$PWD/../build -unix: VERSION = 1.2.0 +unix: VERSION = 1.3.0 # Please read BUILD information # #DEFINES *= NO_SYSTEM_DATAPATH diff --git a/src/lib/data/data/bundle_version b/src/lib/data/data/bundle_version index 0cfbf0888..00750edc0 100644 --- a/src/lib/data/data/bundle_version +++ b/src/lib/data/data/bundle_version @@ -1 +1 @@ -2 +3 diff --git a/src/lib/plugins/plugininterface.h b/src/lib/plugins/plugininterface.h index 654b17283..cf80441cb 100644 --- a/src/lib/plugins/plugininterface.h +++ b/src/lib/plugins/plugininterface.h @@ -20,6 +20,7 @@ #include #include +#include #include #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; } }; -Q_DECLARE_INTERFACE(PluginInterface, "QupZilla.Browser.PluginInterface/1.1") +Q_DECLARE_INTERFACE(PluginInterface, "QupZilla.Browser.PluginInterface/1.2") #endif // PLUGININTERFACE_H diff --git a/src/main/appicon.rc b/src/main/appicon.rc index e1ee13ac2..fd16ec620 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,2,0,0 - PRODUCTVERSION 1,2,0,0 + FILEVERSION 1,3,0,0 + PRODUCTVERSION 1,3,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.2.0" + VALUE "FileVersion", "1.3.0" VALUE "LegalCopyright", "Copyright (C) 2010-2012 David Rosca" VALUE "InternalName", "qupzilla" VALUE "OriginalFilename", "qupzilla.exe" VALUE "ProductName", "QupZilla" - VALUE "ProductVersion", "1.2.0" + VALUE "ProductVersion", "1.3.0" END END BLOCK "VarFileInfo"