Administration/pmbootstrap-meow
2
0
Fork 0
forked from Mirror/pmbootstrap
Code Pull requests Activity Actions

Disable LuneOS UI (see #1459) [skip ci]

Browse source 
Moved from aports/main to aports/luna, so we can disable the entire
folder from building in the binary repository:
* qt5-qtwebengine
* postmarketos-ui-luna
This commit is contained in:
Oliver Smith 2018-05-02 22:36:17 +02:00
parent df6e677c6e
commit 873b29eccd
No known key found for this signature in database
GPG key ID: 5AE7F5513E0885CB
55 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

47
aports/luna/qt5-qtwebengine/patches-luna/0016-Fix-build-for-Qt5.9.patch Normal file
View file

@ -0,0 +1,47 @@
From fb88489ccd170c86fbcffd22d8ea4644cbdc40ed Mon Sep 17 00:00:00 2001
From: Christophe Chapuis <chris.chapuis@gmail.com>
Date: Thu, 31 Aug 2017 17:26:47 +0000
Subject: [PATCH 16/18] Fix build for Qt5.9
---
src/core/render_widget_host_view_qt.cpp | 3 ++-
src/webengine/api/qquickwebengineview.cpp | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/core/render_widget_host_view_qt.cpp b/src/core/render_widget_host_view_qt.cpp
index 5105214..fea7313 100644
--- a/src/core/render_widget_host_view_qt.cpp
+++ b/src/core/render_widget_host_view_qt.cpp
@@ -43,6 +43,7 @@
#include "browser_accessibility_manager_qt.h"
#include "browser_accessibility_qt.h"
#include "chromium_overrides.h"
+#include "web_contents_view_qt.h"
#include "delegated_frame_node.h"
#include "qtwebenginecoreglobal_p.h"
#include "render_widget_host_view_qt_delegate.h"
@@ -715,7 +716,7 @@ void RenderWidgetHostViewQt::GetScreenInfo(content::ScreenInfo* results)
GetScreenInfoFromNativeWindow(window, results);
}
else {
- GetDefaultScreenInfo(results);
+ content::WebContentsView::GetDefaultScreenInfo(results);
}
// Support experimental.viewport.devicePixelRatio
diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
index 8fdf30a..bf64956 100644
--- a/src/webengine/api/qquickwebengineview.cpp
+++ b/src/webengine/api/qquickwebengineview.cpp
@@ -588,7 +588,7 @@ void QQuickWebEngineViewPrivate::unhandledKeyEvent(QKeyEvent *event)
q->window()->sendEvent(q->parentItem(), event);
}
-void QQuickWebEngineViewPrivate::adoptNewWindow(QSharedPointer<WebContentsAdapter> newWebContents, WindowOpenDisposition disposition, bool userGesture, const QRect &requestedGeometry, const QStringList &additionalFeaturesStringList)
+void QQuickWebEngineViewPrivate::adoptNewWindow(QSharedPointer<WebContentsAdapter> newWebContents, WindowOpenDisposition disposition, bool userGesture, const QRect &requestedGeometry, const QUrl &targetUrl, const QStringList &additionalFeaturesStringList)
{
Q_Q(QQuickWebEngineView);
QQuickWebEngineNewViewRequest request;
--
2.7.4