Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-14 02:52:12 +01:00
Code Releases Activity

GreaseMonkey: Fix disabling scripts with Qt 5.8

Browse Source 
Qt 5.8 parses the metadata block, so everything gets overwritten
when QWebEngineScript::setSource is called.

Closes #2206
This commit is contained in:
David Rosca 2017-02-13 22:26:55 +01:00
parent fe0ae53653
commit 9011224c1a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/GreaseMonkey/gm_script.cpp
View File

@ -1,6 +1,6 @@
/* ============================================================ /* ============================================================
* GreaseMonkey plugin for QupZilla * GreaseMonkey plugin for QupZilla
* Copyright (C) 2012-2016 David Rosca <nowrep@gmail.com> * Copyright (C) 2012-2017 David Rosca <nowrep@gmail.com>
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -143,11 +143,11 @@ QWebEngineScript GM_Script::webScript() const
} }
QWebEngineScript script; QWebEngineScript script;
script.setSourceCode(QSL("%1\n%2").arg(m_manager->bootstrapScript(), m_script));
script.setName(fullName()); script.setName(fullName());
script.setWorldId(QWebEngineScript::MainWorld); script.setWorldId(QWebEngineScript::MainWorld);
script.setInjectionPoint(injectionPoint); script.setInjectionPoint(injectionPoint);
script.setRunsOnSubFrames(!m_noframes); script.setRunsOnSubFrames(!m_noframes);
script.setSourceCode(QSL("%1\n%2").arg(m_manager->bootstrapScript(), m_script));
return script; return script;
} }