From 23a7f3baa33265519840609dc54e950615ec39b1 Mon Sep 17 00:00:00 2001
From: Aqua-sama <aqua@iserlohn-fortress.net>
Date: Fri, 3 Jan 2020 18:04:08 +0200
Subject: Merge some QoL improvements from staging branch

- Build executable in top-level buildroot
- Use meson sourceset
- Pull in poi-crash and poi-update from staging
- Remove extraneous scripts in tools/
- Pull in configure scripts in scripts/
---
 src/webengine/webview.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'src/webengine')

diff --git a/src/webengine/webview.cpp b/src/webengine/webview.cpp
index 930b747..4fa227f 100644
--- a/src/webengine/webview.cpp
+++ b/src/webengine/webview.cpp
@@ -8,7 +8,6 @@
 
 #include "webview.h"
 #include "browser.h"
-#include "conf.hpp"
 #include "subwindow/subwindow.h"
 #include "wallet/wallet.h"
 #include "webpage.h"
@@ -57,13 +56,12 @@ WebView::WebView(WebProfile *profile, QWidget *parent)
         m_loaded = true;
     });
 
-#ifdef CONFIG_QTBUG_65223
+    // TODO for Qt 5.15, check for fix on QTBUG 65223
     connect(this, &QWebEngineView::loadProgress, this, [this](int progress) {
         if(progress == 100) {
             emit loadFinished(true);
         }
     });
-#endif
 }
 
 void WebView::setProfile(WebProfile *profile)
-- 
cgit v1.2.1