Commit 30f9ac4d authored by Kevin Funk's avatar Kevin Funk
Browse files

Merge remote-tracking branch 'origin/5.0'

parents 979f4589 c9f46aa6
......@@ -57,6 +57,10 @@ find_package(KF5 ${KF5_DEP_VERSION} REQUIRED COMPONENTS
WindowSystem
Crash
)
find_package(KF5SysGuard)
set_package_properties(KF5SysGuard PROPERTIES
PURPOSE "Framework for process listing. Required for the 'Attach to Process' feature"
)
find_package(KDevelop-PG-Qt 1.90.90)
set_package_properties(KDevelop-PG-Qt PROPERTIES
PURPOSE "KDevelop parser generator library. Required for the QMake Builder/Manager plugin."
......
......@@ -10,4 +10,6 @@
#cmakedefine01 KDEVELOP_SINGLE_APP
#cmakedefine01 KF5SysGuard_FOUND
#endif // KDEVELOP_CONFIG_H
......@@ -19,12 +19,8 @@ set(debuggercommon_SRCS
stringhelpers.cpp
stty.cpp
)
find_package(KF5SysGuard)
if(KF5SysGuard_FOUND)
add_definitions(-DKDEV_ENABLE_DBG_ATTACH_DIALOG)
set(debuggercommon_SRCS
${debuggercommon_SRCS}
list(APPEND debuggercommon_SRCS
dialogs/processselection.cpp
)
endif()
......
......@@ -115,7 +115,7 @@ void MIDebuggerPlugin::setupActions()
connect(action, &QAction::triggered, this, &MIDebuggerPlugin::slotExamineCore);
ac->addAction("debug_core", action);
#ifdef KDEV_ENABLE_DBG_ATTACH_DIALOG
#if KF5SysGuard_FOUND
action = new QAction(this);
action->setIcon(QIcon::fromTheme("connect_creating"));
action->setText(i18n("Attach to Process..."));
......@@ -124,7 +124,7 @@ void MIDebuggerPlugin::setupActions()
"<p>Attaches the debugger to a running process.</p>"));
connect(action, &QAction::triggered, this, &MIDebuggerPlugin::slotAttachProcess);
ac->addAction("debug_attach", action);
#endif
#endif
}
void MIDebuggerPlugin::setupDBus()
......@@ -264,7 +264,7 @@ void MIDebuggerPlugin::slotExamineCore()
// job->start() is called in registerJob
}
#ifdef KDEV_ENABLE_DBG_ATTACH_DIALOG
#if KF5SysGuard_FOUND
void MIDebuggerPlugin::slotAttachProcess()
{
showStatusMessage(i18n("Choose a process to attach to..."), 1000);
......
......@@ -27,6 +27,8 @@
#ifndef MIDEBUGGERPLUGIN_H
#define MIDEBUGGERPLUGIN_H
#include "config.h"
#include <interfaces/iplugin.h>
#include <interfaces/istatus.h>
#include <interfaces/iuicontroller.h>
......@@ -85,9 +87,10 @@ protected Q_SLOTS:
void slotDebugExternalProcess(QObject* interface);
void slotExamineCore();
#ifdef KDEV_ENABLE_DBG_ATTACH_DIALOG
#if KF5SysGuard_FOUND
void slotAttachProcess();
#endif
#endif
void slotDBusServiceRegistered(const QString& service);
void slotDBusServiceUnregistered(const QString& service);
......
......@@ -23,6 +23,8 @@
#ifndef _DEBUGGERPART_H_
#define _DEBUGGERPART_H_
#include "config.h"
#include <QByteArray>
#include <QLabel>
#include <QtCore/QVariant>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment