diff --git a/CHANGELOG b/CHANGELOG index 952df36a8..606e387e0 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,5 @@ Version 1.3.5 - * not yet released + * released 16 September 2012 * new Persion translation * option to remove web search bar * warning user when removing page from speed dial diff --git a/README.md b/README.md index 356f7885c..ca6e537ae 100644 --- a/README.md +++ b/README.md @@ -58,7 +58,7 @@ You need to specify path to `macdeployqt` only if it is not in PATH. Current version ---------------------------------------------------------------------------------------- -The current released version of QupZilla is 1.3.1. You can download precompiled packages +The current released version of QupZilla is 1.3.5. 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: diff --git a/src/defines.pri b/src/defines.pri index 18f7ff65a..ef1d35f6f 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.3.1 +unix: VERSION = 1.3.5 # Please read BUILD information # #DEFINES *= NO_SYSTEM_DATAPATH diff --git a/src/lib/app/qupzilla.cpp b/src/lib/app/qupzilla.cpp index 39be44e9c..52ba84b01 100644 --- a/src/lib/app/qupzilla.cpp +++ b/src/lib/app/qupzilla.cpp @@ -86,7 +86,7 @@ #include #endif -const QString QupZilla::VERSION = "1.3.1"; +const QString QupZilla::VERSION = "1.3.5"; const QString QupZilla::BUILDTIME = __DATE__" "__TIME__; const QString QupZilla::AUTHOR = "David Rosca"; const QString QupZilla::COPYRIGHT = "2010-2012"; diff --git a/src/lib/webview/webview.cpp b/src/lib/webview/webview.cpp index dbfd2c156..9a39d1dd1 100644 --- a/src/lib/webview/webview.cpp +++ b/src/lib/webview/webview.cpp @@ -1155,7 +1155,7 @@ bool WebView::eventFilter(QObject* obj, QEvent* event) return false; } - QEvent::Type type; + QEvent::Type type = QEvent::TouchUpdate; QTouchEvent::TouchPoint touchPoint; touchPoint.setId(0); touchPoint.setScreenPos(ev->globalPos()); diff --git a/src/main/appicon.rc b/src/main/appicon.rc index bd849b59b..8ac7eacfa 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,3,1,0 - PRODUCTVERSION 1,3,1,0 + FILEVERSION 1,3,5,0 + PRODUCTVERSION 1,3,5,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.3.1" + VALUE "FileVersion", "1.3.5" VALUE "LegalCopyright", "Copyright (C) 2010-2012 David Rosca" VALUE "InternalName", "qupzilla" VALUE "OriginalFilename", "qupzilla.exe" VALUE "ProductName", "QupZilla" - VALUE "ProductVersion", "1.3.1" + VALUE "ProductVersion", "1.3.5" END END BLOCK "VarFileInfo" diff --git a/src/plugins/AccessKeysNavigation/akn_plugin.cpp b/src/plugins/AccessKeysNavigation/akn_plugin.cpp index c21aee20f..8967c90bb 100644 --- a/src/plugins/AccessKeysNavigation/akn_plugin.cpp +++ b/src/plugins/AccessKeysNavigation/akn_plugin.cpp @@ -62,7 +62,7 @@ bool AKN_Plugin::testPlugin() { // Let's be sure, require latest version of QupZilla - return (QupZilla::VERSION == QLatin1String("1.3.1")); + return (QupZilla::VERSION == QLatin1String("1.3.5")); } QTranslator* AKN_Plugin::getTranslator(const QString &locale) diff --git a/src/plugins/GreaseMonkey/gm_plugin.cpp b/src/plugins/GreaseMonkey/gm_plugin.cpp index 396601e3e..3e73da2d1 100644 --- a/src/plugins/GreaseMonkey/gm_plugin.cpp +++ b/src/plugins/GreaseMonkey/gm_plugin.cpp @@ -62,7 +62,7 @@ void GM_Plugin::unload() bool GM_Plugin::testPlugin() { - return (QupZilla::VERSION == QLatin1String("1.3.1")); + return (QupZilla::VERSION == QLatin1String("1.3.5")); } QTranslator* GM_Plugin::getTranslator(const QString &locale) diff --git a/src/plugins/MouseGestures/mousegesturesplugin.cpp b/src/plugins/MouseGestures/mousegesturesplugin.cpp index 402128039..68cfdb8ea 100644 --- a/src/plugins/MouseGestures/mousegesturesplugin.cpp +++ b/src/plugins/MouseGestures/mousegesturesplugin.cpp @@ -64,7 +64,7 @@ bool MouseGesturesPlugin::testPlugin() { // Let's be sure, require latest version of QupZilla - return (QupZilla::VERSION == QLatin1String("1.3.1")); + return (QupZilla::VERSION == QLatin1String("1.3.5")); } QTranslator* MouseGesturesPlugin::getTranslator(const QString &locale) diff --git a/src/plugins/PIM/PIM_plugin.cpp b/src/plugins/PIM/PIM_plugin.cpp index 0618a2afd..3b9e7024d 100644 --- a/src/plugins/PIM/PIM_plugin.cpp +++ b/src/plugins/PIM/PIM_plugin.cpp @@ -65,7 +65,7 @@ bool PIM_Plugin::testPlugin() { // Let's be sure, require latest version of QupZilla - return (QupZilla::VERSION == QLatin1String("1.3.1")); + return (QupZilla::VERSION == QLatin1String("1.3.5")); } QTranslator* PIM_Plugin::getTranslator(const QString &locale) diff --git a/src/plugins/TestPlugin/testplugin.cpp b/src/plugins/TestPlugin/testplugin.cpp index c431878b7..776e276fd 100644 --- a/src/plugins/TestPlugin/testplugin.cpp +++ b/src/plugins/TestPlugin/testplugin.cpp @@ -92,7 +92,7 @@ bool TestPlugin::testPlugin() //There should be some testing if plugin is loaded correctly //If this function returns false, plugin is automatically unloaded - return (QupZilla::VERSION == QLatin1String("1.3.1")); + return (QupZilla::VERSION == QLatin1String("1.3.5")); } QTranslator* TestPlugin::getTranslator(const QString &locale)