From cef9cbdd52d737ce6ff01d12770b38c02a0e331a Mon Sep 17 00:00:00 2001
From: Liang Qi <liang.qi@qt.io>
Date: Mon, 4 Jul 2022 17:48:24 +0200
Subject: [PATCH] tests: make xembed/qt-client-raster better
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Pick-to: 6.4 6.3 6.2 5.15
Change-Id: Id45bcfb92eb24c4455cf50497e28312eb87e0f9a
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
---
 tests/manual/xembed/qt-client-raster/main.cpp         | 2 +-
 tests/manual/xembed/qt-client-raster/rasterwindow.cpp | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/manual/xembed/qt-client-raster/main.cpp b/tests/manual/xembed/qt-client-raster/main.cpp
index 447578fcc26..f522e1401f5 100644
--- a/tests/manual/xembed/qt-client-raster/main.cpp
+++ b/tests/manual/xembed/qt-client-raster/main.cpp
@@ -18,12 +18,12 @@ int main(int argc, char **argv)
     }
 
     RasterWindow window;
-    window.show();
 
     QWindow *foreign = QWindow::fromWinId(winId);
     Q_ASSERT(foreign != 0);
 
     window.setParent(foreign);
+    window.show();
 
     return app.exec();
 }
diff --git a/tests/manual/xembed/qt-client-raster/rasterwindow.cpp b/tests/manual/xembed/qt-client-raster/rasterwindow.cpp
index 9cf2db737cc..b99ca4b2548 100644
--- a/tests/manual/xembed/qt-client-raster/rasterwindow.cpp
+++ b/tests/manual/xembed/qt-client-raster/rasterwindow.cpp
@@ -7,6 +7,8 @@ RasterWindow::RasterWindow(QWindow *parent)
     : QWindow(parent)
     , m_update_pending(false)
 {
+    winId();
+
     m_backingStore = new QBackingStore(this);
     create();