Fix build with Qt 5.5rc

remotes/origin/falkon
David Rosca 11 years ago
parent f747ce3e9d
commit a745e4776f
  1. 6
      src/lib/app/mainapplication.cpp
  2. 24
      src/plugins/GreaseMonkey/gm_manager.cpp

@ -1093,9 +1093,9 @@ void MainApplication::setUserStyleSheet(const QString &filePath)
const QString name = QStringLiteral("_qupzilla_userstylesheet"); const QString name = QStringLiteral("_qupzilla_userstylesheet");
QWebEngineScript oldScript = m_webProfile->scripts().findScript(name); QWebEngineScript oldScript = m_webProfile->scripts()->findScript(name);
if (!oldScript.isNull()) { if (!oldScript.isNull()) {
m_webProfile->scripts().remove(oldScript); m_webProfile->scripts()->remove(oldScript);
} }
QWebEngineScript script; QWebEngineScript script;
@ -1104,7 +1104,7 @@ void MainApplication::setUserStyleSheet(const QString &filePath)
script.setWorldId(QWebEngineScript::ApplicationWorld); script.setWorldId(QWebEngineScript::ApplicationWorld);
script.setRunsOnSubFrames(true); script.setRunsOnSubFrames(true);
script.setSourceCode(Scripts::setCss(userCss)); script.setSourceCode(Scripts::setCss(userCss));
m_webProfile->scripts().insert(script); m_webProfile->scripts()->insert(script);
} }
#if defined(Q_OS_WIN) && !defined(Q_OS_OS2) #if defined(Q_OS_WIN) && !defined(Q_OS_OS2)

@ -138,8 +138,8 @@ void GM_Manager::enableScript(GM_Script* script)
script->setEnabled(true); script->setEnabled(true);
m_disabledScripts.removeOne(script->fullName()); m_disabledScripts.removeOne(script->fullName());
QWebEngineScriptCollection &collection = mApp->webProfile()->scripts(); QWebEngineScriptCollection *collection = mApp->webProfile()->scripts();
collection.insert(script->webScript()); collection->insert(script->webScript());
} }
void GM_Manager::disableScript(GM_Script* script) void GM_Manager::disableScript(GM_Script* script)
@ -147,8 +147,8 @@ void GM_Manager::disableScript(GM_Script* script)
script->setEnabled(false); script->setEnabled(false);
m_disabledScripts.append(script->fullName()); m_disabledScripts.append(script->fullName());
QWebEngineScriptCollection &collection = mApp->webProfile()->scripts(); QWebEngineScriptCollection *collection = mApp->webProfile()->scripts();
collection.remove(collection.findScript(script->fullName())); collection->remove(collection->findScript(script->fullName()));
} }
bool GM_Manager::addScript(GM_Script* script) bool GM_Manager::addScript(GM_Script* script)
@ -160,8 +160,8 @@ bool GM_Manager::addScript(GM_Script* script)
m_scripts.append(script); m_scripts.append(script);
connect(script, &GM_Script::scriptChanged, this, &GM_Manager::scriptChanged); connect(script, &GM_Script::scriptChanged, this, &GM_Manager::scriptChanged);
QWebEngineScriptCollection &collection = mApp->webProfile()->scripts(); QWebEngineScriptCollection *collection = mApp->webProfile()->scripts();
collection.insert(script->webScript()); collection->insert(script->webScript());
emit scriptsChanged(); emit scriptsChanged();
return true; return true;
@ -175,8 +175,8 @@ bool GM_Manager::removeScript(GM_Script* script, bool removeFile)
m_scripts.removeOne(script); m_scripts.removeOne(script);
QWebEngineScriptCollection &collection = mApp->webProfile()->scripts(); QWebEngineScriptCollection *collection = mApp->webProfile()->scripts();
collection.remove(collection.findScript(script->fullName())); collection->remove(collection->findScript(script->fullName()));
m_disabledScripts.removeOne(script->fullName()); m_disabledScripts.removeOne(script->fullName());
@ -229,7 +229,7 @@ void GM_Manager::load()
script->setEnabled(false); script->setEnabled(false);
} }
else { else {
mApp->webProfile()->scripts().insert(script->webScript()); mApp->webProfile()->scripts()->insert(script->webScript());
} }
} }
@ -242,9 +242,9 @@ void GM_Manager::scriptChanged()
if (!script) if (!script)
return; return;
QWebEngineScriptCollection &collection = mApp->webProfile()->scripts(); QWebEngineScriptCollection *collection = mApp->webProfile()->scripts();
collection.remove(collection.findScript(script->fullName())); collection->remove(collection->findScript(script->fullName()));
collection.insert(script->webScript()); collection->insert(script->webScript());
} }
bool GM_Manager::canRunOnScheme(const QString &scheme) bool GM_Manager::canRunOnScheme(const QString &scheme)

Loading…
Cancel
Save