From ad86572fff8a82345d25f1b0aa5295e8ecb03a6d Mon Sep 17 00:00:00 2001 From: David Rosca Date: Mon, 25 May 2015 11:47:50 +0200 Subject: [PATCH] Bump GreaseMonkey version number GreaseMonkey now works the same (or even better) as with QtWebKit. The only difference is that GM_setClipboard is not implemented and GM_value functions are saving only to localStorage. --- src/plugins/GreaseMonkey/gm_plugin.cpp | 2 +- src/plugins/GreaseMonkey/gm_script.cpp | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/plugins/GreaseMonkey/gm_plugin.cpp b/src/plugins/GreaseMonkey/gm_plugin.cpp index 01914be9e..0875186ab 100644 --- a/src/plugins/GreaseMonkey/gm_plugin.cpp +++ b/src/plugins/GreaseMonkey/gm_plugin.cpp @@ -41,7 +41,7 @@ PluginSpec GM_Plugin::pluginSpec() spec.name = "GreaseMonkey"; spec.info = "Userscripts for QupZilla"; spec.description = "Provides support for userscripts (www.userscripts.org)"; - spec.version = "0.5.2"; + spec.version = "0.6.0"; spec.author = "David Rosca "; spec.icon = QPixmap(":gm/data/icon.png"); spec.hasSettings = true; diff --git a/src/plugins/GreaseMonkey/gm_script.cpp b/src/plugins/GreaseMonkey/gm_script.cpp index cce583d14..d84b45ec4 100644 --- a/src/plugins/GreaseMonkey/gm_script.cpp +++ b/src/plugins/GreaseMonkey/gm_script.cpp @@ -281,14 +281,6 @@ void GM_Script::parseScript() const QString script = fileData.mid(index).trimmed(); m_valid = !script.isEmpty(); -#if QTWEBENGINE_DISABLED - QString jscript("(function(){" - "function GM_getValue(name,val){return GM_getValueImpl('%1',name,val);}" - "function GM_setValue(name,val){return GM_setValueImpl('%1',name,val);}" - "function GM_deleteValue(name){return GM_deleteValueImpl('%1',name);}" - "function GM_listValues(){return GM_listValuesImpl('%1');}" - "\n%2\n})();"); -#endif const QString nspace = QCryptographicHash::hash(fullName().toUtf8(), QCryptographicHash::Md4).toHex(); const QString gmValues = m_manager->valuesScript().arg(nspace);