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

Fix build with NONBLOCK_JS_DIALOGS

Browse Source
This commit is contained in:
David Rosca 2015-09-29 11:30:42 +02:00
parent 2582ee3562
commit b2c4064f1b
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/lib/webengine/webpage.cpp
View File

@ -821,6 +821,8 @@ bool WebPage::extension(Extension extension, const ExtensionOption* option, Exte
bool WebPage::javaScriptPrompt(const QUrl &securityOrigin, const QString &msg, const QString &defaultValue, QString* result) bool WebPage::javaScriptPrompt(const QUrl &securityOrigin, const QString &msg, const QString &defaultValue, QString* result)
{ {
Q_UNUSED(securityOrigin)
#ifndef NONBLOCK_JS_DIALOGS #ifndef NONBLOCK_JS_DIALOGS
return QWebEnginePage::javaScriptPrompt(securityOrigin, msg, defaultValue, result); return QWebEnginePage::javaScriptPrompt(securityOrigin, msg, defaultValue, result);
#else #else
@ -836,10 +838,10 @@ bool WebPage::javaScriptPrompt(const QUrl &securityOrigin, const QString &msg, c
ui->message->setText(msg); ui->message->setText(msg);
ui->lineEdit->setText(defaultValue); ui->lineEdit->setText(defaultValue);
ui->lineEdit->setFocus(); ui->lineEdit->setFocus();
widget->resize(webView->size()); widget->resize(view()->size());
widget->show(); widget->show();
connect(webView, SIGNAL(viewportResized(QSize)), widget, SLOT(slotResize(QSize))); connect(view(), SIGNAL(viewportResized(QSize)), widget, SLOT(slotResize(QSize)));
connect(ui->lineEdit, SIGNAL(returnPressed()), ui->buttonBox->button(QDialogButtonBox::Ok), SLOT(animateClick())); connect(ui->lineEdit, SIGNAL(returnPressed()), ui->buttonBox->button(QDialogButtonBox::Ok), SLOT(animateClick()));
QEventLoop eLoop; QEventLoop eLoop;
@ -864,6 +866,8 @@ bool WebPage::javaScriptPrompt(const QUrl &securityOrigin, const QString &msg, c
bool WebPage::javaScriptConfirm(const QUrl &securityOrigin, const QString &msg) bool WebPage::javaScriptConfirm(const QUrl &securityOrigin, const QString &msg)
{ {
Q_UNUSED(securityOrigin)
#ifndef NONBLOCK_JS_DIALOGS #ifndef NONBLOCK_JS_DIALOGS
return QWebEnginePage::javaScriptConfirm(securityOrigin, msg); return QWebEnginePage::javaScriptConfirm(securityOrigin, msg);
#else #else
@ -878,10 +882,10 @@ bool WebPage::javaScriptConfirm(const QUrl &securityOrigin, const QString &msg)
ui->setupUi(widget); ui->setupUi(widget);
ui->message->setText(msg); ui->message->setText(msg);
ui->buttonBox->button(QDialogButtonBox::Ok)->setFocus(); ui->buttonBox->button(QDialogButtonBox::Ok)->setFocus();
widget->resize(webView->size()); widget->resize(view()->size());
widget->show(); widget->show();
connect(webView, SIGNAL(viewportResized(QSize)), widget, SLOT(slotResize(QSize))); connect(view(), SIGNAL(viewportResized(QSize)), widget, SLOT(slotResize(QSize)));
QEventLoop eLoop; QEventLoop eLoop;
m_runningLoop = &eLoop; m_runningLoop = &eLoop;