From 9cd6cb67eb549010d1d31dc2b4d1668470d1e0a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Tue, 8 Aug 2023 15:01:23 +0200 Subject: [PATCH] Fix embeddedwindows test on platforms without native window helper MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I33074fc4a04982075a8c264bad41c56235e98cb6 Reviewed-by: MikoĊ‚aj Boc (cherry picked from commit 5cf3d062f66677e77c0e288ba5544c6a835398e5) Reviewed-by: Qt Cherry-pick Bot --- tests/manual/embeddedwindows/main.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/manual/embeddedwindows/main.cpp b/tests/manual/embeddedwindows/main.cpp index 15c321839fe..0bc2901d69c 100644 --- a/tests/manual/embeddedwindows/main.cpp +++ b/tests/manual/embeddedwindows/main.cpp @@ -3,7 +3,10 @@ #include +#if defined(Q_OS_MACOS) || defined(Q_OS_IOS) || defined(Q_OS_WIN) #include "../../shared/nativewindow.h" +#define HAVE_NATIVE_WINDOW +#endif #include @@ -69,6 +72,7 @@ int main(int argc, char *argv[]) transparentChildWindow->setGeometry(350, 50, 100, 100); transparentChildWindow->showNormal(); +#if defined(HAVE_NATIVE_WINDOW) NativeWindow nativeWindow; if (QWindow *foreignWindow = QWindow::fromWinId(nativeWindow)) { foreignWindow->setParent(&window); @@ -95,6 +99,7 @@ int main(int argc, char *argv[]) maskedChildWindowOfNativeWindow->setGeometry(25, 25, 50, 50); maskedChildWindowOfNativeWindow->showNormal(); } +#endif window.show();