summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Stenger <christian.stenger@qt.io>2023-02-10 16:26:52 +0100
committerChristian Stenger <christian.stenger@qt.io>2023-02-16 14:10:30 +0000
commit4b9054c4637a391fab2eb4225e911c514c310add (patch)
treef753f8e8fafc766c5724769edfba31f77c325d8d
parentbc38ad8c594c4a2162fec3e1e9f64c01cf5995f1 (diff)
downloadqt-creator-4b9054c4637a391fab2eb4225e911c514c310add.tar.gz
Pdb: Fix debugger start for python debugging
Do not stop at the first statement of the script when performing "normal" debug, stop at the first break point instead. Preserve the original behavior when debugging by triggering "Start and Break on Main". Task-number: QTCREATORBUG-28732 Change-Id: I3022071f28c086a2d0787ca5873e611f77e28369 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
-rw-r--r--src/libs/utils/fancymainwindow.cpp2
-rw-r--r--src/plugins/debugger/pdb/pdbengine.cpp5
2 files changed, 5 insertions, 2 deletions
diff --git a/src/libs/utils/fancymainwindow.cpp b/src/libs/utils/fancymainwindow.cpp
index 1d7f3e03fa..a19fc6c3c7 100644
--- a/src/libs/utils/fancymainwindow.cpp
+++ b/src/libs/utils/fancymainwindow.cpp
@@ -378,7 +378,7 @@ QDockWidget *FancyMainWindow::addDockForWidget(QWidget *widget, bool immutable)
dockWidget->setProperty(dockWidgetActiveState, visible);
});
- connect(dockWidget->toggleViewAction(), &QAction::triggered, this, [dockWidget] {
+ connect(dockWidget->toggleViewAction(), &QAction::triggered, dockWidget, [dockWidget] {
if (dockWidget->isVisible())
dockWidget->raise();
}, Qt::QueuedConnection);
diff --git a/src/plugins/debugger/pdb/pdbengine.cpp b/src/plugins/debugger/pdb/pdbengine.cpp
index 1a7487f444..fd749a2d0c 100644
--- a/src/plugins/debugger/pdb/pdbengine.cpp
+++ b/src/plugins/debugger/pdb/pdbengine.cpp
@@ -128,7 +128,10 @@ void PdbEngine::handlePdbStarted()
showStatusMessage(Tr::tr("Running requested..."), 5000);
BreakpointManager::claimBreakpointsForEngine(this);
notifyEngineRunAndInferiorStopOk();
- updateAll();
+ if (runParameters().breakOnMain)
+ updateAll();
+ else
+ continueInferior();
}
void PdbEngine::interruptInferior()