Merge branch 'Falkon/3.0'

linux/appdata/org.kde.falkon.appdata.xml

@@ -80,4 +80,15 @@
     <p xml:lang="zh-CN">Falkon 包含所有浏览器的高级功能，包括书签、历史、侧边栏和标签页。您可以通过内置的 RSS 阅读器管理 RSS 资源，通过内置的 AdBlock 插件屏蔽广告，通过 Click2Flash 屏蔽 Flash 内容，通过 SSL 管理器编辑本地 CA 认证数据库。</p>
   </description>
   <url type="homepage">https://kde.org/</url>
+  <screenshots>
+    <screenshot type="default">
+      <image width="1105" height="855">https://cdn.kde.org/screenshots/falkon/falkon.png</image>
+    </screenshot>
+  </screenshots>
+  <url type="homepage">https://userbase.kde.org/Falkon</url>
+  <url type="bugtracker">https://bugs.kde.org/enter_bug.cgi?format=guided&amp;product=falkon</url>
+  <project_group>KDE</project_group>
+  <provides>
+    <binary>falkon</binary>
+  </provides>
 </component>

src/lib/network/schemehandlers/falkonschemehandler.cpp

@@ -27,6 +27,7 @@
 #include "iconprovider.h"
 #include "sessionmanager.h"
 #include "restoremanager.h"
+#include "../config.h"
 
 #include <QTimer>
 #include <QSettings>

src/lib/other/aboutdialog.cpp

@@ -21,6 +21,7 @@
 #include "mainapplication.h"
 #include "webpage.h"
 #include "useragentmanager.h"
+#include "../config.h"
 
 #include <QWebEnginePage>
 #include <QWebEngineProfile>

src/lib/webengine/webview.cpp

@@ -469,13 +469,6 @@ void WebView::slotUrlChanged(const QUrl &url)
         emit titleChanged(title());
         m_backgroundActivity = oldActivity;
     }
-
-    // Don't save blank page / speed dial in tab history
-    if (!history()->canGoForward()  && history()->backItems(1).size() == 1) {
-        const QString s = LocationBar::convertUrlToText(history()->backItem().url());
-        if (s.isEmpty())
-            history()->clear();
-    }
 }
 
 void WebView::slotTitleChanged(const QString &title)