diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2010-09-29 09:28:52 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2010-09-29 09:28:52 +0200 |
| commit | 29e0f0d46b87c7cb3a9e15ac4de19d2b42f487df (patch) | |
| tree | 22c995f14d59781f33471104bad1f933055cac81 /src/plugins/debugger/breakwindow.h | |
| parent | 8ff81fd75d93f7b1f5bcc68d6a08b5c72a269c35 (diff) | |
| parent | d7fec2ae1e48eff1dffdf9c8e8efce9b647cb1ad (diff) | |
| download | qt-creator-29e0f0d46b87c7cb3a9e15ac4de19d2b42f487df.tar.gz | |
Merge remote branch 'origin/2.1'
Conflicts:
src/plugins/qt4projectmanager/wizards/mobilelibraryparameters.cpp
Diffstat (limited to 'src/plugins/debugger/breakwindow.h')
| -rw-r--r-- | src/plugins/debugger/breakwindow.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/debugger/breakwindow.h b/src/plugins/debugger/breakwindow.h index 2a9e41b7a0..5b6b1cb969 100644 --- a/src/plugins/debugger/breakwindow.h +++ b/src/plugins/debugger/breakwindow.h @@ -62,6 +62,7 @@ private: void deleteBreakpoints(const QModelIndexList &list); void deleteBreakpoints(QList<int> rows); void addBreakpoint(); + bool editBreakpoint(BreakpointData *data); // Returns 'Accept'. void editBreakpoints(const QModelIndexList &list); void associateBreakpoint(const QModelIndexList &list, int thread); void setBreakpointsEnabled(const QModelIndexList &list, bool enabled); |