@@ -74,6 +74,7 @@ PACKAGECONFIG:append:pn-systemd = " coredump"
PACKAGECONFIG_GL:pn-qtbase = "gles2 linuxfb"
PACKAGECONFIG_DISTRO:pn-qtbase = "icu examples accessibility gif gbm kms libinput"
PACKAGECONFIG_FONTS:pn-qtbase = "fontconfig"
+PACKAGECONFIG:remove:pn-qtwayland = "xcomposite-egl xcomposite-glx"
# Add gstreamer in package configuration to enable video
PACKAGECONFIG:append:pn-qtmultimedia = " gstreamer"
deleted file mode 100644
@@ -1,42 +0,0 @@
-From 547fd678ba55025c3578f021b40c96b1e91b839e Mon Sep 17 00:00:00 2001
-From: Eric Ruei <e-ruei1@ti.com>
-Date: Fri, 9 Sep 2016 16:54:02 -0400
-Subject: [PATCH] plugins/decorations/bradient: display window icon only if
- icon.pixmap not null
-
-Signed-off-by: Eric Ruei <e-ruei1@ti.com>
----
- src/plugins/decorations/bradient/main.cpp | 17 ++++++++++-------
- 1 file changed, 10 insertions(+), 7 deletions(-)
-
-diff --git a/src/plugins/decorations/bradient/main.cpp b/src/plugins/decorations/bradient/main.cpp
-index ea29869..279bff1 100644
---- a/src/plugins/decorations/bradient/main.cpp
-+++ b/src/plugins/decorations/bradient/main.cpp
-@@ -222,13 +222,16 @@ void QWaylandBradientDecoration::paint(QPaintDevice *device)
- // Window icon
- QIcon icon = waylandWindow()->windowIcon();
- if (!icon.isNull()) {
-- QPixmap pixmap = icon.pixmap(QSize(128, 128));
-- QPixmap scaled = pixmap.scaled(22, 22, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
--
-- QRectF iconRect(0, 0, 22, 22);
-- p.drawPixmap(iconRect.adjusted(margins().left() + BUTTON_SPACING, 4,
-- margins().left() + BUTTON_SPACING, 4),
-- scaled, iconRect);
-+ QPixmap pixmap = icon.pixmap(QSize(128, 128));
-+ if(!pixmap.isNull())
-+ {
-+ QPixmap scaled = pixmap.scaled(22, 22, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
-+
-+ QRectF iconRect(0, 0, 22, 22);
-+ p.drawPixmap(iconRect.adjusted(margins().left() + BUTTON_SPACING, 4,
-+ margins().left() + BUTTON_SPACING, 4),
-+ scaled, iconRect);
-+ }
- }
-
- // Window title
-1.9.1
-
deleted file mode 100644
@@ -1,8 +0,0 @@
-FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
-PR:append = ".arago2"
-
-SRC_URI += " \
- file://0001-plugins-decorations-bradient-display-window-icon-onl.patch \
-"
-
-PACKAGECONFIG:remove = "xcomposite-egl xcomposite-glx"