qupzilla:v.bump to 2.2.5

This commit is contained in:
2018-02-16 07:29:10 +03:00
parent c941e52ac1
commit 7a02782d9c
5 changed files with 1179 additions and 4 deletions
@@ -0,0 +1,24 @@
diff -ur QupZilla-2.2.0/src/lib/preferences/preferences.cpp QupZilla-2.2.0-native-scrollbars/src/lib/preferences/preferences.cpp
--- QupZilla-2.2.0/src/lib/preferences/preferences.cpp 2017-10-08 16:05:56.000000000 +0200
+++ src/lib/preferences/preferences.cpp 2017-10-16 05:34:25.738624011 +0200
@@ -278,7 +278,7 @@
ui->wheelScroll->setValue(settings.value("wheelScrollLines", qApp->wheelScrollLines()).toInt());
ui->xssAuditing->setChecked(settings.value("XSSAuditing", false).toBool());
ui->printEBackground->setChecked(settings.value("PrintElementBackground", true).toBool());
- ui->useNativeScrollbars->setChecked(settings.value("UseNativeScrollbars", false).toBool());
+ ui->useNativeScrollbars->setChecked(settings.value("UseNativeScrollbars", true).toBool());
foreach (int level, WebView::zoomLevels()) {
ui->defaultZoomLevel->addItem(QString("%1%").arg(level));
diff -ur QupZilla-2.2.0/src/lib/webengine/webscrollbarmanager.cpp QupZilla-2.2.0-native-scrollbars/src/lib/webengine/webscrollbarmanager.cpp
--- QupZilla-2.2.0/src/lib/webengine/webscrollbarmanager.cpp 2017-10-08 16:05:56.000000000 +0200
+++ src/lib/webengine/webscrollbarmanager.cpp 2017-10-16 05:33:36.152339717 +0200
@@ -109,7 +109,7 @@
void WebScrollBarManager::loadSettings()
{
- m_enabled = Settings().value(QSL("Web-Browser-Settings/UseNativeScrollbars"), false).toBool();
+ m_enabled = Settings().value(QSL("Web-Browser-Settings/UseNativeScrollbars"), true).toBool();
if (!m_enabled) {
for (WebView *view : m_scrollbars.keys()) {
@@ -0,0 +1,12 @@
diff -ur QupZilla-2.2.5/src/lib/webengine/webpage.cpp QupZilla-2.2.5-qtbug-65523-workaround/src/lib/webengine/webpage.cpp
--- QupZilla-2.2.5/src/lib/webengine/webpage.cpp 2018-01-28 16:37:13.000000000 +0100
+++ src/lib/webengine/webpage.cpp 2018-02-01 04:34:19.159005227 +0100
@@ -102,7 +102,7 @@
});
// Workaround for broken load started/finished signals in QtWebEngine 5.10
- if (qstrcmp(qVersion(), "5.10.0") == 0) {
+ {
connect(this, &QWebEnginePage::loadProgress, this, [this](int progress) {
if (progress == 100) {
emit loadFinished(true);
File diff suppressed because it is too large Load Diff