summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2022-07-04 13:34:19 +0200
committerLiang Qi <liang.qi@qt.io>2022-08-06 01:24:41 +0200
commita0ec35d5f290ce07c591fb3f075390e592326d2a (patch)
tree23af32888f1867394b1c49d4d28fb5d1e8bd6efc
parentaef55501bccd52f63a84228cb2ee201ec4f5c301 (diff)
tests: make xembed/qt-client-widget better
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ø <tor.arne.vestbo@qt.io>
-rw-r--r--tests/manual/xembed/qt-client-widget/main.cpp2
-rw-r--r--tests/manual/xembed/qt-client-widget/window.cpp4
2 files changed, 5 insertions, 1 deletions
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:"));