1*4882a593SmuzhiyunFrom 604761d49aa1d93ef5cc6d13259dc53dce7f04c4 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Khem Raj <raj.khem@gmail.com> 3*4882a593SmuzhiyunDate: Tue, 16 Jul 2019 17:52:04 -0700 4*4882a593SmuzhiyunSubject: [PATCH] examples/plugins: Replace obsolete screenGeometry 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunFixes errors like 7*4882a593Smuzhiyunhelloworldinputmethod.cpp:93:55: error: 'screenGeometry' is deprecated: Use QGuiApplication::screens() [-Werror,-Wdeprecated-declarations] 8*4882a593Smuzhiyun const QSize screenSize = QApplication::desktop()->screenGeometry().size(); 9*4882a593Smuzhiyun 10*4882a593SmuzhiyunUpstream-Status: Pending 11*4882a593Smuzhiyun 12*4882a593SmuzhiyunSigned-off-by: Khem Raj <raj.khem@gmail.com> 13*4882a593Smuzhiyun--- 14*4882a593Smuzhiyun examples/plugins/cxx/helloworld/helloworldinputmethod.cpp | 5 +++-- 15*4882a593Smuzhiyun examples/plugins/cxx/override/overrideinputmethod.cpp | 5 +++-- 16*4882a593Smuzhiyun 2 files changed, 6 insertions(+), 4 deletions(-) 17*4882a593Smuzhiyun 18*4882a593Smuzhiyundiff --git a/examples/plugins/cxx/helloworld/helloworldinputmethod.cpp b/examples/plugins/cxx/helloworld/helloworldinputmethod.cpp 19*4882a593Smuzhiyunindex eb470a1f..e5e5911d 100644 20*4882a593Smuzhiyun--- a/examples/plugins/cxx/helloworld/helloworldinputmethod.cpp 21*4882a593Smuzhiyun+++ b/examples/plugins/cxx/helloworld/helloworldinputmethod.cpp 22*4882a593Smuzhiyun@@ -18,7 +18,7 @@ 23*4882a593Smuzhiyun 24*4882a593Smuzhiyun #include <QDebug> 25*4882a593Smuzhiyun #include <QApplication> 26*4882a593Smuzhiyun-#include <QDesktopWidget> 27*4882a593Smuzhiyun+#include <QScreen> 28*4882a593Smuzhiyun 29*4882a593Smuzhiyun namespace { 30*4882a593Smuzhiyun 31*4882a593Smuzhiyun@@ -90,7 +90,8 @@ void HelloWorldInputMethod::show() 32*4882a593Smuzhiyun } 33*4882a593Smuzhiyun 34*4882a593Smuzhiyun // Set size of our container to screen size 35*4882a593Smuzhiyun- const QSize screenSize = QApplication::desktop()->screenGeometry().size(); 36*4882a593Smuzhiyun+ QScreen *screen = QApplication::primaryScreen(); 37*4882a593Smuzhiyun+ const QSize screenSize = screen->availableSize(); 38*4882a593Smuzhiyun mainWidget->parentWidget()->resize(screenSize); 39*4882a593Smuzhiyun 40*4882a593Smuzhiyun // Set size of the input method 41*4882a593Smuzhiyundiff --git a/examples/plugins/cxx/override/overrideinputmethod.cpp b/examples/plugins/cxx/override/overrideinputmethod.cpp 42*4882a593Smuzhiyunindex c00160e4..f2f30e1d 100644 43*4882a593Smuzhiyun--- a/examples/plugins/cxx/override/overrideinputmethod.cpp 44*4882a593Smuzhiyun+++ b/examples/plugins/cxx/override/overrideinputmethod.cpp 45*4882a593Smuzhiyun@@ -18,7 +18,7 @@ 46*4882a593Smuzhiyun 47*4882a593Smuzhiyun #include <QDebug> 48*4882a593Smuzhiyun #include <QApplication> 49*4882a593Smuzhiyun-#include <QDesktopWidget> 50*4882a593Smuzhiyun+#include <QScreen> 51*4882a593Smuzhiyun #include <QKeyEvent> 52*4882a593Smuzhiyun 53*4882a593Smuzhiyun namespace { 54*4882a593Smuzhiyun@@ -82,7 +82,8 @@ void OverrideInputMethod::show() 55*4882a593Smuzhiyun } 56*4882a593Smuzhiyun 57*4882a593Smuzhiyun // Set size of the input method 58*4882a593Smuzhiyun- const QSize &screenSize = QApplication::desktop()->screenGeometry().size(); 59*4882a593Smuzhiyun+ QScreen *screen = QApplication::primaryScreen(); 60*4882a593Smuzhiyun+ const QSize screenSize = screen->availableSize(); 61*4882a593Smuzhiyun const QSize size(screenSize.width() - 200, 200); 62*4882a593Smuzhiyun 63*4882a593Smuzhiyun surface->setGeometry(QRect(QPoint((screenSize.width() - size.width()) / 2, 64*4882a593Smuzhiyun-- 65*4882a593Smuzhiyun2.22.0 66*4882a593Smuzhiyun 67