Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Tobias Hunger
qt-creator
Commits
3331aea7
Commit
3331aea7
authored
Feb 23, 2011
by
hjk
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
debugger: make qt source path configurable
parent
7a35865c
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
42 additions
and
14 deletions
+42
-14
src/plugins/debugger/commonoptionspage.cpp
src/plugins/debugger/commonoptionspage.cpp
+1
-0
src/plugins/debugger/commonoptionspage.ui
src/plugins/debugger/commonoptionspage.ui
+33
-0
src/plugins/debugger/debuggeractions.cpp
src/plugins/debugger/debuggeractions.cpp
+5
-0
src/plugins/debugger/debuggeractions.h
src/plugins/debugger/debuggeractions.h
+1
-0
src/plugins/debugger/debuggerrunner.cpp
src/plugins/debugger/debuggerrunner.cpp
+0
-4
src/plugins/debugger/debuggerstartparameters.h
src/plugins/debugger/debuggerstartparameters.h
+0
-1
src/plugins/debugger/gdb/gdbengine.cpp
src/plugins/debugger/gdb/gdbengine.cpp
+2
-1
tests/manual/gdbdebugger/simple/simple_gdbtest_app.cpp
tests/manual/gdbdebugger/simple/simple_gdbtest_app.cpp
+0
-8
No files found.
src/plugins/debugger/commonoptionspage.cpp
View file @
3331aea7
...
...
@@ -126,6 +126,7 @@ QWidget *CommonOptionsPage::createPage(QWidget *parent)
m_group
.
insert
(
debuggerCore
()
->
action
(
VerboseLog
),
0
);
m_group
.
insert
(
debuggerCore
()
->
action
(
BreakOnThrow
),
0
);
m_group
.
insert
(
debuggerCore
()
->
action
(
BreakOnCatch
),
0
);
m_group
.
insert
(
debuggerCore
()
->
action
(
QtSourcesLocation
),
0
);
#ifdef Q_OS_WIN
Utils
::
SavedAction
*
registerAction
=
debuggerCore
()
->
action
(
RegisterForPostMortem
);
m_group
.
insert
(
registerAction
,
...
...
src/plugins/debugger/commonoptionspage.ui
View file @
3331aea7
...
...
@@ -129,6 +129,32 @@
</layout>
</widget>
</item>
<item>
<widget
class=
"QGroupBox"
name=
"sourcesBox"
>
<property
name=
"title"
>
<string>
Sources
</string>
</property>
<layout
class=
"QGridLayout"
name=
"sourcesGridLayout"
>
<item
row=
"7"
column=
"0"
>
<widget
class=
"QLabel"
name=
"labelMaximalStackDepth"
>
<property
name=
"sizePolicy"
>
<sizepolicy
hsizetype=
"Maximum"
vsizetype=
"Preferred"
>
<horstretch>
0
</horstretch>
<verstretch>
0
</verstretch>
</sizepolicy>
</property>
<property
name=
"text"
>
<string>
Qt Sources:
</string>
</property>
</widget>
</item>
<item
row=
"7"
column=
"1"
>
<widget
class=
"Utils::PathChooser"
name=
"qtSourcesChooser"
native=
"true"
>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<spacer
name=
"verticalSpacer"
>
<property
name=
"orientation"
>
...
...
@@ -147,6 +173,13 @@
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>
Utils::PathChooser
</class>
<extends>
QWidget
</extends>
<header
location=
"global"
>
utils/pathchooser.h
</header>
</customwidget>
</customwidgets>
<resources/>
<connections/>
</ui>
src/plugins/debugger/debuggeractions.cpp
View file @
3331aea7
...
...
@@ -400,6 +400,11 @@ DebuggerSettings::DebuggerSettings(QSettings *settings)
item
->
setSettingsKey
(
debugModeGroup
,
QLatin1String
(
"WatchdogTimeout"
));
item
->
setDefaultValue
(
20
);
insertItem
(
GdbWatchdogTimeout
,
item
);
item
=
new
SavedAction
(
this
);
item
->
setSettingsKey
(
debugModeGroup
,
QLatin1String
(
"QtSourcesLocation"
));
item
->
setDefaultValue
(
QString
());
insertItem
(
QtSourcesLocation
,
item
);
}
...
...
src/plugins/debugger/debuggeractions.h
View file @
3331aea7
...
...
@@ -88,6 +88,7 @@ enum DebuggerActionCode
UseDebuggingHelpers
,
UseCustomDebuggingHelperLocation
,
CustomDebuggingHelperLocation
,
QtSourcesLocation
,
UseCodeModel
,
ShowThreadNames
,
...
...
src/plugins/debugger/debuggerrunner.cpp
View file @
3331aea7
...
...
@@ -601,10 +601,6 @@ static DebuggerStartParameters localStartParameters(RunConfiguration *runConfigu
//qDebug() << "DUMPER: " << sp.dumperLibrary << sp.dumperLibraryLocations;
sp
.
displayName
=
rc
->
displayName
();
// Find qtInstallPath.
QString
qmakePath
=
DebuggingHelperLibrary
::
findSystemQt
(
rc
->
environment
());
if
(
!
qmakePath
.
isEmpty
())
sp
.
qtInstallPath
=
findQtInstallPath
(
qmakePath
);
return
sp
;
}
...
...
src/plugins/debugger/debuggerstartparameters.h
View file @
3331aea7
...
...
@@ -117,7 +117,6 @@ public:
QString
debuggerCommand
;
ProjectExplorer
::
Abi
toolChainAbi
;
QString
qtInstallPath
;
QString
dumperLibrary
;
QStringList
dumperLibraryLocations
;
...
...
src/plugins/debugger/gdb/gdbengine.cpp
View file @
3331aea7
...
...
@@ -4492,7 +4492,8 @@ void GdbEngine::notifyInferiorSetupFailed()
void
GdbEngine
::
handleInferiorPrepared
()
{
QTC_ASSERT
(
state
()
==
InferiorSetupRequested
,
qDebug
()
<<
state
());
const
QByteArray
qtInstallPath
=
startParameters
().
qtInstallPath
.
toLocal8Bit
();
const
QByteArray
qtInstallPath
=
debuggerCore
()
->
action
(
QtSourcesLocation
)
->
value
().
toString
().
toLocal8Bit
();
if
(
!
qtInstallPath
.
isEmpty
())
{
QByteArray
qtBuildPath
;
#if defined(Q_OS_WIN)
...
...
tests/manual/gdbdebugger/simple/simple_gdbtest_app.cpp
View file @
3331aea7
...
...
@@ -2060,14 +2060,6 @@ struct Ty
};
void
testStuff
()
{
char
*
x
=
"0
\032\033
3"
;
char
*
y
=
"0
\032\033
3"
;
char
*
z
=
"0
\032\033
3"
;
int
i
=
1
;
}
void
testStuff5
()
{
using
namespace
std
;
typedef
map
<
string
,
list
<
string
>
>
map_t
;
...
...
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