t-head/meta-qt5
1
0
Fork 0
mirror of https://github.com/thead-yocto-mirror/meta-qt5 synced 2026-09-10 16:15:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

maliit-framework-qt5: Fix build when ptest is enabled

Browse Source 
This is primarily seen when using ptest and QT 5.13

Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj
2019-07-16 17:55:08 -07:00
committed by Martin Jansa
parent 8f0e741022
commit 708be171f6
2 changed files with 67 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
recipes-qt/maliit/maliit-framework-qt5/0001-examples-plugins-Replace-obsolete-screenGeometry.patch Normal file
View File

@@ -0,0 +1,66 @@
From 604761d49aa1d93ef5cc6d13259dc53dce7f04c4 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Tue, 16 Jul 2019 17:52:04 -0700
Subject: [PATCH] examples/plugins: Replace obsolete screenGeometry
Fixes errors like
helloworldinputmethod.cpp:93:55: error: 'screenGeometry' is deprecated: Use QGuiApplication::screens() [-Werror,-Wdeprecated-declarations]
const QSize screenSize = QApplication::desktop()->screenGeometry().size();
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
examples/plugins/cxx/helloworld/helloworldinputmethod.cpp | 5 +++--
examples/plugins/cxx/override/overrideinputmethod.cpp | 5 +++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/examples/plugins/cxx/helloworld/helloworldinputmethod.cpp b/examples/plugins/cxx/helloworld/helloworldinputmethod.cpp
index eb470a1f..e5e5911d 100644
--- a/examples/plugins/cxx/helloworld/helloworldinputmethod.cpp
+++ b/examples/plugins/cxx/helloworld/helloworldinputmethod.cpp
@@ -18,7 +18,7 @@
#include <QDebug>
#include <QApplication>
-#include <QDesktopWidget>
+#include <QScreen>
namespace {
@@ -90,7 +90,8 @@ void HelloWorldInputMethod::show()
}
// Set size of our container to screen size
- const QSize screenSize = QApplication::desktop()->screenGeometry().size();
+ QScreen *screen = QApplication::primaryScreen();
+ const QSize screenSize = screen->availableSize();
mainWidget->parentWidget()->resize(screenSize);
// Set size of the input method
diff --git a/examples/plugins/cxx/override/overrideinputmethod.cpp b/examples/plugins/cxx/override/overrideinputmethod.cpp
index c00160e4..f2f30e1d 100644
--- a/examples/plugins/cxx/override/overrideinputmethod.cpp
+++ b/examples/plugins/cxx/override/overrideinputmethod.cpp
@@ -18,7 +18,7 @@
#include <QDebug>
#include <QApplication>
-#include <QDesktopWidget>
+#include <QScreen>
#include <QKeyEvent>
namespace {
@@ -82,7 +82,8 @@ void OverrideInputMethod::show()
}
// Set size of the input method
- const QSize &screenSize = QApplication::desktop()->screenGeometry().size();
+ QScreen *screen = QApplication::primaryScreen();
+ const QSize screenSize = screen->availableSize();
const QSize size(screenSize.width() - 200, 200);
surface->setGeometry(QRect(QPoint((screenSize.width() - size.width()) / 2,
--
2.22.0

1
recipes-qt/maliit/maliit-framework-qt5_git.bb
View File

@@ -11,6 +11,7 @@ SRC_URI = "git://github.com/maliit/framework.git;branch=master \
file://maliit-server.desktop \
file://0001-config.pri-Use-O1-optimization-in-DEBUG-flags.patch \
file://0001-Drop-tr1-namespace-its-not-there-in-c-11-and-newer.patch \
file://0001-examples-plugins-Replace-obsolete-screenGeometry.patch \
"
SRCREV = "60b1b10de14f932420313c547ab801daf522d539"