diff options
Diffstat (limited to 'src/plugins/debugger/debuggeritem.cpp')
| -rw-r--r-- | src/plugins/debugger/debuggeritem.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/plugins/debugger/debuggeritem.cpp b/src/plugins/debugger/debuggeritem.cpp index bb31684a54..d26c20fbb8 100644 --- a/src/plugins/debugger/debuggeritem.cpp +++ b/src/plugins/debugger/debuggeritem.cpp @@ -35,6 +35,7 @@ #include <utils/hostosinfo.h> #include <utils/macroexpander.h> #include <utils/qtcassert.h> +#include <utils/stringutils.h> #include <utils/synchronousprocess.h> #include <utils/utilsicons.h> #include <utils/winutils.h> @@ -79,7 +80,7 @@ static QString getConfigurationOfGdbCommand(const FilePath &command) static QString extractGdbTargetAbiStringFromGdbOutput(const QString &gdbOutput) { const auto outputLines = gdbOutput.split('\n'); - const auto whitespaceSeparatedTokens = outputLines.join(' ').split(' ', QString::SkipEmptyParts); + const auto whitespaceSeparatedTokens = outputLines.join(' ').split(' ', Utils::SkipEmptyParts); const QString targetKey{"--target="}; const QString targetValue = Utils::findOrDefault(whitespaceSeparatedTokens, @@ -107,8 +108,8 @@ DebuggerItem::DebuggerItem(const QVariant &id) DebuggerItem::DebuggerItem(const QVariantMap &data) { m_id = data.value(DEBUGGER_INFORMATION_ID).toString(); - m_command = FilePath::fromUserInput(data.value(DEBUGGER_INFORMATION_COMMAND).toString()); - m_workingDirectory = FilePath::fromUserInput(data.value(DEBUGGER_INFORMATION_WORKINGDIRECTORY).toString()); + m_command = FilePath::fromVariant(data.value(DEBUGGER_INFORMATION_COMMAND)); + m_workingDirectory = FilePath::fromVariant(data.value(DEBUGGER_INFORMATION_WORKINGDIRECTORY)); m_unexpandedDisplayName = data.value(DEBUGGER_INFORMATION_DISPLAYNAME).toString(); m_isAutoDetected = data.value(DEBUGGER_INFORMATION_AUTODETECTED, false).toBool(); m_version = data.value(DEBUGGER_INFORMATION_VERSION).toString(); @@ -309,8 +310,8 @@ QVariantMap DebuggerItem::toMap() const QVariantMap data; data.insert(DEBUGGER_INFORMATION_DISPLAYNAME, m_unexpandedDisplayName); data.insert(DEBUGGER_INFORMATION_ID, m_id); - data.insert(DEBUGGER_INFORMATION_COMMAND, m_command.toString()); - data.insert(DEBUGGER_INFORMATION_WORKINGDIRECTORY, m_workingDirectory.toString()); + data.insert(DEBUGGER_INFORMATION_COMMAND, m_command.toVariant()); + data.insert(DEBUGGER_INFORMATION_WORKINGDIRECTORY, m_workingDirectory.toVariant()); data.insert(DEBUGGER_INFORMATION_ENGINETYPE, int(m_engineType)); data.insert(DEBUGGER_INFORMATION_AUTODETECTED, m_isAutoDetected); data.insert(DEBUGGER_INFORMATION_VERSION, m_version); |