Use QWidget::activateWindow() instead of QApplication::setActiveWindow()

The latter is meant for the internal window activation machinery in
QtWidgets and should not be called by user code.

Pick-to: 6.4
Change-Id: I8cd750408b279c53c8a372164692260a15d133e8
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>

2 files changed, 2 insertions, 2 deletions

diff --git a/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp b/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp
index 5b03670b3..e5ac0585e 100644
--- a/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp
+++ b/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp
@@ -938,7 +938,7 @@ void WidgetBoxTreeWidget::dropWidgets(const QList<QDesignerDnDItemInterface*> &i
 
     if (added) {
         save();
-        QApplication::setActiveWindow(this);
+        activateWindow();
         // Is the new item visible in filtered mode?
         const WidgetBoxCategoryListView::AccessMode am = WidgetBoxCategoryListView::FilteredAccess;
         if (const int count = categoryView->count(am))
diff --git a/src/designer/src/lib/shared/qdesigner_menubar.cpp b/src/designer/src/lib/shared/qdesigner_menubar.cpp
index 24f6eaacf..cc8f458f1 100644
--- a/src/designer/src/lib/shared/qdesigner_menubar.cpp
+++ b/src/designer/src/lib/shared/qdesigner_menubar.cpp
@@ -478,7 +478,7 @@ void QDesignerMenuBar::showLineEdit()
     m_editor->selectAll();
     m_editor->setGeometry(actionGeometry(action));
     m_editor->show();
-    qApp->setActiveWindow(m_editor);
+    m_editor->activateWindow();
     m_editor->setFocus();
     m_editor->grabKeyboard();
 }