Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Marco Bubke
flatpak-qt-creator
Commits
fa2a115a
Commit
fa2a115a
authored
Nov 09, 2009
by
hjk
Browse files
debugger: use 'set substitute-path'
parent
b519a113
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/plugins/debugger/debuggermanager.h
View file @
fa2a115a
...
...
@@ -118,6 +118,7 @@ public:
QString
symbolFileName
;
QString
serverStartScript
;
int
toolChainType
;
QString
qtInstallPath
;
QString
dumperLibrary
;
QStringList
dumperLibraryLocations
;
...
...
src/plugins/debugger/debuggerrunner.cpp
View file @
fa2a115a
...
...
@@ -31,6 +31,7 @@
#include "debuggermanager.h"
#include <projectexplorer/debugginghelper.h>
#include <projectexplorer/environment.h>
#include <projectexplorer/project.h>
#include <projectexplorer/projectexplorerconstants.h>
...
...
@@ -170,6 +171,21 @@ DebuggerRunControl::DebuggerRunControl(DebuggerManager *manager,
runConfiguration
->
dumperLibrary
();
m_startParameters
->
dumperLibraryLocations
=
runConfiguration
->
dumperLibraryLocations
();
QString
qmakePath
=
ProjectExplorer
::
DebuggingHelperLibrary
::
findSystemQt
(
runConfiguration
->
environment
());
if
(
!
qmakePath
.
isEmpty
())
{
QProcess
proc
;
QStringList
args
;
args
.
append
(
QLatin1String
(
"-query"
));
args
.
append
(
QLatin1String
(
"QT_INSTALL_HEADERS"
));
proc
.
start
(
qmakePath
,
args
);
proc
.
waitForFinished
();
QByteArray
ba
=
proc
.
readAllStandardOutput
().
trimmed
();
QFileInfo
fi
(
QString
::
fromLocal8Bit
(
ba
)
+
"/.."
);
m_startParameters
->
qtInstallPath
=
fi
.
absoluteFilePath
();
}
}
void
DebuggerRunControl
::
start
()
...
...
src/plugins/debugger/gdb/gdbengine.cpp
View file @
fa2a115a
...
...
@@ -4427,6 +4427,21 @@ void GdbEngine::handleAdapterStarted()
void
GdbEngine
::
handleInferiorPrepared
()
{
const
QString
qtInstallPath
=
m_startParameters
->
qtInstallPath
;
if
(
!
qtInstallPath
.
isEmpty
())
{
QString
qtBuildPath
=
#if defined(Q_OS_WIN)
_
(
"C:/qt-greenhouse/Trolltech/Code_less_create_more/Trolltech/Code_less_create_more/Troll/4.6/qt"
);
#elif defined(Q_OS_MAC)
QString
();
#else
_
(
"/var/tmp/qt-x11-src-4.6.0"
);
#endif
if
(
!
qtBuildPath
.
isEmpty
())
postCommand
(
_
(
"set substitute-path %1 %2"
)
.
arg
(
qtBuildPath
).
arg
(
qtInstallPath
));
}
// Initial attempt to set breakpoints
showStatusMessage
(
tr
(
"Setting breakpoints..."
));
attemptBreakpointSynchronization
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment