diff options
Diffstat (limited to 'src/plugins/debugger/debuggerplugin.cpp')
| -rw-r--r-- | src/plugins/debugger/debuggerplugin.cpp | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index 17de825ca9..2874bd41b8 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -4,28 +4,27 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: Nokia Corporation (info@qt.nokia.com) ** -** No Commercial Usage -** -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. ** ** GNU Lesser General Public License Usage ** -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this file. +** Please review the following information to ensure the GNU Lesser General +** Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** +** Other Usage +** +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. +** ** If you have questions regarding the use of this file, please contact ** Nokia at qt-info@nokia.com. ** @@ -1356,6 +1355,7 @@ void DebuggerPluginPrivate::startExternalApplication() sp.toolChainAbi = dlg.abi(); sp.debuggerCommand = dlg.debuggerCommand(); sp.workingDirectory = dlg.workingDirectory(); + sp.displayName = sp.executable; if (!dlg.executableArguments().isEmpty()) sp.processArgs = dlg.executableArguments(); // Fixme: 1 of 3 testing hacks. @@ -2701,9 +2701,11 @@ void DebuggerPluginPrivate::extensionsInitialized() act->setText(tr("Start and Debug External Application...")); connect(act, SIGNAL(triggered()), SLOT(startExternalApplication())); +#ifdef WITH_LLDB act = m_startRemoteLldbAction = new QAction(this); act->setText(tr("Start and Debug External Application with External Engine...")); connect(act, SIGNAL(triggered()), SLOT(startRemoteEngine())); +#endif act = m_attachExternalAction = new QAction(this); act->setText(tr("Attach to Running External Application...")); @@ -2765,10 +2767,12 @@ void DebuggerPluginPrivate::extensionsInitialized() cmd->setAttribute(Command::CA_Hide); mstart->addAction(cmd, CC::G_DEFAULT_ONE); +#ifdef WITH_LLDB cmd = am->registerAction(m_startRemoteLldbAction, Constants::STARTREMOTELLDB, globalcontext); cmd->setAttribute(Command::CA_Hide); mstart->addAction(cmd, CC::G_DEFAULT_ONE); +#endif if (m_startRemoteCdbAction) { cmd = am->registerAction(m_startRemoteCdbAction, |