diff options
| author | con <[email protected]> | 2009-06-12 17:03:17 +0200 |
|---|---|---|
| committer | con <[email protected]> | 2009-06-12 17:03:17 +0200 |
| commit | 9c7801956df14f00c677f080c14be0e1b9b3e6ff (patch) | |
| tree | 62c65443807cb4007f92e8975a778c1bba91b148 /src/plugins/debugger/breakwindow.h | |
| parent | 7d1bf1fe577bdd93de27372fd7aa609dc601df4b (diff) | |
| parent | 992a178be33538ec256861d3bd54d9adc40027ea (diff) | |
Merge commit 'origin/1.2'
Conflicts:
src/plugins/debugger/breakwindow.cpp
Diffstat (limited to 'src/plugins/debugger/breakwindow.h')
| -rw-r--r-- | src/plugins/debugger/breakwindow.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/debugger/breakwindow.h b/src/plugins/debugger/breakwindow.h index 3aa049af8f6..463ceb2bd3f 100644 --- a/src/plugins/debugger/breakwindow.h +++ b/src/plugins/debugger/breakwindow.h @@ -50,6 +50,8 @@ signals: void breakpointDeleted(int index); void breakpointActivated(int index); void breakpointSynchronizationRequested(); + void breakByFunctionRequested(const QString &functionName); + void breakByFunctionMainRequested(); private slots: void rowActivated(const QModelIndex &index); |