diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-12-04 18:52:58 +0200 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-12-04 18:52:58 +0200 |
| commit | ec52aa4a90203fecac80c00decb6bce5b09f107d (patch) | |
| tree | f15e9e934c5090c8453a45f44aa9699514eb1300 /src | |
| parent | cf5106463bd3aeb78a6a51839673b0e4f008fd82 (diff) | |
| parent | 8a196a206722fbfba0ae84b4073a94aa32186a6a (diff) | |
Merge tag 'v6.5.8-lts' into tqtc/lts-6.5-opensourcev6.5.8-lts-lgpl6.5
Qt 6.5.8-lts release
Conflicts solved:
dependencies.yaml
Change-Id: I822aa17ebd40f805785ce18b3cdf6a2386d7672f
Diffstat (limited to 'src')
| -rw-r--r-- | src/designer/src/designer/qdesigner.cpp | 11 | ||||
| -rw-r--r-- | src/designer/src/designer/qdesigner.h | 1 | ||||
| -rw-r--r-- | src/designer/src/designer/qdesigner_workbench.cpp | 16 | ||||
| -rw-r--r-- | src/designer/src/designer/qdesigner_workbench.h | 1 | ||||
| -rw-r--r-- | src/linguist/lrelease/lrelease.1 | 2 | ||||
| -rw-r--r-- | src/linguist/lupdate/lupdate.1 | 2 |
6 files changed, 29 insertions, 4 deletions
diff --git a/src/designer/src/designer/qdesigner.cpp b/src/designer/src/designer/qdesigner.cpp index 8b35cbccc..407d13df4 100644 --- a/src/designer/src/designer/qdesigner.cpp +++ b/src/designer/src/designer/qdesigner.cpp @@ -245,7 +245,7 @@ QDesigner::ParseArgumentsResult QDesigner::parseCommandLineArguments() // Show up error box with parent now if something went wrong if (m_initializationErrors.isEmpty()) { - if (!m_suppressNewFormShow && QDesignerSettings(m_workbench->core()).showNewFormOnStartup()) + if (!isServerOrClientEnabled() && !m_suppressNewFormShow && QDesignerSettings(m_workbench->core()).showNewFormOnStartup()) QTimer::singleShot(100, this, &QDesigner::callCreateForm); // won't show anything if suppressed } else { showErrorMessageBox(m_initializationErrors); @@ -254,6 +254,11 @@ QDesigner::ParseArgumentsResult QDesigner::parseCommandLineArguments() return result; } +bool QDesigner::isServerOrClientEnabled() const +{ + return m_server || m_client; +} + bool QDesigner::event(QEvent *ev) { bool eaten; @@ -261,8 +266,10 @@ bool QDesigner::event(QEvent *ev) case QEvent::FileOpen: // Set it true first since, if it's a Qt 3 form, the messagebox from convert will fire the timer. m_suppressNewFormShow = true; - if (!m_workbench->readInForm(static_cast<QFileOpenEvent *>(ev)->file())) + if (!m_workbench->readInForm(static_cast<QFileOpenEvent *>(ev)->file())) { + m_workbench->requestActivate(); m_suppressNewFormShow = false; + } eaten = true; break; case QEvent::Close: { diff --git a/src/designer/src/designer/qdesigner.h b/src/designer/src/designer/qdesigner.h index d9b830f38..ca6868398 100644 --- a/src/designer/src/designer/qdesigner.h +++ b/src/designer/src/designer/qdesigner.h @@ -38,6 +38,7 @@ public: QDesignerWorkbench *workbench() const; QDesignerServer *server() const; + bool isServerOrClientEnabled() const; MainWindowBase *mainWindow() const; void setMainWindow(MainWindowBase *tw); diff --git a/src/designer/src/designer/qdesigner_workbench.cpp b/src/designer/src/designer/qdesigner_workbench.cpp index 18ab1b5ea..4cb347192 100644 --- a/src/designer/src/designer/qdesigner_workbench.cpp +++ b/src/designer/src/designer/qdesigner_workbench.cpp @@ -837,6 +837,22 @@ void QDesignerWorkbench::bringAllToFront() raiseWindow(dfw); } +void QDesignerWorkbench::requestActivate() +{ + switch (m_mode) { + case NeutralMode: + break; + case TopLevelMode: + bringAllToFront(); + widgetBoxToolWindow()->windowHandle()->requestActivate(); + break; + case DockedMode: + raiseWindow(m_dockedMainWindow); + m_dockedMainWindow->windowHandle()->requestActivate(); + break; + } +} + // Resize a form window taking MDI decorations into account // Apply maximum size as there is no layout connection between // the form's main container and the integration's outer diff --git a/src/designer/src/designer/qdesigner_workbench.h b/src/designer/src/designer/qdesigner_workbench.h index d80fe730b..3633e4714 100644 --- a/src/designer/src/designer/qdesigner_workbench.h +++ b/src/designer/src/designer/qdesigner_workbench.h @@ -86,6 +86,7 @@ public slots: void removeFormWindow(QDesignerFormWindow *formWindow); void bringAllToFront(); void toggleFormMinimizationState(); + void requestActivate(); private slots: void switchToNeutralMode(); diff --git a/src/linguist/lrelease/lrelease.1 b/src/linguist/lrelease/lrelease.1 index fdda20afe..e1e79fcad 100644 --- a/src/linguist/lrelease/lrelease.1 +++ b/src/linguist/lrelease/lrelease.1 @@ -1,4 +1,4 @@ -.TH lrelease 1 "18 October 2001" "Digia Plc and/or its subsidiary(-ies)" \" -*- nroff -*- +.TH lrelease 1 "18 October 2001" "The Qt Company Ltd." \" -*- nroff -*- .\" .\" Copyright (C) 2016 The Qt Company Ltd. .\" SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 diff --git a/src/linguist/lupdate/lupdate.1 b/src/linguist/lupdate/lupdate.1 index a866965ca..66bb571fc 100644 --- a/src/linguist/lupdate/lupdate.1 +++ b/src/linguist/lupdate/lupdate.1 @@ -1,4 +1,4 @@ -.TH lupdate 1 "18 October 2001" "Digia Plc and/or its subsidiary(-ies)" \" -*- nroff -*- +.TH lupdate 1 "18 October 2001" "The Qt Company Ltd." \" -*- nroff -*- .\" .\" Copyright (C) 2016 The Qt Company Ltd. .\" SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 |