diff options
| author | con <qtc-committer@nokia.com> | 2011-04-01 09:53:09 +0200 |
|---|---|---|
| committer | con <qtc-committer@nokia.com> | 2011-04-01 09:53:09 +0200 |
| commit | 1c2da511b908713210346df13c643ee9e05a58de (patch) | |
| tree | fbd537bc06e1d72d6671ee599a460e7cd38dc433 /src/plugins/debugger/breakpoint.cpp | |
| parent | 12fd1dbb703b141f70860d47db5cb34e7f79c9e7 (diff) | |
| parent | eb03bd1a9303307038a9edb34a829f2db5701e62 (diff) | |
| download | qt-creator-1c2da511b908713210346df13c643ee9e05a58de.tar.gz | |
Merge remote branch 'origin/2.2'
Conflicts:
src/plugins/debugger/gdb/gdbengine.cpp
src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
src/plugins/qt4projectmanager/qt-maemo/maemoglobal.h
src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp
src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.h
Diffstat (limited to 'src/plugins/debugger/breakpoint.cpp')
| -rw-r--r-- | src/plugins/debugger/breakpoint.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/debugger/breakpoint.cpp b/src/plugins/debugger/breakpoint.cpp index c11963dc92..5a3be3a7bc 100644 --- a/src/plugins/debugger/breakpoint.cpp +++ b/src/plugins/debugger/breakpoint.cpp @@ -128,7 +128,7 @@ QString BreakpointParameters::toString() const case BreakpointAtMain: case BreakpointAtFork: case BreakpointAtExec: - case BreakpointAtVFork: + //case BreakpointAtVFork: case BreakpointAtSysCall: case UnknownType: break; |