diff options
| author | El Mehdi Fekari <mfekari@rim.com> | 2013-10-18 19:27:31 +0200 |
|---|---|---|
| committer | Mehdi Fekari <mfekari@blackberry.com> | 2013-10-22 20:14:14 +0200 |
| commit | 36e6a705052c005529eb8558736e1c9df6865355 (patch) | |
| tree | c322c35191fd9b93af5a9c22edf89fc8938365d8 /src/plugins/ios/iosconfigurations.cpp | |
| parent | 9f66b6384a9c42ca2ff670a82311be3a1b9d1995 (diff) | |
| download | qt-creator-36e6a705052c005529eb8558736e1c9df6865355.tar.gz | |
Debugger: Fix the way to register/add new debuggers
DebuggerItemManager::registerDebugger() should return the id
of the added debugger in order to use it when setting a kit's debugger
(addDebugger() creates and adds a copy of the passed
debugger object with a unique id).
The DebuggerKitInformation::setDebugger() method should set only already
existing and registered debuggers.
Task-number: QTCREATORBUG-10436
Change-Id: Icdcd1ed92aafe9eda44abf831aa9983dd6801980
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Diffstat (limited to 'src/plugins/ios/iosconfigurations.cpp')
| -rw-r--r-- | src/plugins/ios/iosconfigurations.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/ios/iosconfigurations.cpp b/src/plugins/ios/iosconfigurations.cpp index 9dac4889b3..ebfca0293f 100644 --- a/src/plugins/ios/iosconfigurations.cpp +++ b/src/plugins/ios/iosconfigurations.cpp @@ -316,7 +316,8 @@ void IosConfigurations::updateAutomaticKitList() debugger.setDisplayName(tr("IOS Debugger")); debugger.setAutoDetected(true); debugger.setAbi(pToolchain->targetAbi()); - Debugger::DebuggerKitInformation::setDebugger(newKit, debugger); + QVariant id = Debugger::DebuggerItemManager::registerDebugger(debugger); + Debugger::DebuggerKitInformation::setDebugger(newKit, id); SysRootKitInformation::setSysRoot(newKit, p.sdkPath); // QmakeProjectManager::QmakeKitInformation::setMkspec(newKit, |