From a0ec35d5f290ce07c591fb3f075390e592326d2a Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Mon, 4 Jul 2022 13:34:19 +0200 Subject: tests: make xembed/qt-client-widget better MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See also QX11EmbedWidget::QX11EmbedWidget() in src/gui/kernel/qx11embed_x11.cpp in qt4. https: //github.com/qt/qt/blob/4.8/src/gui/kernel/qx11embed_x11.cpp#L475-L477 Pick-to: 6.4 6.3 6.2 5.15 Change-Id: I47504a2d8f3e33c367f092d01ee5d7e1b16b5106 Reviewed-by: Tor Arne Vestbø --- tests/manual/xembed/qt-client-widget/main.cpp | 2 +- tests/manual/xembed/qt-client-widget/window.cpp | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/manual/xembed/qt-client-widget/main.cpp b/tests/manual/xembed/qt-client-widget/main.cpp index 59b1a76c6a..7451d7bb1e 100644 --- a/tests/manual/xembed/qt-client-widget/main.cpp +++ b/tests/manual/xembed/qt-client-widget/main.cpp @@ -21,12 +21,12 @@ int main(int argc, char *argv[]) } Window window; - window.show(); QWindow *foreign = QWindow::fromWinId(winId); Q_ASSERT(foreign != 0); window.windowHandle()->setParent(foreign); + window.show(); return app.exec(); } diff --git a/tests/manual/xembed/qt-client-widget/window.cpp b/tests/manual/xembed/qt-client-widget/window.cpp index d485c92b14..6f0a373ec3 100644 --- a/tests/manual/xembed/qt-client-widget/window.cpp +++ b/tests/manual/xembed/qt-client-widget/window.cpp @@ -7,6 +7,10 @@ Window::Window() { + setAttribute(Qt::WA_NativeWindow); + setAttribute(Qt::WA_DontCreateNativeAncestors); + createWinId(); + QGroupBox *echoGroup = new QGroupBox(tr("Echo")); QLabel *echoLabel = new QLabel(tr("Mode:")); -- cgit v1.2.3