Workaround Qt 5.9 build (open-eid#1111)

IB-7411 Signed-off-by: Raul Metsma <[email protected]> Signed-off-by: Raul Metsma <[email protected]>
metsma · Aug 25, 2022 · d3baa13 · d3baa13
1 parent 97aca50
commit d3baa13
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -146,7 +146,7 @@ jobs:
           toolset: 14.29
         - vcver: 143
           image: windows-2022
-          toolset: 14.32
+          toolset: 14.33
         - vcver: 142
           arch: x86
           qtver: 5.12.12

diff --git a/client/Application.cpp b/client/Application.cpp
@@ -1109,8 +1109,21 @@ void Application::showClient(const QStringList &params, bool crypto, bool sign,
 #ifdef Q_OS_LINUX
 		else
 		{
-			QRect rect = QGuiApplication::screenAt(w->pos())->availableGeometry();
-			w->move(rect.center() - w->frameGeometry().adjusted(0, 0, 10, 40).center());
+#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0)
+			QScreen *screen = [w]() -> QScreen* {
+				for (const QScreen *screen : QGuiApplication::screens()) {
+					for (QScreen *sibling : screen->virtualSiblings()) {
+						if (sibling->geometry().contains(w->pos()))
+							return sibling;
+					}
+				}
+				return nullptr;
+			}();
+#else
+			QScreen *screen = QGuiApplication::screenAt(w->pos());
+#endif
+			if(screen)
+				w->move(screen->availableGeometry().center() - w->frameGeometry().adjusted(0, 0, 10, 40).center());
 		}
 #endif
 	}